Re: [PATCH v5 3/6] perf: implement pmu perf_kprobe

[Peter Zijlstra]

On Wed, Dec 20, 2017 at 11:03:01AM +0100, Peter Zijlstra wrote:
> On Wed, Dec 06, 2017 at 02:45:15PM -0800, Song Liu wrote:
> > @@ -8537,7 +8620,7 @@ static int perf_event_set_filter(struct perf_event 
> > *event, void __user *arg)
> >     char *filter_str;
> >     int ret = -EINVAL;
> >  
> > -   if ((event->attr.type != PERF_TYPE_TRACEPOINT ||
> > +   if ((!perf_event_is_tracing(event) ||
> >          !IS_ENABLED(CONFIG_EVENT_TRACING)) &&
> >         !has_addr_filter(event))
> >             return -EINVAL;
> 
> You actually missed an instance later in this same function... fixing
> that.


@@ -8518,23 +8601,19 @@ perf_event_set_addr_filter(struct perf_e
 
 static int perf_event_set_filter(struct perf_event *event, void __user *arg)
 {
-       char *filter_str;
        int ret = -EINVAL;
-
-       if ((event->attr.type != PERF_TYPE_TRACEPOINT ||
-           !IS_ENABLED(CONFIG_EVENT_TRACING)) &&
-           !has_addr_filter(event))
-               return -EINVAL;
+       char *filter_str;
 
        filter_str = strndup_user(arg, PAGE_SIZE);
        if (IS_ERR(filter_str))
                return PTR_ERR(filter_str);
 
-       if (IS_ENABLED(CONFIG_EVENT_TRACING) &&
-           event->attr.type == PERF_TYPE_TRACEPOINT)
-               ret = ftrace_profile_set_filter(event, event->attr.config,
-                                               filter_str);
-       else if (has_addr_filter(event))
+#ifdef CONFIG_EVENT_TRACING
+       if (perf_event_is_tracing(event))
+               ret = ftrace_profile_set_filter(event, event->attr.config, 
filter_str);
+       else
+#endif
+       if (has_addr_filter(event))
                ret = perf_event_set_addr_filter(event, filter_str);
 
        kfree(filter_str);



Is that right?