From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757865AbZHGM6Y (ORCPT ); Fri, 7 Aug 2009 08:58:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757820AbZHGM6W (ORCPT ); Fri, 7 Aug 2009 08:58:22 -0400 Received: from sg2ehsobe002.messaging.microsoft.com ([207.46.51.76]:29330 "EHLO SG2EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757259AbZHGM6T (ORCPT ); Fri, 7 Aug 2009 08:58:19 -0400 X-SpamScore: 5 X-BigFish: VPS5(z34a4jzzz1202hzzz32i6bh203h43j62h) X-Spam-TCS-SCL: 1:0 X-WSS-ID: 0KO0C0O-02-3UD-02 X-M-MSG: Date: Fri, 7 Aug 2009 14:57:02 +0200 From: Andreas Herrmann To: Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner CC: linux-kernel@vger.kernel.org, Borislav Petkov , Brice Goglin Subject: [PATCH 1/8] topology: Introduce cpu_node information for multi-node processors Message-ID: <20090807125702.GT6520@alberich.amd.com> References: <20090807125609.GH7198@alberich.amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20090807125609.GH7198@alberich.amd.com> User-Agent: Mutt/1.5.16 (2007-06-09) X-OriginalArrivalTime: 07 Aug 2009 12:57:03.0309 (UTC) FILETIME=[8F5D1FD0:01CA175E] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This includes - cpu_node_id (id of the internal node) - cpu_node_siblings and cpu_node_siblings_list (siblings on the same internal node) Signed-off-by: Andreas Herrmann --- drivers/base/topology.c | 10 ++++++++++ include/linux/topology.h | 9 +++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/drivers/base/topology.c b/drivers/base/topology.c index bf6b132..1e35a43 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c @@ -103,6 +103,9 @@ static ssize_t show_##name##_list(struct sys_device *dev, \ define_id_show_func(physical_package_id); define_one_ro(physical_package_id); +define_id_show_func(cpu_node_id); +define_one_ro(cpu_node_id); + define_id_show_func(core_id); define_one_ro(core_id); @@ -110,6 +113,10 @@ define_siblings_show_func(thread_cpumask); define_one_ro_named(thread_siblings, show_thread_cpumask); define_one_ro_named(thread_siblings_list, show_thread_cpumask_list); +define_siblings_show_func(cpu_node_cpumask); +define_one_ro_named(cpu_node_siblings, show_cpu_node_cpumask); +define_one_ro_named(cpu_node_siblings_list, show_cpu_node_cpumask_list); + define_siblings_show_func(core_cpumask); define_one_ro_named(core_siblings, show_core_cpumask); define_one_ro_named(core_siblings_list, show_core_cpumask_list); @@ -119,6 +126,9 @@ static struct attribute *default_attrs[] = { &attr_core_id.attr, &attr_thread_siblings.attr, &attr_thread_siblings_list.attr, + &attr_cpu_node_id.attr, + &attr_cpu_node_siblings.attr, + &attr_cpu_node_siblings_list.attr, &attr_core_siblings.attr, &attr_core_siblings_list.attr, NULL diff --git a/include/linux/topology.h b/include/linux/topology.h index 7402c1a..976a130 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -180,6 +180,9 @@ int arch_update_cpu_topology(void); #ifndef topology_physical_package_id #define topology_physical_package_id(cpu) ((void)(cpu), -1) #endif +#ifndef topology_cpu_node_id +#define topology_cpu_node_id(cpu) ((void)(cpu), 0) +#endif #ifndef topology_core_id #define topology_core_id(cpu) ((void)(cpu), 0) #endif @@ -189,12 +192,18 @@ int arch_update_cpu_topology(void); #ifndef topology_core_siblings #define topology_core_siblings(cpu) cpumask_of_cpu(cpu) #endif +#ifndef topology_cpu_node_siblings +#define topology_cpu_node_siblings(cpu) topology_core_siblings(cpu) +#endif #ifndef topology_thread_cpumask #define topology_thread_cpumask(cpu) cpumask_of(cpu) #endif #ifndef topology_core_cpumask #define topology_core_cpumask(cpu) cpumask_of(cpu) #endif +#ifndef topology_cpu_node_cpumask +#define topology_cpu_node_cpumask(cpu) topology_core_cpumask(cpu) +#endif /* Returns the number of the current Node. */ #ifndef numa_node_id -- 1.6.3.3