From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932421Ab2AMQy7 (ORCPT ); Fri, 13 Jan 2012 11:54:59 -0500 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:49453 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752401Ab2AMQy6 convert rfc822-to-8bit (ORCPT ); Fri, 13 Jan 2012 11:54:58 -0500 MIME-Version: 1.0 In-Reply-To: <20120113165315.GA24387@infradead.org> References: <20120113144731.GA5458@quad> <20120113165315.GA24387@infradead.org> Date: Fri, 13 Jan 2012 17:54:57 +0100 Message-ID: Subject: Re: [PATCH] perf: fix broken perf inject -b From: Stephane Eranian To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@elte.hu, robert.richter@amd.com X-System-Of-Record: true Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 13, 2012 at 5:53 PM, Arnaldo Carvalho de Melo wrote: > Em Fri, Jan 13, 2012 at 03:47:31PM +0100, Stephane Eranian escreveu: >> >> perf inject -b was broken. It would not inject any build_ids >> into the stream. Furthermore, it would strip samples from the >> stream. > > Against which tree is this patch? > 3.2.0-rc7-tip. Did that get fixed later on? >> The reason was a missing initialization of the event attribute >> structures. The perf_tool.tool.attr() callback was pointing to >> a simple repipe. But there was no initialization of internal data >> structures to keep track of events and event ids. That later caused >> event id lookups to fail, and samples would get dropped. >> >> The patch simply adds back the call to perf_event__process_attr() >> to initialize the evlist structure. Build_ids are again injected. >> The PID is also inject for PERF_RECORD_HEADER_BUILD_ID. >> >> Signed-off-by: Stephane Eranian >> --- >> >> diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c >> index 09c1061..f38f370 100644 >> --- a/tools/perf/builtin-inject.c >> +++ b/tools/perf/builtin-inject.c >> @@ -60,6 +60,11 @@ static int perf_event__repipe_tracing_data_synth(union perf_event *event, >>  static int perf_event__repipe_attr(union perf_event *event, >>                                  struct perf_evlist **pevlist __used) >>  { >> +     int ret; >> +     ret = perf_event__process_attr(event, pevlist); >> +     if (ret) >> +             return ret; >> + >>       return perf_event__repipe_synth(NULL, event, NULL); >>  } >> >> @@ -173,6 +178,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, >>                      event->header.type); >>               goto repipe; >>       } >> +     machine->pid = event->ip.pid; >> >>       thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION, >>                             event->ip.ip, &al);