From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbdJ0OS2 (ORCPT ); Fri, 27 Oct 2017 10:18:28 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:47867 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027AbdJ0OS1 (ORCPT ); Fri, 27 Oct 2017 10:18:27 -0400 Date: Fri, 27 Oct 2017 16:18:19 +0200 From: Peter Zijlstra To: Jiri Olsa Cc: Hari Bathini , lkml , Ingo Molnar , Alexander Shishkin Subject: Re: [PATCH] perf: Fix header.size for namespace events Message-ID: <20171027141819.GB3165@worktop.lehotels.local> References: <20171027074311.2648-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171027074311.2648-1-jolsa@kernel.org> User-Agent: Mutt/1.5.22.1 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 27, 2017 at 09:43:11AM +0200, Jiri Olsa wrote: > Reset header size for namespace events, otherwise > it only gets bigger in ctx iterations. > > Cc: Hari Bathini > Link: http://lkml.kernel.org/n/tip-nlo4gonz9d4guyb8153ukzt0@git.kernel.org > Signed-off-by: Jiri Olsa Fixes: e422267322cd ("perf: Add PERF_RECORD_NAMESPACES to include namespaces related info") Acked-by: Peter Zijlstra (Intel) > --- > kernel/events/core.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/kernel/events/core.c b/kernel/events/core.c > index 04989fb769f0..4e6aa3f7d018 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -6717,6 +6717,7 @@ static void perf_event_namespaces_output(struct perf_event *event, > struct perf_namespaces_event *namespaces_event = data; > struct perf_output_handle handle; > struct perf_sample_data sample; > + u16 header_size = namespaces_event->event_id.header.size; > int ret; > > if (!perf_event_namespaces_match(event)) > @@ -6727,7 +6728,7 @@ static void perf_event_namespaces_output(struct perf_event *event, > ret = perf_output_begin(&handle, event, > namespaces_event->event_id.header.size); > if (ret) > - return; > + goto out; > > namespaces_event->event_id.pid = perf_event_pid(event, > namespaces_event->task); > @@ -6739,6 +6740,8 @@ static void perf_event_namespaces_output(struct perf_event *event, > perf_event__output_id_sample(event, &handle, &sample); > > 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, > -- > 2.13.6 >