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

Groups > linux.kernel > #1421236

[PATCH 3.16 069/114] tracing: Don't display trigger file for events that can't be enabled

Show all headers | View raw

3.16.36-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Chunyu Hu <chuhu@redhat.com>

commit 854145e0a8e9a05f7366d240e2f99d9c1ca6d6dd upstream.

Currently register functions for events will be called
through the 'reg' field of event class directly without
any check when seting up triggers.

Triggers for events that don't support register through
debug fs (events under events/ftrace are for trace-cmd to
read event format, and most of them don't have a register
function except events/ftrace/functionx) can't be enabled
at all, and an oops will be hit when setting up trigger
for those events, so just not creating them is an easy way
to avoid the oops.

Link: http://lkml.kernel.org/r/1462275274-3911-1-git-send-email-chuhu@redhat.com

Fixes: 85f2b08268c01 ("tracing: Add basic event trigger framework")
Signed-off-by: Chunyu Hu <chuhu@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 kernel/trace/trace_events.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1584,8 +1584,13 @@ event_create_dir(struct dentry *parent,
 	trace_create_file("filter", 0644, file->dir, file,
 			  &ftrace_event_filter_fops);
 
-	trace_create_file("trigger", 0644, file->dir, file,
-			  &event_trigger_fops);
+	/*
+	 * Only event directories that can be enabled should have
+	 * triggers.
+	 */
+	if (!(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE))
+		trace_create_file("trigger", 0644, file->dir, file,
+				  &event_trigger_fops);
 
 	trace_create_file("format", 0444, file->dir, call,
 			  &ftrace_event_format_fops);

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

Thread

[PATCH 3.16 000/114] 3.16.36-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 014/114] kvm: x86: do not leak guest xcr0 into host  interrupt handlers Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 045/114] batman-adv: Reduce refcnt of removed router  when updating route Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 040/114] s390/hugetlb: add hugepages_supported define Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 013/114] assoc_array: don't call compare_object() on  a node Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 027/114] crypto: ccp - Prevent information leakage on  export Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 069/114] tracing: Don't display trigger file for  events that can't be enabled Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
    Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ville Syrjälä <ville.syrjala@linux.intel.com> - 2016-06-14 12:50 +0200
      Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 13:40 +0200
        Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ville Syrjälä <ville.syrjala@linux.intel.com> - 2016-06-14 14:10 +0200
          Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 14:50 +0200
            Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ville Syrjälä <ville.syrjala@linux.intel.com> - 2016-06-14 15:10 +0200
  [PATCH 3.16 009/114] Input: gtco - fix crash on detecting device  without endpoints Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 058/114] mm/huge_memory: replace VM_NO_THP VM_BUG_ON  with actual VMA check Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  Re: [PATCH 3.16 000/114] 3.16.36-rc1 review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-06-13 23:20 +0200
  Re: [PATCH 3.16 000/114] 3.16.36-rc1 review Guenter Roeck <linux@roeck-us.net> - 2016-06-14 04:00 +0200
    Re: [PATCH 3.16 000/114] 3.16.36-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 13:30 +0200

csiph-web