Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1600815

[PATCH 19/19] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL

Show all headers | View raw

From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>

commit fc62d0207ae0 ("kprobes: Introduce weak variant of
kprobe_exceptions_notify()") used the __kprobes annotation to exclude
kprobe_exceptions_notify from being probed. Since NOKPROBE_SYMBOL() is a
better way to do this enabling the symbol to be discovered as being
blacklisted, change over to using NOKPROBE_SYMBOL().

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/3f25bf400da5c222cd9b10eec6ded2d6b58209f8.1488991670.git.naveen.n.rao@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 kernel/kprobes.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 448759d4a263..4780ec236035 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1740,11 +1740,12 @@ void unregister_kprobes(struct kprobe **kps, int num)
 }
 EXPORT_SYMBOL_GPL(unregister_kprobes);
 
-int __weak __kprobes kprobe_exceptions_notify(struct notifier_block *self,
-					      unsigned long val, void *data)
+int __weak kprobe_exceptions_notify(struct notifier_block *self,
+					unsigned long val, void *data)
 {
 	return NOTIFY_DONE;
 }
+NOKPROBE_SYMBOL(kprobe_exceptions_notify);
 
 static struct notifier_block kprobe_exceptions_nb = {
 	.notifier_call = kprobe_exceptions_notify,
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/19] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 17/19] perf powerpc: Choose local entry point with kretprobes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 12/19] perf script: Add script print support for namespace events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 16/19] perf kretprobes: Offset from reloc_sym if kernel supports it Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 04/19] perf tools: Missing c2c command in command-list Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 07/19] perf report: Document +field style argument support for --field option Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 05/19] perf tools: Ignore generated files pmu-events/{jevents,pmu-events.c} for git Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 06/19] perf sort: Fix segfault with basic block 'cycles' sort dimension Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 19/19] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 14/19] perf sched timehist: Add --next option Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 13/19] perf tools: Add 'cgroup_id' sort order keyword Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 03/19] perf c2c: Fix display bug when using pipe Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 01/19] perf report: Hide tip message when -q option is given Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 02/19] perf c2c: Clarify help message of --stats option Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 18/19] doc: trace/kprobes: add information about NOKPROBE_SYMBOL Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 10/19] perf tools: Add PERF_RECORD_NAMESPACES to include namespaces related info Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 08/19] perf hists browser: Fix typo in function switch_data_file Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  [PATCH 15/19] perf probe: Factor out the ftrace README scanning Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-03-14 20:00 +0100
  Re: [GIT PULL 00/19] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-03-15 19:40 +0100

csiph-web