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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT 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 3CD62C43381 for ; Fri, 1 Mar 2019 17:52:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F03FF20848 for ; Fri, 1 Mar 2019 17:52:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KqlxsDDO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389558AbfCARwI (ORCPT ); Fri, 1 Mar 2019 12:52:08 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:46495 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728395AbfCARwH (ORCPT ); Fri, 1 Mar 2019 12:52:07 -0500 Received: by mail-qk1-f194.google.com with SMTP id i5so14769629qkd.13 for ; Fri, 01 Mar 2019 09:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=V0KC0PWz4AXF5JwFDl1XPRfNQP823spjIRXhJuZA6hE=; b=KqlxsDDO8JuXdgG7qJ3HUPNzYDSbmMqJrDGN6xmDzXuHJ3LLbtZCzvRSlxzaHzShOm PZ+w0brnGgzTlGNgE9cW+rB8dhnDTjSamtNWTcaJpGDKXGb7lDIVpq8D8xQCn65UBGNQ JV+rJabWq8Op6OdIh5HHeOMReLa5ywdnBQYWGTW2Yu7temqpYMHKPjFvqScoFQWHzFqb bzT73aq5dicknBYybQ5UxMaKVeIkCXhHXZEtMXis9bpMwH1X+WdE68fzw3vaTNUkaY33 t7O3cF7do8VwtqPXbR3EyIQ1AB0GQnMwtXo44/9i0fNe0OCK1VFvhhBFFpwa56di1Xnz o8fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=V0KC0PWz4AXF5JwFDl1XPRfNQP823spjIRXhJuZA6hE=; b=L2Tm+fH4aA8wPMlUBm/+EKDb0OkzjkYcDLIcQueOuSmcLcK5QpTLxnZS7vazs59Pxw o04ZyyjCDvxnnkWDVtGgvrG+9S+fKXO/1WzjxfKgKxWtlvFIOlmAyDgYPmDu1g9doirg YchrjIYD57k0VomixP5sdtsySZEASRjItyXfWo0rIxwt3ZRaiJblK1RAEeXPzMqYI8/c tRGOv6ru9YZQa8C07bVtPV7PeEC0vQjNYlNQJzzZ8+qSpgm87YPKGRCQttIIPHueih89 FFO4QPbTrXgeTkKmdQXpyidLTcoru66lvut2ZYu3C97OvbGdJIRV93IGF+v4+uhOl9yz 1NDQ== X-Gm-Message-State: APjAAAVMdItlacKGuBinjoP+LswktXUdBM9SwJ0XNmHnU42IraKD4hlk +dJD+LTzZ6BUFWGZOd034o0= X-Google-Smtp-Source: APXvYqynMrury84Hog00nSQAzT2Tt4FBqerKDcMdndocDITMbmfX5K+MpRHTc7XpzkIFsr0dVRhtVQ== X-Received: by 2002:a37:a147:: with SMTP id k68mr4761883qke.190.1551462725833; Fri, 01 Mar 2019 09:52:05 -0800 (PST) Received: from quaco.ghostprotocols.net (177-59-143-241.3g.claro.net.br. [177.59.143.241]) by smtp.gmail.com with ESMTPSA id 14sm13081925qkf.23.2019.03.01.09.52.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 09:52:04 -0800 (PST) From: Arnaldo Carvalho de Melo X-Google-Original-From: Arnaldo Carvalho de Melo Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 586BD4039C; Fri, 1 Mar 2019 14:52:01 -0300 (-03) Date: Fri, 1 Mar 2019 14:52:01 -0300 To: Adrian Hunter Cc: Jiri Olsa , Linux Kernel Mailing List Subject: Re: [PATCH 1/8] perf db-export: Add calls parent_id Message-ID: <20190301175201.GL13100@kernel.org> References: <20190228130031.23064-1-adrian.hunter@intel.com> <20190228130031.23064-2-adrian.hunter@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190228130031.23064-2-adrian.hunter@intel.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, Feb 28, 2019 at 03:00:24PM +0200, Adrian Hunter escreveu: > The call_path can be used to find the parent symbol for a call but not the > exact parent call. To do that add parent_id to the call_return export. This > enables the creation of a call tree from the exported data. Thanks, applied. - Arnaldo > Signed-off-by: Adrian Hunter > --- > tools/perf/util/db-export.c | 15 ++++++++++----- > tools/perf/util/db-export.h | 3 ++- > .../util/scripting-engines/trace-event-python.c | 8 +++++--- > tools/perf/util/thread-stack.c | 16 ++++++++++++++-- > tools/perf/util/thread-stack.h | 6 ++++-- > 5 files changed, 35 insertions(+), 13 deletions(-) > > diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c > index de9b4769d06c..d7315a00c731 100644 > --- a/tools/perf/util/db-export.c > +++ b/tools/perf/util/db-export.c > @@ -510,18 +510,23 @@ int db_export__call_path(struct db_export *dbe, struct call_path *cp) > return 0; > } > > -int db_export__call_return(struct db_export *dbe, struct call_return *cr) > +int db_export__call_return(struct db_export *dbe, struct call_return *cr, > + u64 *parent_db_id) > { > int err; > > - if (cr->db_id) > - return 0; > - > err = db_export__call_path(dbe, cr->cp); > if (err) > return err; > > - cr->db_id = ++dbe->call_return_last_db_id; > + if (!cr->db_id) > + cr->db_id = ++dbe->call_return_last_db_id; > + > + if (parent_db_id) { > + if (!*parent_db_id) > + *parent_db_id = ++dbe->call_return_last_db_id; > + cr->parent_db_id = *parent_db_id; > + } > > if (dbe->export_call_return) > return dbe->export_call_return(dbe, cr); > diff --git a/tools/perf/util/db-export.h b/tools/perf/util/db-export.h > index 67bc6b8ad2d6..4e2424c89df9 100644 > --- a/tools/perf/util/db-export.h > +++ b/tools/perf/util/db-export.h > @@ -104,6 +104,7 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, > int db_export__branch_types(struct db_export *dbe); > > int db_export__call_path(struct db_export *dbe, struct call_path *cp); > -int db_export__call_return(struct db_export *dbe, struct call_return *cr); > +int db_export__call_return(struct db_export *dbe, struct call_return *cr, > + u64 *parent_db_id); > > #endif > diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c > index 0e17db41b49b..09604c6508f0 100644 > --- a/tools/perf/util/scripting-engines/trace-event-python.c > +++ b/tools/perf/util/scripting-engines/trace-event-python.c > @@ -1173,7 +1173,7 @@ static int python_export_call_return(struct db_export *dbe, > u64 comm_db_id = cr->comm ? cr->comm->db_id : 0; > PyObject *t; > > - t = tuple_new(11); > + t = tuple_new(12); > > tuple_set_u64(t, 0, cr->db_id); > tuple_set_u64(t, 1, cr->thread->db_id); > @@ -1186,6 +1186,7 @@ static int python_export_call_return(struct db_export *dbe, > tuple_set_u64(t, 8, cr->return_ref); > tuple_set_u64(t, 9, cr->cp->parent->db_id); > tuple_set_s32(t, 10, cr->flags); > + tuple_set_u64(t, 11, cr->parent_db_id); > > call_object(tables->call_return_handler, t, "call_return_table"); > > @@ -1194,11 +1195,12 @@ static int python_export_call_return(struct db_export *dbe, > return 0; > } > > -static int python_process_call_return(struct call_return *cr, void *data) > +static int python_process_call_return(struct call_return *cr, u64 *parent_db_id, > + void *data) > { > struct db_export *dbe = data; > > - return db_export__call_return(dbe, cr); > + return db_export__call_return(dbe, cr, parent_db_id); > } > > static void python_process_general_event(struct perf_sample *sample, > diff --git a/tools/perf/util/thread-stack.c b/tools/perf/util/thread-stack.c > index a8b45168513c..41942c2aaa18 100644 > --- a/tools/perf/util/thread-stack.c > +++ b/tools/perf/util/thread-stack.c > @@ -49,6 +49,7 @@ enum retpoline_state_t { > * @timestamp: timestamp (if known) > * @ref: external reference (e.g. db_id of sample) > * @branch_count: the branch count when the entry was created > + * @db_id: id used for db-export > * @cp: call path > * @no_call: a 'call' was not seen > * @trace_end: a 'call' but trace ended > @@ -59,6 +60,7 @@ struct thread_stack_entry { > u64 timestamp; > u64 ref; > u64 branch_count; > + u64 db_id; > struct call_path *cp; > bool no_call; > bool trace_end; > @@ -280,12 +282,14 @@ static int thread_stack__call_return(struct thread *thread, > .comm = ts->comm, > .db_id = 0, > }; > + u64 *parent_db_id; > > tse = &ts->stack[idx]; > cr.cp = tse->cp; > cr.call_time = tse->timestamp; > cr.return_time = timestamp; > cr.branch_count = ts->branch_count - tse->branch_count; > + cr.db_id = tse->db_id; > cr.call_ref = tse->ref; > cr.return_ref = ref; > if (tse->no_call) > @@ -295,7 +299,14 @@ static int thread_stack__call_return(struct thread *thread, > if (tse->non_call) > cr.flags |= CALL_RETURN_NON_CALL; > > - return crp->process(&cr, crp->data); > + /* > + * The parent db_id must be assigned before exporting the child. Note > + * it is not possible to export the parent first because its information > + * is not yet complete because its 'return' has not yet been processed. > + */ > + parent_db_id = idx ? &(tse - 1)->db_id : NULL; > + > + return crp->process(&cr, parent_db_id, crp->data); > } > > static int __thread_stack__flush(struct thread *thread, struct thread_stack *ts) > @@ -484,7 +495,7 @@ void thread_stack__sample(struct thread *thread, int cpu, > } > > struct call_return_processor * > -call_return_processor__new(int (*process)(struct call_return *cr, void *data), > +call_return_processor__new(int (*process)(struct call_return *cr, u64 *parent_db_id, void *data), > void *data) > { > struct call_return_processor *crp; > @@ -537,6 +548,7 @@ static int thread_stack__push_cp(struct thread_stack *ts, u64 ret_addr, > tse->no_call = no_call; > tse->trace_end = trace_end; > tse->non_call = false; > + tse->db_id = 0; > > return 0; > } > diff --git a/tools/perf/util/thread-stack.h b/tools/perf/util/thread-stack.h > index b7c04e19ad41..9c45f947f5a9 100644 > --- a/tools/perf/util/thread-stack.h > +++ b/tools/perf/util/thread-stack.h > @@ -55,6 +55,7 @@ enum { > * @call_ref: external reference to 'call' sample (e.g. db_id) > * @return_ref: external reference to 'return' sample (e.g. db_id) > * @db_id: id used for db-export > + * @parent_db_id: id of parent call used for db-export > * @flags: Call/Return flags > */ > struct call_return { > @@ -67,6 +68,7 @@ struct call_return { > u64 call_ref; > u64 return_ref; > u64 db_id; > + u64 parent_db_id; > u32 flags; > }; > > @@ -79,7 +81,7 @@ struct call_return { > */ > struct call_return_processor { > struct call_path_root *cpr; > - int (*process)(struct call_return *cr, void *data); > + int (*process)(struct call_return *cr, u64 *parent_db_id, void *data); > void *data; > }; > > @@ -93,7 +95,7 @@ void thread_stack__free(struct thread *thread); > size_t thread_stack__depth(struct thread *thread, int cpu); > > struct call_return_processor * > -call_return_processor__new(int (*process)(struct call_return *cr, void *data), > +call_return_processor__new(int (*process)(struct call_return *cr, u64 *parent_db_id, void *data), > void *data); > void call_return_processor__free(struct call_return_processor *crp); > int thread_stack__process(struct thread *thread, struct comm *comm, > -- > 2.17.1 -- - Arnaldo