From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE5BC43461 for ; Mon, 14 Sep 2020 16:11:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0FA520EDD for ; Mon, 14 Sep 2020 16:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600099876; bh=9DjOq0KtDBR+vlWjDmQydd3einrzIMs1/vQH7vVaniA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=XIsB9O+d+pUtMiwbrp02B+fr2gXNTsFcwnmn0ZS4xVJu6+OzCAtlAKebguuxvEIMg 0rdKh8O3prqjD9zq3QK4IP69w+W8zC+0FAIFtoSA238MxAbf8B/RdIZupOv+paES// EiQBKfzmlxIAHV6tNnM9Qt9VM9labTmqLQ0Kdzqo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726127AbgINQLO (ORCPT ); Mon, 14 Sep 2020 12:11:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:34342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726090AbgINQIB (ORCPT ); Mon, 14 Sep 2020 12:08:01 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 984A12074B; Mon, 14 Sep 2020 16:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600099680; bh=9DjOq0KtDBR+vlWjDmQydd3einrzIMs1/vQH7vVaniA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NgeOskVN3uAiZa/YHfZ73FG7p7jb/kYEfLcUR8/xJSxUYIZUbFvkzbjL6vYJ7Uo0t CBxEf9o4IIun6YY+81n+VEvEosERW+Pb10Ie9wcYXEIcYsRXS/aw+n5JDN7y0lrq5B 9e18J45y+RYzQnHDXMC33EOVzc28a4gNmhHXiOhk= Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id ACF3440D3D; Mon, 14 Sep 2020 13:07:58 -0300 (-03) Date: Mon, 14 Sep 2020 13:07:58 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Michael Petlan , Song Liu , "Frank Ch. Eigler" , Ian Rogers , Stephane Eranian , Alexey Budankov , Andi Kleen , Adrian Hunter Subject: Re: [PATCH 16/26] perf tools: Synthesize modules with mmap3 Message-ID: <20200914160758.GK160517@kernel.org> References: <20200913210313.1985612-1-jolsa@kernel.org> <20200913210313.1985612-17-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200913210313.1985612-17-jolsa@kernel.org> X-Url: http://acmel.wordpress.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sun, Sep 13, 2020 at 11:03:03PM +0200, Jiri Olsa escreveu: > Synthesizing modules with mmap3 events so we can > get build id data for module's maps as well. Ditto as for 15/26 > Signed-off-by: Jiri Olsa > --- > tools/perf/util/synthetic-events.c | 37 +++++++++++++++++++----------- > 1 file changed, 24 insertions(+), 13 deletions(-) > > diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c > index bd6e7b84283d..6bd2423ce2f3 100644 > --- a/tools/perf/util/synthetic-events.c > +++ b/tools/perf/util/synthetic-events.c > @@ -605,7 +605,7 @@ int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t > int rc = 0; > struct map *pos; > struct maps *maps = machine__kernel_maps(machine); > - union perf_event *event = zalloc((sizeof(event->mmap) + > + union perf_event *event = zalloc((sizeof(event->mmap3) + > machine->id_hdr_size)); > if (event == NULL) { > pr_debug("Not enough memory synthesizing mmap event " > @@ -613,8 +613,6 @@ int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t > return -1; > } > > - event->header.type = PERF_RECORD_MMAP; > - > /* > * kernel uses 0 for user space maps, see kernel/perf_event.c > * __perf_event_mmap > @@ -631,17 +629,30 @@ int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t > continue; > > size = PERF_ALIGN(pos->dso->long_name_len + 1, sizeof(u64)); > - event->mmap.header.type = PERF_RECORD_MMAP; > - event->mmap.header.size = (sizeof(event->mmap) - > - (sizeof(event->mmap.filename) - size)); > - memset(event->mmap.filename + size, 0, machine->id_hdr_size); > - event->mmap.header.size += machine->id_hdr_size; > - event->mmap.start = pos->start; > - event->mmap.len = pos->end - pos->start; > - event->mmap.pid = machine->pid; > - > - memcpy(event->mmap.filename, pos->dso->long_name, > + event->mmap3.header.type = PERF_RECORD_MMAP3; > + event->mmap3.header.size = (sizeof(event->mmap3) - > + (sizeof(event->mmap3.filename) - size)); > + memset(event->mmap3.filename + size, 0, machine->id_hdr_size); > + event->mmap3.header.size += machine->id_hdr_size; > + event->mmap3.start = pos->start; > + event->mmap3.len = pos->end - pos->start; > + event->mmap3.pid = machine->pid; > + > + memcpy(event->mmap3.filename, pos->dso->long_name, > pos->dso->long_name_len + 1); > + > + rc = filename__read_build_id(event->mmap3.filename, event->mmap3.buildid, > + BUILD_ID_SIZE); > + if (rc != BUILD_ID_SIZE) { > + if (event->mmap3.filename[0] == '/') { > + pr_debug2("Failed to read build ID for %s\n", > + event->mmap3.filename); > + } > + memset(event->mmap3.buildid, 0x0, sizeof(event->mmap3.buildid)); > + } > + > + rc = 0; > + > if (perf_tool__process_synth_event(tool, event, machine, process) != 0) { > rc = -1; > break; > -- > 2.26.2 > -- - Arnaldo