This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
RE: [PATCH]_stp_free_percpu function definition responding to _stp_alloc_percpu
- From: "Keshavamurthy, Anil S" <anil dot s dot keshavamurthy at intel dot com>
- To: "Mao, Bibo" <bibo dot mao at intel dot com>, <systemtap at sourceware dot org>
- Date: Tue, 17 Oct 2006 17:04:57 -0700
- Subject: RE: [PATCH]_stp_free_percpu function definition responding to _stp_alloc_percpu
Will this not break the older kernels?
How can systemtap makes sure that it is
backward compatible while supporting newer kernels?
-Anil Keshavamurthy
Open Source Technology Center/SSG
Intel Corp.
-----Original Message-----
From: systemtap-owner@sourceware.org
[mailto:systemtap-owner@sourceware.org] On Behalf Of bibo,mao
Sent: Monday, October 16, 2006 4:08 AM
To: systemtap@sourceware.org
Subject: [PATCH]_stp_free_percpu function definition responding to
_stp_alloc_percpu
Hi,
On the newest 2.6.19-rc2 smp machines, stap fails to run. It
is because _stp_free_percpu is defined as free_percpu macro and
one function at the same time. This patch modifies this, and
replaces for_each_cpu with for_each_possible_cpu macro.
thanks
bibo,mao
--- src.org/runtime/alloc.c 2006-01-25 18:08:47.000000000 +0800
+++ src/runtime/alloc.c 2006-10-16 18:17:40.000000000 +0800
@@ -18,14 +18,9 @@
#define kmalloc_node(size,flags,node) kmalloc(size,flags)
#endif /* LINUX_VERSION_CODE */
-#ifdef CONFIG_SMP
-#define _stp_free_percpu(ptr) free_percpu(ptr)
-#else
-#define _stp_free_percpu(ptr) kfree(ptr)
-#endif
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
#define _stp_alloc_percpu(size) __alloc_percpu(size, 8)
+#define _stp_free_percpu(ptr) free_percpu(ptr)
#else
#ifdef CONFIG_SMP
/* This is like alloc_percpu() except it simply takes a size, instead
of a type. */
@@ -37,7 +32,7 @@ void *_stp_alloc_percpu(size_t size)
if (!pdata)
return NULL;
- for_each_cpu(i) {
+ for_each_possible_cpu(i) {
int node = cpu_to_node(i);
if (node_online(node))
@@ -68,7 +63,7 @@ void _stp_free_percpu(const void *objp)
int i;
struct percpu_data *p = (struct percpu_data *) (~(unsigned long)
objp);
- for_each_cpu(i)
+ for_each_possible_cpu(i)
kfree(p->ptrs[i]);
kfree(p);
}
@@ -80,6 +75,7 @@ void *_stp_alloc_percpu(size_t size)
memset(ret, 0, size);
return ret;
}
+#define _stp_free_percpu(ptr) kfree(ptr)
#endif /* CONFIG_SMP */
#endif /* LINUX_VERSION_CODE */
#endif /* _ALLOC_C_ */