x86/apic/msi: Plug non-maskable MSI affinity race

[mirror_ubuntu-bionic-kernel.git] / include / trace / perf.h

diff --git a/include/trace/perf.h b/include/trace/perf.h
index e4b2498216844e2d6ffde7f081ff944191073602..dbc6c74defc38206f6abccd950f59ebdf50c78ac 100644 (file)
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -35,7 +35,6 @@ perf_trace_##call(void *__data, proto)                                        \
        struct trace_event_call *event_call = __data;                   \
        struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
        struct trace_event_raw_##call *entry;                           \
-       struct bpf_prog *prog = event_call->prog;                       \
        struct pt_regs *__regs;                                         \
        u64 __count = 1;                                                \
        struct task_struct *__task = NULL;                              \
@@ -47,8 +46,9 @@ perf_trace_##call(void *__data, proto)                                        \
        __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \
                                                                        \
        head = this_cpu_ptr(event_call->perf_events);                   \
-       if (!prog && __builtin_constant_p(!__task) && !__task &&        \
-                               hlist_empty(head))                      \
+       if (!bpf_prog_array_valid(event_call) &&                        \
+           __builtin_constant_p(!__task) && !__task &&                 \
+           hlist_empty(head))                                          \
                return;                                                 \
                                                                        \
        __entry_size = ALIGN(__data_size + sizeof(*entry) + sizeof(u32),\