From 567726fcf689c2fc271e6717a3a7f0b9fc8c5b5d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 May 2014 17:04:08 -0700 Subject: [PATCH] 3.14-stable patches added patches: tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch --- queue-3.14/series | 1 + ...e-memory-on-mods-with-no-tracepoints.patch | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 queue-3.14/tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch diff --git a/queue-3.14/series b/queue-3.14/series index 3317296caa2..51891ad9a9d 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -11,3 +11,4 @@ blktrace-fix-accounting-of-partially-completed-requests.patch netfilter-can-t-fail-and-free-after-table-replacement.patch netfilter-nf_tables-set-names-cannot-be-larger-than-15-bytes.patch x86-preempt-fix-preemption-for-i386.patch +tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch diff --git a/queue-3.14/tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch b/queue-3.14/tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch new file mode 100644 index 00000000000..789681e7535 --- /dev/null +++ b/queue-3.14/tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch @@ -0,0 +1,43 @@ +From 7dec935a3aa04412cba2cebe1524ae0d34a30c24 Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (Red Hat)" +Date: Wed, 26 Feb 2014 10:54:36 -0500 +Subject: tracepoint: Do not waste memory on mods with no tracepoints + +From: "Steven Rostedt (Red Hat)" + +commit 7dec935a3aa04412cba2cebe1524ae0d34a30c24 upstream. + +No reason to allocate tp_module structures for modules that have no +tracepoints. This just wastes memory. + +Fixes: b75ef8b44b1c "Tracepoint: Dissociate from module mutex" +Acked-by: Mathieu Desnoyers +Signed-off-by: Steven Rostedt +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/tracepoint.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/kernel/tracepoint.c ++++ b/kernel/tracepoint.c +@@ -641,6 +641,9 @@ static int tracepoint_module_coming(stru + struct tp_module *tp_mod, *iter; + int ret = 0; + ++ if (!mod->num_tracepoints) ++ return 0; ++ + /* + * We skip modules that taint the kernel, especially those with different + * module headers (for forced load), to make sure we don't cause a crash. +@@ -684,6 +687,9 @@ static int tracepoint_module_going(struc + { + struct tp_module *pos; + ++ if (!mod->num_tracepoints) ++ return 0; ++ + mutex_lock(&tracepoints_mutex); + tracepoint_update_probe_range(mod->tracepoints_ptrs, + mod->tracepoints_ptrs + mod->num_tracepoints); -- 2.47.3