From patchwork Fri Apr 14 03:25:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 83208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp103712vqo; Thu, 13 Apr 2023 20:34:01 -0700 (PDT) X-Google-Smtp-Source: AKy350Y4VysQwkJ52Vtf3ybZOIqxVDFCxiGWHOOxLxn6qcz338VgFcdH37D1A20hTeQ1GagmFmvn X-Received: by 2002:a05:6a20:841f:b0:ec:d7cf:bcf7 with SMTP id c31-20020a056a20841f00b000ecd7cfbcf7mr2831606pzd.17.1681443241321; Thu, 13 Apr 2023 20:34:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681443241; cv=none; d=google.com; s=arc-20160816; b=f/S6Y0L9TEQ/egmnUdQ642YSh82JuhSyWMHo42svmrNMpZu8IdAwICE85CzHg3gb0p PwZEuwNNKGreXlaQeyUwPpFRh5cn4zfT8nidXCNCaekefiuWPG1Q2NKk1ADkKr4vCXa+ t9A2oNXquP0oveqaoZlu+6mIEVdxr5Sv8KOVpBP/B/GoaeIfzY7SeTVfheQ3P4WGzLhf HNEPf5IdBe3ihGjs092DyshX9Tf3Zl75uhKEdALe+YXdb91YzHYlvApYCa/sI6203+RM MgASasJAsnLUkJHCGmwDByEHTO8dhS81uColF/629XKz1JKv/rNG7JLtphgUHffdHGwf SU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xKuyaqR6xHCC9E8HyK/Cmu9Z8w8rl9ODbLLHZVP9vZw=; b=TNjnnUIMzwYDqEO3Roncr4PPd9RnRIFJtCZXHGdnrYXjmg1dlK3a9q31BhqQLReVwo q7DxP/oZ89MM8a4gNXNpWFlKKE/Ipol+H+oVJp8AfjWe3H4lCInfxslo/EQtPTCYcJse fKWEteMwkYhk6+pgM+zoWgw2ORvffedJy5xGjkXunCxyI8ZASZFhrJHtnKUBFkscw63F n/xIpGNSKQ962qjcuqCgrgrcU0937jZ/swFdSHOpaIf47h/IGHbzwgHTEDJUPWapTiXv Y/fpZp4p8v5+MS2Ry3bVMvxGmgNeKsqf7eyqPQYQcSQX94AqkbGdb4Em3BQdG6ZvEreG IXtw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 62-20020a630441000000b0051453dfd139si3717921pge.613.2023.04.13.20.33.49; Thu, 13 Apr 2023 20:34:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229821AbjDND0S (ORCPT + 99 others); Thu, 13 Apr 2023 23:26:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229564AbjDND0L (ORCPT ); Thu, 13 Apr 2023 23:26:11 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 321FC2D78; Thu, 13 Apr 2023 20:26:09 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PyMJB3CHYzrZqr; Fri, 14 Apr 2023 11:24:42 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 14 Apr 2023 11:26:06 +0800 From: Changbin Du To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , , , Hui Wang , Changbin Du Subject: [PATCH v4 2/2] perf: script: add new output field 'dsoff' to print dso offset Date: Fri, 14 Apr 2023 11:25:47 +0800 Message-ID: <20230414032547.2767909-3-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230414032547.2767909-1-changbin.du@huawei.com> References: <20230414032547.2767909-1-changbin.du@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763121028078023859?= X-GMAIL-MSGID: =?utf-8?q?1763121028078023859?= This adds a new 'dsoff' field to print dso offset for resolved symbols, and the offset is appended to dso name. Default output: $ perf script ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1) Display 'dsoff' field: $ perf script -F +dsoff ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so+0x1c4b5) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1+0x68d0) ls 2695501 3011030.487019: 500000 cycles: ffffffff992a6db0 [unknown] ([unknown]) Signed-off-by: Changbin Du --- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 25 +++++++++++++++++++++++- tools/perf/util/evsel_fprintf.c | 6 ++++++ tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt index 68e37de5fae4..20a1558c555f 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt @@ -130,7 +130,7 @@ OPTIONS -F:: --fields:: Comma separated list of fields to print. Options are: - comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, + comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoff, addr, symoff, srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen, synth, phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat, diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 69394ac0a20d..95dd6d650c21 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -130,6 +130,7 @@ enum perf_output_field { PERF_OUTPUT_BRSTACKINSNLEN = 1ULL << 36, PERF_OUTPUT_MACHINE_PID = 1ULL << 37, PERF_OUTPUT_VCPU = 1ULL << 38, + PERF_OUTPUT_DSOFF = 1ULL << 39, }; struct perf_script { @@ -171,6 +172,7 @@ struct output_option { {.str = "ip", .field = PERF_OUTPUT_IP}, {.str = "sym", .field = PERF_OUTPUT_SYM}, {.str = "dso", .field = PERF_OUTPUT_DSO}, + {.str = "dsoff", .field = PERF_OUTPUT_DSOFF}, {.str = "addr", .field = PERF_OUTPUT_ADDR}, {.str = "symoff", .field = PERF_OUTPUT_SYMOFFSET}, {.str = "srcline", .field = PERF_OUTPUT_SRCLINE}, @@ -559,6 +561,9 @@ static void set_print_ip_opts(struct perf_event_attr *attr) if (PRINT_FIELD(DSO)) output[type].print_ip_opts |= EVSEL__PRINT_DSO; + if (PRINT_FIELD(DSOFF)) + output[type].print_ip_opts |= EVSEL__PRINT_DSOFF; + if (PRINT_FIELD(SYMOFFSET)) output[type].print_ip_opts |= EVSEL__PRINT_SYMOFFSET; @@ -612,6 +617,10 @@ static int perf_session__check_output_opt(struct perf_session *session) if (evsel == NULL) continue; + /* 'dsoff' implys 'dso' field */ + if (output[j].fields & PERF_OUTPUT_DSOFF) + output[j].fields |= PERF_OUTPUT_DSO; + set_print_ip_opts(&evsel->core.attr); tod |= output[j].fields & PERF_OUTPUT_TOD; } @@ -916,6 +925,8 @@ static int perf_sample__fprintf_brstack(struct perf_sample *sample, if (PRINT_FIELD(DSO)) { printed += fprintf(fp, "("); printed += map__fprintf_dsoname(alf.map, fp); + if (PRINT_FIELD(DSOFF) && alf.map && alf.map->dso) + printed += fprintf(fp, "+0x%lx", alf.addr); printed += fprintf(fp, ")"); } @@ -923,6 +934,8 @@ static int perf_sample__fprintf_brstack(struct perf_sample *sample, if (PRINT_FIELD(DSO)) { printed += fprintf(fp, "("); printed += map__fprintf_dsoname(alt.map, fp); + if (PRINT_FIELD(DSOFF) && alt.map && alt.map->dso) + printed += fprintf(fp, "+0x%lx", alt.addr); printed += fprintf(fp, ")"); } @@ -959,6 +972,8 @@ static int perf_sample__fprintf_brstacksym(struct perf_sample *sample, if (PRINT_FIELD(DSO)) { printed += fprintf(fp, "("); printed += map__fprintf_dsoname(alf.map, fp); + if (PRINT_FIELD(DSOFF) && alf.map && alf.map->dso) + printed += fprintf(fp, "+0x%lx", alf.addr); printed += fprintf(fp, ")"); } printed += fprintf(fp, "%c", '/'); @@ -966,6 +981,8 @@ static int perf_sample__fprintf_brstacksym(struct perf_sample *sample, if (PRINT_FIELD(DSO)) { printed += fprintf(fp, "("); printed += map__fprintf_dsoname(alt.map, fp); + if (PRINT_FIELD(DSOFF) && alt.map && alt.map->dso) + printed += fprintf(fp, "+0x%lx", alt.addr); printed += fprintf(fp, ")"); } printed += print_bstack_flags(fp, entries + i); @@ -1006,12 +1023,16 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample, if (PRINT_FIELD(DSO)) { printed += fprintf(fp, "("); printed += map__fprintf_dsoname(alf.map, fp); + if (PRINT_FIELD(DSOFF) && alf.map && alf.map->dso) + printed += fprintf(fp, "+0x%lx", alf.addr); printed += fprintf(fp, ")"); } printed += fprintf(fp, "/0x%"PRIx64, to); if (PRINT_FIELD(DSO)) { printed += fprintf(fp, "("); printed += map__fprintf_dsoname(alt.map, fp); + if (PRINT_FIELD(DSOFF) && alt.map && alt.map->dso) + printed += fprintf(fp, "+0x%lx", alt.addr); printed += fprintf(fp, ")"); } printed += print_bstack_flags(fp, entries + i); @@ -1378,6 +1399,8 @@ static int perf_sample__fprintf_addr(struct perf_sample *sample, if (PRINT_FIELD(DSO)) { printed += fprintf(fp, " ("); printed += map__fprintf_dsoname(al.map, fp); + if (PRINT_FIELD(DSOFF) && al.map && al.map->dso) + printed += fprintf(fp, "+0x%lx", al.addr); printed += fprintf(fp, ")"); } out: @@ -3851,7 +3874,7 @@ int cmd_script(int argc, const char **argv) "comma separated output fields prepend with 'type:'. " "+field to add and -field to remove." "Valid types: hw,sw,trace,raw,synth. " - "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," + "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,dsoff" "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," "brstackinsnlen,brstackoff,callindent,insn,insnlen,synth," diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c index 1fb8044d402e..ae8333772c76 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c @@ -116,6 +116,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, int print_ip = print_opts & EVSEL__PRINT_IP; int print_sym = print_opts & EVSEL__PRINT_SYM; int print_dso = print_opts & EVSEL__PRINT_DSO; + int print_dsoff = print_opts & EVSEL__PRINT_DSOFF; int print_symoffset = print_opts & EVSEL__PRINT_SYMOFFSET; int print_oneline = print_opts & EVSEL__PRINT_ONELINE; int print_srcline = print_opts & EVSEL__PRINT_SRCLINE; @@ -174,6 +175,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, if (print_dso && (!sym || !sym->inlined)) { printed += fprintf(fp, " ("); printed += map__fprintf_dsoname(map, fp); + if (print_dsoff && map && map->dso) + printed += fprintf(fp, "+0x%lx", addr); printed += fprintf(fp, ")"); } @@ -209,6 +212,7 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al, int print_ip = print_opts & EVSEL__PRINT_IP; int print_sym = print_opts & EVSEL__PRINT_SYM; int print_dso = print_opts & EVSEL__PRINT_DSO; + int print_dsoff = print_opts & EVSEL__PRINT_DSOFF; int print_symoffset = print_opts & EVSEL__PRINT_SYMOFFSET; int print_srcline = print_opts & EVSEL__PRINT_SRCLINE; int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR; @@ -237,6 +241,8 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al, if (print_dso) { printed += fprintf(fp, " ("); printed += map__fprintf_dsoname(al->map, fp); + if (print_dsoff && al->map && al->map->dso) + printed += fprintf(fp, "+0x%lx", al->addr); printed += fprintf(fp, ")"); } diff --git a/tools/perf/util/evsel_fprintf.h b/tools/perf/util/evsel_fprintf.h index 3093d096c29f..c8a9fac2f2dd 100644 --- a/tools/perf/util/evsel_fprintf.h +++ b/tools/perf/util/evsel_fprintf.h @@ -26,6 +26,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILE #define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6) #define EVSEL__PRINT_CALLCHAIN_ARROW (1<<7) #define EVSEL__PRINT_SKIP_IGNORED (1<<8) +#define EVSEL__PRINT_DSOFF (1<<9) struct addr_location; struct perf_event_attr;