From patchwork Thu Nov 13 01:10:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 410176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9242B1400A0 for ; Thu, 13 Nov 2014 12:30:52 +1100 (AEDT) Received: from localhost ([::1]:57432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XojFK-00012A-QI for incoming@patchwork.ozlabs.org; Wed, 12 Nov 2014 20:30:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XojEf-0000AI-1e for qemu-devel@nongnu.org; Wed, 12 Nov 2014 20:30:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XojEZ-0008EB-5K for qemu-devel@nongnu.org; Wed, 12 Nov 2014 20:30:08 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:49303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XojEY-0008CB-M5 for qemu-devel@nongnu.org; Wed, 12 Nov 2014 20:30:03 -0500 Received: from kw-mxq.gw.nic.fujitsu.com (unknown [10.0.237.131]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 260FA3EE0B6 for ; Thu, 13 Nov 2014 10:30:01 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 16177AC01A3 for ; Thu, 13 Nov 2014 10:30:00 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (s01.gw.nic.fujitsu.com [133.161.11.16]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id A88281DB8040 for ; Thu, 13 Nov 2014 10:29:59 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (yt-mxio2.gw.nic.fujitsu.com [10.134.25.142]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id 5D88C3F0030; Thu, 13 Nov 2014 10:29:59 +0900 (JST) Received: from guz (unknown [10.167.226.100]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id 11ADD8A002; Thu, 13 Nov 2014 10:29:59 +0900 (JST) Received: (from root@localhost) by guz (8.14.5/8.14.5/Submit) id sAD1CfMQ004643; Thu, 13 Nov 2014 09:12:41 +0800 From: Gu Zheng To: imammedo@redhat.com, qemu-devel@nongnu.org Date: Thu, 13 Nov 2014 09:10:27 +0800 Message-Id: <1415841032-4565-2-git-send-email-guz.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1415841032-4565-1-git-send-email-guz.fnst@cn.fujitsu.com> References: <1415841032-4565-1-git-send-email-guz.fnst@cn.fujitsu.com> X-TM-AS-MML: disable X-TMASE-MatchedRID: PwZ81m9fkLbGfM7IyIraCWNW0DAjL5p+zS3PzTFKzOpmu1QIKzh7qN/9 N6lK9KH6OTGiHK/+9AUH5edpNoYequn7m7FfgPpPXSKcwPTzq/IvkcMDfsPs1psoi2XrUn/Jn6K dMrRsL14qtq5d3cxkNfcCbN+6a2pkDppVWdD+hSLJwioIY8ad/6UnEhhduDNBgxNBv+WngWpzuo u/Ks/ruAEH6b4C2cBLIkai1n4h2aeOtoVxcAP1NgQ5WMx/hWiMU8mdcvbI1h2S6jzjuXTm0MTMz ICazP4UKnrQ9LhGzFxDDKa3G4nrLQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 192.51.44.36 Cc: zhugh.fnst@cn.fujitsu.com, tangchen@cn.fujitsu.com, Gu Zheng , isimatu.yasuaki@jp.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, anshul.makkar@profitbricks.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 1/6] cpu: introduce CpuTopoInfo structure for argument simplification X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Fan Reviewed-by: Eduardo Habkost Signed-off-by: Chen Fan Signed-off-by: Gu Zheng Signed-off-by: Zhu Guihua --- target-i386/topology.h | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/target-i386/topology.h b/target-i386/topology.h index 07a6c5f..e9ff89c 100644 --- a/target-i386/topology.h +++ b/target-i386/topology.h @@ -47,6 +47,12 @@ */ typedef uint32_t apic_id_t; +typedef struct X86CPUTopoInfo { + unsigned pkg_id; + unsigned core_id; + unsigned smt_id; +} X86CPUTopoInfo; + /* Return the bit width needed for 'count' IDs */ static unsigned apicid_bitwidth_for_count(unsigned count) @@ -92,13 +98,11 @@ static inline unsigned apicid_pkg_offset(unsigned nr_cores, unsigned nr_threads) */ static inline apic_id_t apicid_from_topo_ids(unsigned nr_cores, unsigned nr_threads, - unsigned pkg_id, - unsigned core_id, - unsigned smt_id) + const X86CPUTopoInfo *topo) { - return (pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) | - (core_id << apicid_core_offset(nr_cores, nr_threads)) | - smt_id; + return (topo->pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) | + (topo->core_id << apicid_core_offset(nr_cores, nr_threads)) | + topo->smt_id; } /* Calculate thread/core/package IDs for a specific topology, @@ -107,14 +111,12 @@ static inline apic_id_t apicid_from_topo_ids(unsigned nr_cores, static inline void x86_topo_ids_from_idx(unsigned nr_cores, unsigned nr_threads, unsigned cpu_index, - unsigned *pkg_id, - unsigned *core_id, - unsigned *smt_id) + X86CPUTopoInfo *topo) { unsigned core_index = cpu_index / nr_threads; - *smt_id = cpu_index % nr_threads; - *core_id = core_index % nr_cores; - *pkg_id = core_index / nr_cores; + topo->smt_id = cpu_index % nr_threads; + topo->core_id = core_index % nr_cores; + topo->pkg_id = core_index / nr_cores; } /* Make APIC ID for the CPU 'cpu_index' @@ -125,10 +127,9 @@ static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_cores, unsigned nr_threads, unsigned cpu_index) { - unsigned pkg_id, core_id, smt_id; - x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, - &pkg_id, &core_id, &smt_id); - return apicid_from_topo_ids(nr_cores, nr_threads, pkg_id, core_id, smt_id); + X86CPUTopoInfo topo; + x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, &topo); + return apicid_from_topo_ids(nr_cores, nr_threads, &topo); } #endif /* TARGET_I386_TOPOLOGY_H */