The patch titled
kprobes: sanitize struct kretprobe_instance allocations
has been removed from the -mm tree. Its filename was
kprobes-sanitize-struct-kretprobe_instance-allocations.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: kprobes: sanitize struct kretprobe_instance allocations
From: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
For as long as kretprobes have existed, we've allocated NR_CPUS instances
of kretprobe_instance structures. With the default value of
CONFIG_NR_CPUS increasing on certain architectures, we are potentially
wasting kernel memory.
See http://sourceware.org/bugzilla/show_bug.cgi?id=10839#c3 for more
details.
Use a saner num_possible_cpus() instead of NR_CPUS for allocation.
Signed-off-by: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Cc: Jim Keniston <jkenisto@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN kernel/kprobes.c~kprobes-sanitize-struct-kretprobe_instance-allocations kernel/kprobes.c
--- a/kernel/kprobes.c~kprobes-sanitize-struct-kretprobe_instance-allocations
+++ a/kernel/kprobes.c
@@ -1035,9 +1035,9 @@ int __kprobes register_kretprobe(struct
/* Pre-allocate memory for max kretprobe instances */
if (rp->maxactive <= 0) {
#ifdef CONFIG_PREEMPT
- rp->maxactive = max(10, 2 * NR_CPUS);
+ rp->maxactive = max(10, 2 * num_possible_cpus());
#else
- rp->maxactive = NR_CPUS;
+ rp->maxactive = num_possible_cpus();
#endif
}
spin_lock_init(&rp->lock);
_
Patches currently in -mm which might be from ananth@xxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
