1 files changed, 13 insertions, 7 deletions

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index ed27917cabc9..429fdfc3baf5 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -168,13 +168,12 @@ struct ring_buffer_event *
 trace_current_buffer_lock_reserve(struct ring_buffer **current_buffer,
                                   int type, unsigned long len,
                                   unsigned long flags, int pc);
-void trace_current_buffer_unlock_commit(struct ring_buffer *buffer,
-                                        struct ring_buffer_event *event,
-                                        unsigned long flags, int pc);
-void trace_buffer_unlock_commit(struct ring_buffer *buffer,
+void trace_buffer_unlock_commit(struct trace_array *tr,
+                                struct ring_buffer *buffer,
                                 struct ring_buffer_event *event,
                                 unsigned long flags, int pc);
-void trace_buffer_unlock_commit_regs(struct ring_buffer *buffer,
+void trace_buffer_unlock_commit_regs(struct trace_array *tr,
+                                     struct ring_buffer *buffer,
                                      struct ring_buffer_event *event,
                                      unsigned long flags, int pc,
                                      struct pt_regs *regs);
@@ -329,6 +328,7 @@ enum {
         EVENT_FILE_FL_SOFT_DISABLED_BIT,
         EVENT_FILE_FL_TRIGGER_MODE_BIT,
         EVENT_FILE_FL_TRIGGER_COND_BIT,
+        EVENT_FILE_FL_PID_FILTER_BIT,
 };
 
 /*
@@ -342,6 +342,7 @@ enum {
  *                   tracepoint may be enabled)
  *  TRIGGER_MODE  - When set, invoke the triggers associated with the event
  *  TRIGGER_COND  - When set, one or more triggers has an associated filter
+ *  PID_FILTER    - When set, the event is filtered based on pid
  */
 enum {
         EVENT_FILE_FL_ENABLED           = (1 << EVENT_FILE_FL_ENABLED_BIT),
@@ -352,6 +353,7 @@ enum {
         EVENT_FILE_FL_SOFT_DISABLED     = (1 << EVENT_FILE_FL_SOFT_DISABLED_BIT),
         EVENT_FILE_FL_TRIGGER_MODE      = (1 << EVENT_FILE_FL_TRIGGER_MODE_BIT),
         EVENT_FILE_FL_TRIGGER_COND      = (1 << EVENT_FILE_FL_TRIGGER_COND_BIT),
+        EVENT_FILE_FL_PID_FILTER        = (1 << EVENT_FILE_FL_PID_FILTER_BIT),
 };
 
 struct trace_event_file {
@@ -430,6 +432,8 @@ extern enum event_trigger_type event_triggers_call(struct trace_event_file *file
 extern void event_triggers_post_call(struct trace_event_file *file,
                                      enum event_trigger_type tt);
 
+bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
+
 /**
  * trace_trigger_soft_disabled - do triggers and test if soft disabled
  * @file: The file pointer of the event to test
@@ -449,6 +453,8 @@ trace_trigger_soft_disabled(struct trace_event_file *file)
                         event_triggers_call(file, NULL);
                 if (eflags & EVENT_FILE_FL_SOFT_DISABLED)
                         return true;
+                if (eflags & EVENT_FILE_FL_PID_FILTER)
+                        return trace_event_ignore_this_pid(file);
         }
         return false;
 }
@@ -508,7 +514,7 @@ event_trigger_unlock_commit(struct trace_event_file *file,
         enum event_trigger_type tt = ETT_NONE;
 
         if (!__event_trigger_test_discard(file, buffer, event, entry, &tt))
-                trace_buffer_unlock_commit(buffer, event, irq_flags, pc);
+                trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);
 
         if (tt)
                 event_triggers_post_call(file, tt);
@@ -540,7 +546,7 @@ event_trigger_unlock_commit_regs(struct trace_event_file *file,
         enum event_trigger_type tt = ETT_NONE;
 
         if (!__event_trigger_test_discard(file, buffer, event, entry, &tt))
-                trace_buffer_unlock_commit_regs(buffer, event,
+                trace_buffer_unlock_commit_regs(file->tr, buffer, event,
                                                 irq_flags, pc, regs);
 
         if (tt)