openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf: Fix header.size for namespace events 

Reset header size for namespace events, otherwise it only gets bigger in
ctx iterations.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Fixes: e422267322 ("perf: Add PERF_RECORD_NAMESPACES to include namespaces related info")
Link: http://lkml.kernel.org/n/tip-nlo4gonz9d4guyb8153ukzt0@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2017-08-09 18:14:06 +02:00 committed by Arnaldo Carvalho de Melo
parent df7ccfa21e
commit 34900ec5c9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/events/core.c
View File

@ -6640,6 +6640,7 @@ static void perf_event_namespaces_output(struct perf_event *event,
struct perf_namespaces_event *namespaces_event = data; struct perf_namespaces_event *namespaces_event = data;
struct perf_output_handle handle; struct perf_output_handle handle;
struct perf_sample_data sample; struct perf_sample_data sample;
u16 header_size = namespaces_event->event_id.header.size;
int ret; int ret;
if (!perf_event_namespaces_match(event)) if (!perf_event_namespaces_match(event))
@ -6650,7 +6651,7 @@ static void perf_event_namespaces_output(struct perf_event *event,
ret = perf_output_begin(&handle, event, ret = perf_output_begin(&handle, event,
namespaces_event->event_id.header.size); namespaces_event->event_id.header.size);
if (ret) if (ret)
return; goto out;
namespaces_event->event_id.pid = perf_event_pid(event, namespaces_event->event_id.pid = perf_event_pid(event,
namespaces_event->task); namespaces_event->task);
@ -6662,6 +6663,8 @@ static void perf_event_namespaces_output(struct perf_event *event,
perf_event__output_id_sample(event, &handle, &sample); perf_event__output_id_sample(event, &handle, &sample);
perf_output_end(&handle); perf_output_end(&handle);
out:
namespaces_event->event_id.header.size = header_size;
} }
static void perf_fill_ns_link_info(struct perf_ns_link_info *ns_link_info, static void perf_fill_ns_link_info(struct perf_ns_link_info *ns_link_info,