Commit fa8a74de authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-v5.4-rc3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two minor fixes:

   - A race in perf trace initialization (missing mutexes)

   - Minor fix to represent gfp_t in synthetic events as properly
     signed"

* tag 'trace-v5.4-rc3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix race in perf_trace_buf initialization
  tracing: Fix "gfp_t" format for synthetic events
parents 64131618 6b1340cc
...@@ -272,9 +272,11 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) ...@@ -272,9 +272,11 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)
goto out; goto out;
} }
mutex_lock(&event_mutex);
ret = perf_trace_event_init(tp_event, p_event); ret = perf_trace_event_init(tp_event, p_event);
if (ret) if (ret)
destroy_local_trace_kprobe(tp_event); destroy_local_trace_kprobe(tp_event);
mutex_unlock(&event_mutex);
out: out:
kfree(func); kfree(func);
return ret; return ret;
...@@ -282,8 +284,10 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) ...@@ -282,8 +284,10 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)
void perf_kprobe_destroy(struct perf_event *p_event) void perf_kprobe_destroy(struct perf_event *p_event)
{ {
mutex_lock(&event_mutex);
perf_trace_event_close(p_event); perf_trace_event_close(p_event);
perf_trace_event_unreg(p_event); perf_trace_event_unreg(p_event);
mutex_unlock(&event_mutex);
destroy_local_trace_kprobe(p_event->tp_event); destroy_local_trace_kprobe(p_event->tp_event);
} }
......
...@@ -679,6 +679,8 @@ static bool synth_field_signed(char *type) ...@@ -679,6 +679,8 @@ static bool synth_field_signed(char *type)
{ {
if (str_has_prefix(type, "u")) if (str_has_prefix(type, "u"))
return false; return false;
if (strcmp(type, "gfp_t") == 0)
return false;
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment