From: Lee Schermerhorn <lee.schermerhorn@hp.com>
To: linux-arch@vger.kernel.org, linux-mm@kvack.org,
linux-numa@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>,
Valdis.Kletnieks@vt.edu, Randy Dunlap <randy.dunlap@oracle.com>,
Christoph Lameter <cl@linux-foundation.org>,
eric.whitney@hp.com, Andrew Morton <akpm@linux-foundation.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Subject: [PATCH 1/7] numa-add-generic-percpu-var-numa_node_id-implementation-fix1
Date: Mon, 03 May 2010 11:05:04 -0400 [thread overview]
Message-ID: <20100503150504.15039.7493.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20100503150455.15039.10178.sendpatchset@localhost.localdomain>
Incremental patch 1 to
numa-add-generic-percpu-var-numa_node_id-implementation.patch
in 28apri10 mmotm.
If any of the numa topology functions--numa_node_id() et al--have not
been overridden by the arch, we can define them as static inline
functions.
Note that this means that cpu_to_node() can no longer be used as an
lvalue. However, the tree contains no such usage currently, and
a subsequent patch will add a function to set the 'numa_node' for
a specified cpu.
x86 defines numa_node_id() as a static inline function when
CONFIG_NUMA is not set. Add #define of numa_node_id to itself
to indicate this override of the default definition, so we can
build !NUMA with this patch applied.
Maybe we should move the default definitions to
asm-generic/topology.h? Or remove it altogether?
x86_64 !NUMA seems to build without it.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
arch/x86/include/asm/topology.h | 4 ++++
include/linux/topology.h | 21 ++++++++++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
Index: linux-2.6.34-rc5-mmotm-100428-1653/include/linux/topology.h
===================================================================
--- linux-2.6.34-rc5-mmotm-100428-1653.orig/include/linux/topology.h
+++ linux-2.6.34-rc5-mmotm-100428-1653/include/linux/topology.h
@@ -212,23 +212,34 @@ DECLARE_PER_CPU(int, numa_node);
#ifndef numa_node_id
/* Returns the number of the current Node. */
-#define numa_node_id() __this_cpu_read(numa_node)
+static inline int numa_node_id(void)
+{
+ return __this_cpu_read(numa_node);
+}
#endif
#ifndef cpu_to_node
-#define cpu_to_node(__cpu) per_cpu(numa_node, (__cpu))
+static inline int cpu_to_node(int cpu)
+{
+ return per_cpu(numa_node, cpu);
+}
#endif
#ifndef set_numa_node
-#define set_numa_node(__node) percpu_write(numa_node, __node)
+static inline void set_numa_node(int node)
+{
+ percpu_write(numa_node, node);
+}
#endif
#else /* !CONFIG_USE_PERCPU_NUMA_NODE_ID */
/* Returns the number of the current Node. */
#ifndef numa_node_id
-#define numa_node_id() (cpu_to_node(raw_smp_processor_id()))
-
+static inline int numa_node_id(void)
+{
+ return cpu_to_node(raw_smp_processor_id());
+}
#endif
#endif /* [!]CONFIG_USE_PERCPU_NUMA_NODE_ID */
Index: linux-2.6.34-rc5-mmotm-100428-1653/arch/x86/include/asm/topology.h
===================================================================
--- linux-2.6.34-rc5-mmotm-100428-1653.orig/arch/x86/include/asm/topology.h
+++ linux-2.6.34-rc5-mmotm-100428-1653/arch/x86/include/asm/topology.h
@@ -170,6 +170,10 @@ static inline int numa_node_id(void)
{
return 0;
}
+/*
+ * indicate override:
+ */
+#define numa_node_id numa_node_id
static inline int early_cpu_to_node(int cpu)
{
next prev parent reply other threads:[~2010-05-03 15:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 15:04 [PATCH 0/7] numa: incremental fixes to generic per cpu numa_*_id() series Lee Schermerhorn
2010-05-03 15:05 ` Lee Schermerhorn [this message]
2010-05-03 15:05 ` [PATCH 2/7] numa-add-generic-percpu-var-numa_node_id-implementation-fix2 Lee Schermerhorn
2010-05-03 15:05 ` [PATCH 3/7] numa-x86_64-use-generic-percpu-var-numa_node_id-implementation-fix1 Lee Schermerhorn
2010-05-21 23:02 ` Andrew Morton
2010-05-24 14:09 ` Lee Schermerhorn
2010-05-24 14:12 ` Valdis.Kletnieks
2010-05-24 14:41 ` Lee Schermerhorn
2010-05-24 18:34 ` Andrew Morton
2010-05-24 19:05 ` Lee Schermerhorn
2010-05-24 20:19 ` Valdis.Kletnieks
2010-05-03 15:06 ` [PATCH 4/7] numa-x86_64-use-generic-percpu-var-numa_node_id-implementation-fix2 Lee Schermerhorn
2010-05-03 15:06 ` [PATCH 5/7] numa-introduce-numa_mem_id-effective-local-memory-node-id-fix2 Lee Schermerhorn
2010-05-03 15:07 ` [PATCH 6/7] numa-introduce-numa_mem_id-effective-local-memory-node-id-fix3 Lee Schermerhorn
2010-05-03 15:07 ` [PATCH 7/7] numa-update-documentation-vm-numa-add-memoryless-node-info-fix1 Lee Schermerhorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100503150504.15039.7493.sendpatchset@localhost.localdomain \
--to=lee.schermerhorn@hp.com \
--cc=Valdis.Kletnieks@vt.edu \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=eric.whitney@hp.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-numa@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).