From nobody Mon Apr 13 18:45:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D50CC433FE for ; Wed, 16 Nov 2022 07:13:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232730AbiKPHNJ (ORCPT ); Wed, 16 Nov 2022 02:13:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230280AbiKPHNG (ORCPT ); Wed, 16 Nov 2022 02:13:06 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 468141F9C1 for ; Tue, 15 Nov 2022 23:13:06 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id c188-20020a25c0c5000000b006d8eba07513so15519139ybf.17 for ; Tue, 15 Nov 2022 23:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rZhTm2sCwM0sd4mB+pucosVTiyv4zqlp4wWT/R2sU44=; b=NeVYHzQSh9LPa95VeNyD2erJ5RST3qbDcp39rn2M+WV63VJbLXccHQe0jOp3281h// /6QDJStsa5HeC5719ZaHB7dKPIFqJBqwDDDrFvy2JBQFdO9waPThCkNtqp/L8dsBc4Zl je1aGmwz5ZpLRBYgX26Ln8BGYlh3RTzfhwGsIJO3BVaVIrYXzvr4K4LAAWJxYvGT5+sU 0oQCfAFtFchWmcggIp+rTz96cBrbRZVZUb/rV1zk2Wvp5T3s0OowWJ2KL+bqnDxJ3ky0 cex8DimvjWYivY/yPs+0ZEjDCc3R3QCmzuVRoMis6Igioz0Kmnwbd3NVzMGuYdsRoNg4 BfZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rZhTm2sCwM0sd4mB+pucosVTiyv4zqlp4wWT/R2sU44=; b=MNGhNzzUTRxYLHGqy5PHz/M22tcexP944NxBqb9a6ivfmxbHsbWnz4C54jgv496h3v BXZgBCVJk4eydSdSkOy1zdOTrf1yKmw22MdDgD5vcvqRrwDpmO4rCe82+0SS8u1FrwPZ rkJUlKOrUo27IdCGA25vNmcztXmRnzvtUQ2o0Wu5jofcpmofstQ117dhZznuu+hxxDSj 6DNjwv24pPz+3FAouo9tLr1kGAhndcxCz6HQDRIv2+jnRn7dJALRoIJe0I2S0Dfdg7LH Mli8l5BMewdga4KE+oU5ZH8cLYLxyRDbcml4m7VnZl7o+GMWYOtfEnB8eYa7pntNLaNE Ib/g== X-Gm-Message-State: ANoB5pn3dGvkUzL46N17r62xJPM1e5C2gut7WNSgg4PH01Q1d9AwjxQ3 lL6abBi7PzPnfvIiWiqa53buiHV7fPDN X-Google-Smtp-Source: AA0mqf4LN7zMZJXkzIGBeqXaFaLoGtCJ64z/NuKcPfkUISn4se81/eXU9lqH0dIC9hkuM7/yCNFurBEsEak4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bf0f:58f3:342e:c1ec]) (user=irogers job=sendgmr) by 2002:a81:ad7:0:b0:36f:d14a:6158 with SMTP id 206-20020a810ad7000000b0036fd14a6158mr19697123ywk.325.1668582785931; Tue, 15 Nov 2022 23:13:05 -0800 (PST) Date: Tue, 15 Nov 2022 23:12:56 -0800 In-Reply-To: <20221116071259.2832681-1-irogers@google.com> Message-Id: <20221116071259.2832681-2-irogers@google.com> Mime-Version: 1.0 References: <20221116071259.2832681-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH v1 1/4] perf list: Fix asan issue From: Ian Rogers To: Weilin Wang , Perry Taylor , Caleb Biggers , Leo Yan , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sandipan Das , Kajol Jain , Zhengjun Xing , Kan Liang , Ravi Bangoria , Xin Gao , Rob Herring , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Missed due to the void* being a valid cast. Fixes: c9367a0658eb ("perf list: Add JSON output option") Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index aec139f7fbb2..0450fbfd0a5c 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -466,7 +466,7 @@ int cmd_list(int argc, const char **argv) pr_warning("WARNING: hybrid cputype is not supported!\n"); } } - print_cb.print_start(&ps); + print_cb.print_start(ps); =20 if (argc =3D=3D 0) { default_ps.metrics =3D true; --=20 2.38.1.431.g37b22c650d-goog From nobody Mon Apr 13 18:45:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1090C433FE for ; Wed, 16 Nov 2022 07:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232835AbiKPHNW (ORCPT ); Wed, 16 Nov 2022 02:13:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232716AbiKPHNJ (ORCPT ); Wed, 16 Nov 2022 02:13:09 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C335920181 for ; Tue, 15 Nov 2022 23:13:08 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id bw25-20020a056a00409900b0056bdd4f8818so9216923pfb.15 for ; Tue, 15 Nov 2022 23:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NVCMLdIaGKYl515v9BSPBB+0JzpaXzttaEc2YraX+wA=; b=YBypCi/EgROQraVH/pC6M9CYoxe2JUhU33fWhx/1ZIT2+vPvTKkBb3E6wsNNiCtmO1 T52/NNdz/qmL4tHIZzdA8Jid+rFwh5E1mxSJU/rQe9N2flMehzZ5+KYViypk9Gap8Ipa ycW4RH5w/HD9PtSzaCepkSW4ZQV7kGaS4pxw5rhdoJZNASDkmL2H1ZcUo5iquj78GHh2 o32wRcdJS1LgBhX475WE6YVdIPvjqSmKdEM4XEe4Gw8d9rPMCqH3ZZWU31bxu+0yAGXw G79ILt8QsdeDMgoSGREhRNzYWZF4Kmu5qJAZih6OttXSgEePNViLoSm9Om/k5GdcSuqS sGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NVCMLdIaGKYl515v9BSPBB+0JzpaXzttaEc2YraX+wA=; b=wjqaU66biaWvauV7+EbDm2kmMWfOw2bl83pLCkAumyZ88+5dxgWJ6F/ooW40En11c1 TmC9nMVVkGdgmPhfxZMdGu6Bqs6Ddnn0LvlXMGh5X3Mmr0E+gbSiRz1woj28iKiJ4Xzu Uw5nACMfi0ARrDRR6ggfqkiJwCU9BjJ/Wi/3vRvx0BIg+3Ecw3xkgqcV5yPoQZuU4pYa AXgigD3+AaKrEaxap+PtU1l0GX1CKB9W+GIoj8NqXryerOKqSUu6wMU6kmkPePEmEz5R WFhjf9mWsOSWmOuNJXdQJHV0h9HpVTvZWNBgWuvZbJeAsmhJwvHM1sUrbSKQ6V1hIos3 yf3w== X-Gm-Message-State: ANoB5pmiyR1+oDdUeubbAGUUG5jQ+YObSYSunzmn/NP37Iz/6hHQD4D6 MaZCsUTNYos4rzS5HttlEP7ChZmABTzs X-Google-Smtp-Source: AA0mqf5yOlyfg23shcD/S8pZEuV65Yr6XU4+Cu8EefLfLGvQd24JxozE1zWMO4ySuQt8AswjPsOipUHBRcJt X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bf0f:58f3:342e:c1ec]) (user=irogers job=sendgmr) by 2002:aa7:8f0d:0:b0:56b:d738:9b with SMTP id x13-20020aa78f0d000000b0056bd738009bmr21882110pfr.61.1668582788294; Tue, 15 Nov 2022 23:13:08 -0800 (PST) Date: Tue, 15 Nov 2022 23:12:57 -0800 In-Reply-To: <20221116071259.2832681-1-irogers@google.com> Message-Id: <20221116071259.2832681-3-irogers@google.com> Mime-Version: 1.0 References: <20221116071259.2832681-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH v1 2/4] perf list: Support newlines in wordwrap From: Ian Rogers To: Weilin Wang , Perry Taylor , Caleb Biggers , Leo Yan , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sandipan Das , Kajol Jain , Zhengjun Xing , Kan Liang , Ravi Bangoria , Xin Gao , Rob Herring , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rather than a newline starting from column 0, record a newline was seen and then add the newline and space before the next word. Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 0450fbfd0a5c..43c635d58627 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -73,17 +73,19 @@ static void wordwrap(const char *s, int start, int max,= int corr) { int column =3D start; int n; + bool saw_newline =3D false; =20 while (*s) { - int wlen =3D strcspn(s, " \t"); + int wlen =3D strcspn(s, " \t\n"); =20 - if (column + wlen >=3D max && column > start) { + if ((column + wlen >=3D max && column > start) || saw_newline) { printf("\n%*s", start, ""); column =3D start + corr; } n =3D printf("%s%.*s", column > start ? " " : "", wlen, s); if (n <=3D 0) break; + saw_newline =3D s[wlen] =3D=3D '\n'; s +=3D wlen; column +=3D n; s =3D skip_spaces(s); @@ -145,7 +147,7 @@ static void default_print_event(void *ps, const char *p= mu_name, const char *topi wordwrap(desc, 8, pager_get_columns(), 0); printf("]\n"); } - + long_desc =3D long_desc ?: desc; if (long_desc && print_state->long_desc) { printf("%*s", 8, "["); wordwrap(long_desc, 8, pager_get_columns(), 0); @@ -153,7 +155,8 @@ static void default_print_event(void *ps, const char *p= mu_name, const char *topi } =20 if (print_state->detailed && encoding_desc) { - printf("%*s%s", 8, "", encoding_desc); + printf("%*s", 8, ""); + wordwrap(encoding_desc, 8, pager_get_columns(), 0); if (metric_name) printf(" MetricName: %s", metric_name); if (metric_expr) --=20 2.38.1.431.g37b22c650d-goog From nobody Mon Apr 13 18:45:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A39BC4332F for ; Wed, 16 Nov 2022 07:13:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232848AbiKPHNc (ORCPT ); Wed, 16 Nov 2022 02:13:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232775AbiKPHNO (ORCPT ); Wed, 16 Nov 2022 02:13:14 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 573FE205EF for ; Tue, 15 Nov 2022 23:13:11 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id z125-20020a25c983000000b006dc905e6ccfso15201649ybf.1 for ; Tue, 15 Nov 2022 23:13:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8BtTjoVTgJBCnMEOfrF9LMVewuWD63PoncZuyhv6/RQ=; b=qMXfYRpM94F/ZAAUpeaVfNAUPzTX87g3JG1eVb+B3lSzOCPQq7ftZwYck58S/u3iMU N2UzvX6bAF+hHMbXbBxhrBndXHpJShGWWP9xcKFOMp3lnoVeMOCHV/Si6N8Esvh7Amts GB59QsaFyxFp7MM8q36anQQ2jfAgXgoRtXXW946thbBbrWwp42qMWn/Jv4SJbIChlhUO 81F9YNt55oSCcBQwok9R4x3FufoGxjqEm8yyyhynYkVWfQrgV6MDiXsLcUb/LzDuGgmG WfBQj6IjYw+L8HIEpm+VbyFHdKdl1fjhWhJtU/hoOAbvc0/jY6DnaVkkeeVVfVczuPz0 BOHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8BtTjoVTgJBCnMEOfrF9LMVewuWD63PoncZuyhv6/RQ=; b=YionqmmSU8f+cKxAumMEugplPJHlDSDm9Tk0dq0TwEqoCBVcNgh5xvkU/yvTrj5fTw o1OdoHQr7jS6Rx/uwGbmCIR0vgI1iY8u+7l2uf95Cm3cqI07cblrhnOTvysq4bKqzO66 sju32zHCuyQaD50Uwm5WoSNzXQc4BgiDdaC8Iq446MOb6RntzJ4dzlFXDECT7sU5MXHJ YynRNgVEgeiPEqY4FHBEsnC9jImWyaRxrmrPWmAE9WKUmXiPFIMxugUD1YbsKJeBZ1oX FFjSueqlEZqx2q5COn7F3RlQ77P9wcBvzkx8tNpo5v+umtb2binABbdcSybObmx5kDLw M/yQ== X-Gm-Message-State: ANoB5pmKH4sTdDTKr7HvZXpDBXjJmUqjGKgc7wQ/KE2EvmNm4ycUMPfP uPloVf4A0QohHR0LoJL9DS3myAK/jBey X-Google-Smtp-Source: AA0mqf5AqRay4kWJpBlr8wcHh3MyyR/e1oEbI/Gc/G3dmbepVgwzY3QgfAuQrNKkSosSEqB1wtALddShzsts X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bf0f:58f3:342e:c1ec]) (user=irogers job=sendgmr) by 2002:a25:aaeb:0:b0:6dd:89ad:6c33 with SMTP id t98-20020a25aaeb000000b006dd89ad6c33mr20698230ybi.188.1668582790604; Tue, 15 Nov 2022 23:13:10 -0800 (PST) Date: Tue, 15 Nov 2022 23:12:58 -0800 In-Reply-To: <20221116071259.2832681-1-irogers@google.com> Message-Id: <20221116071259.2832681-4-irogers@google.com> Mime-Version: 1.0 References: <20221116071259.2832681-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH v1 3/4] perf list: Json escape encoding improvements From: Ian Rogers To: Weilin Wang , Perry Taylor , Caleb Biggers , Leo Yan , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sandipan Das , Kajol Jain , Zhengjun Xing , Kan Liang , Ravi Bangoria , Xin Gao , Rob Herring , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use strbuf to make the string under construction's length unlimited. Use the format %s to mean a literal string copy and %S to signify a need to escape the string. Add supported for escaping a newline character. Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 109 +++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 42 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 43c635d58627..30937e1dd82c 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -17,6 +17,7 @@ #include "util/metricgroup.h" #include "util/string2.h" #include "util/strlist.h" +#include "util/strbuf.h" #include #include #include @@ -249,45 +250,56 @@ static void json_print_end(void *ps) printf("%s]\n", print_state->need_sep ? "\n" : ""); } =20 -static void fix_escape_printf(const char *fmt, ...) +static void fix_escape_printf(struct strbuf *buf, const char *fmt, ...) { va_list args; - char buf[2048]; - size_t buf_pos =3D 0; =20 va_start(args, fmt); + strbuf_setlen(buf, 0); for (size_t fmt_pos =3D 0; fmt_pos < strlen(fmt); fmt_pos++) { switch (fmt[fmt_pos]) { - case '%': { - const char *s =3D va_arg(args, const char*); - + case '%': fmt_pos++; - assert(fmt[fmt_pos] =3D=3D 's'); - for (size_t s_pos =3D 0; s_pos < strlen(s); s_pos++) { - switch (s[s_pos]) { - case '\\': - __fallthrough; - case '\"': - buf[buf_pos++] =3D '\\'; - assert(buf_pos < sizeof(buf)); - __fallthrough; - default: - buf[buf_pos++] =3D s[s_pos]; - assert(buf_pos < sizeof(buf)); - break; + switch (fmt[fmt_pos]) { + case 's': { + const char *s =3D va_arg(args, const char*); + + strbuf_addstr(buf, s); + break; + } + case 'S': { + const char *s =3D va_arg(args, const char*); + + for (size_t s_pos =3D 0; s_pos < strlen(s); s_pos++) { + switch (s[s_pos]) { + case '\n': + strbuf_addstr(buf, "\\n"); + break; + case '\\': + __fallthrough; + case '\"': + strbuf_addch(buf, '\\'); + __fallthrough; + default: + strbuf_addch(buf, s[s_pos]); + break; + } } + break; + } + default: + pr_err("Unexpected format character '%c'\n", fmt[fmt_pos]); + strbuf_addch(buf, '%'); + strbuf_addch(buf, fmt[fmt_pos]); } break; - } default: - buf[buf_pos++] =3D fmt[fmt_pos]; - assert(buf_pos < sizeof(buf)); + strbuf_addch(buf, fmt[fmt_pos]); break; } } va_end(args); - buf[buf_pos] =3D '\0'; - fputs(buf, stdout); + fputs(buf->buf, stdout); } =20 static void json_print_event(void *ps, const char *pmu_name, const char *t= opic, @@ -300,62 +312,71 @@ static void json_print_event(void *ps, const char *pm= u_name, const char *topic, { struct json_print_state *print_state =3D ps; bool need_sep =3D false; + struct strbuf buf; =20 + strbuf_init(&buf, 0); printf("%s{\n", print_state->need_sep ? ",\n" : ""); print_state->need_sep =3D true; if (pmu_name) { - fix_escape_printf("\t\"Unit\": \"%s\"", pmu_name); + fix_escape_printf(&buf, "\t\"Unit\": \"%S\"", pmu_name); need_sep =3D true; } if (topic) { - fix_escape_printf("%s\t\"Topic\": \"%s\"", need_sep ? ",\n" : "", topic); + fix_escape_printf(&buf, "%s\t\"Topic\": \"%S\"", need_sep ? ",\n" : "", = topic); need_sep =3D true; } if (event_name) { - fix_escape_printf("%s\t\"EventName\": \"%s\"", need_sep ? ",\n" : "", ev= ent_name); + fix_escape_printf(&buf, "%s\t\"EventName\": \"%S\"", need_sep ? ",\n" : = "", + event_name); need_sep =3D true; } if (event_alias && strlen(event_alias)) { - fix_escape_printf("%s\t\"EventAlias\": \"%s\"", need_sep ? ",\n" : "", e= vent_alias); + fix_escape_printf(&buf, "%s\t\"EventAlias\": \"%S\"", need_sep ? ",\n" := "", + event_alias); need_sep =3D true; } if (scale_unit && strlen(scale_unit)) { - fix_escape_printf("%s\t\"ScaleUnit\": \"%s\"", need_sep ? ",\n" : "", + fix_escape_printf(&buf, "%s\t\"ScaleUnit\": \"%S\"", need_sep ? ",\n" : = "", scale_unit); need_sep =3D true; } if (event_type_desc) { - fix_escape_printf("%s\t\"EventType\": \"%s\"", need_sep ? ",\n" : "", + fix_escape_printf(&buf, "%s\t\"EventType\": \"%S\"", need_sep ? ",\n" : = "", event_type_desc); need_sep =3D true; } if (deprecated) { - fix_escape_printf("%s\t\"Deprecated\": \"%s\"", need_sep ? ",\n" : "", + fix_escape_printf(&buf, "%s\t\"Deprecated\": \"%S\"", need_sep ? ",\n" := "", deprecated ? "1" : "0"); need_sep =3D true; } if (desc) { - fix_escape_printf("%s\t\"BriefDescription\": \"%s\"", need_sep ? ",\n" := "", desc); + fix_escape_printf(&buf, "%s\t\"BriefDescription\": \"%S\"", need_sep ? "= ,\n" : "", + desc); need_sep =3D true; } if (long_desc) { - fix_escape_printf("%s\t\"PublicDescription\": \"%s\"", need_sep ? ",\n" = : "", + fix_escape_printf(&buf, "%s\t\"PublicDescription\": \"%S\"", need_sep ? = ",\n" : "", long_desc); need_sep =3D true; } if (encoding_desc) { - fix_escape_printf("%s\t\"Encoding\": \"%s\"", need_sep ? ",\n" : "", enc= oding_desc); + fix_escape_printf(&buf, "%s\t\"Encoding\": \"%S\"", need_sep ? ",\n" : "= ", + encoding_desc); need_sep =3D true; } if (metric_name) { - fix_escape_printf("%s\t\"MetricName\": \"%s\"", need_sep ? ",\n" : "", m= etric_name); + fix_escape_printf(&buf, "%s\t\"MetricName\": \"%S\"", need_sep ? ",\n" := "", + metric_name); need_sep =3D true; } if (metric_expr) { - fix_escape_printf("%s\t\"MetricExpr\": \"%s\"", need_sep ? ",\n" : "", m= etric_expr); + fix_escape_printf(&buf, "%s\t\"MetricExpr\": \"%S\"", need_sep ? ",\n" := "", + metric_expr); need_sep =3D true; } printf("%s}", need_sep ? "\n" : ""); + strbuf_release(&buf); } =20 static void json_print_metric(void *ps __maybe_unused, const char *group, @@ -365,35 +386,39 @@ static void json_print_metric(void *ps __maybe_unused= , const char *group, { struct json_print_state *print_state =3D ps; bool need_sep =3D false; + struct strbuf buf; =20 + strbuf_init(&buf, 0); printf("%s{\n", print_state->need_sep ? ",\n" : ""); print_state->need_sep =3D true; if (group) { - fix_escape_printf("\t\"MetricGroup\": \"%s\"", group); + fix_escape_printf(&buf, "\t\"MetricGroup\": \"%S\"", group); need_sep =3D true; } if (name) { - fix_escape_printf("%s\t\"MetricName\": \"%s\"", need_sep ? ",\n" : "", n= ame); + fix_escape_printf(&buf, "%s\t\"MetricName\": \"%S\"", need_sep ? ",\n" := "", name); need_sep =3D true; } if (expr) { - fix_escape_printf("%s\t\"MetricExpr\": \"%s\"", need_sep ? ",\n" : "", e= xpr); + fix_escape_printf(&buf, "%s\t\"MetricExpr\": \"%S\"", need_sep ? ",\n" := "", expr); need_sep =3D true; } if (unit) { - fix_escape_printf("%s\t\"ScaleUnit\": \"%s\"", need_sep ? ",\n" : "", un= it); + fix_escape_printf(&buf, "%s\t\"ScaleUnit\": \"%S\"", need_sep ? ",\n" : = "", unit); need_sep =3D true; } if (desc) { - fix_escape_printf("%s\t\"BriefDescription\": \"%s\"", need_sep ? ",\n" := "", desc); + fix_escape_printf(&buf, "%s\t\"BriefDescription\": \"%S\"", need_sep ? "= ,\n" : "", + desc); need_sep =3D true; } if (long_desc) { - fix_escape_printf("%s\t\"PublicDescription\": \"%s\"", need_sep ? ",\n" = : "", + fix_escape_printf(&buf, "%s\t\"PublicDescription\": \"%S\"", need_sep ? = ",\n" : "", long_desc); need_sep =3D true; } printf("%s}", need_sep ? "\n" : ""); + strbuf_release(&buf); } =20 int cmd_list(int argc, const char **argv) --=20 2.38.1.431.g37b22c650d-goog From nobody Mon Apr 13 18:45:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8695C4332F for ; Wed, 16 Nov 2022 07:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231311AbiKPHN2 (ORCPT ); Wed, 16 Nov 2022 02:13:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232715AbiKPHNR (ORCPT ); Wed, 16 Nov 2022 02:13:17 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32B8E20F59 for ; Tue, 15 Nov 2022 23:13:13 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-385bbf9bc8fso38274697b3.23 for ; Tue, 15 Nov 2022 23:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wK54JSKXe0LqXOZ3d575hQDmq52LEert5D/pS8cJUkE=; b=U1d7MimG9gAoAlzFe+38ukpZbqtI6+WSbYJnASee2xaNcWt9opU7e/VTdFaLjmpQZ2 X6zxHepXPQVF/knczaV0Pk8JFjDlEBpBHbz22Y4XJdOcTCUABE2+IndsM8s4fHNawIC9 MD1gxzR8AmL78bWa8wfA+IVoUCxS5DHItTEtHlR2nrlphjwbkXfl+hxyZdBarRoMrzr3 NLndOR5LqnrWjzZmVrvhyHo143J9+5KkXgPEmb1ylBLCZkMwVDWkTAftNfK6J3O5TMag GaUcHNH+DaKajLT22/xCtcYz0jKRXgawxf9IPirCd6aZfH/lds7D6x85YrlWF35ZX96L V0Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wK54JSKXe0LqXOZ3d575hQDmq52LEert5D/pS8cJUkE=; b=JKjGTNSjhIyfJSxKCKo4RN9LROrDMz7pZnTtJH2zsxlNFnkICNPCYXrLOhv9pI7US8 FdvQWWLeh9X4qkMZnZ3N5iUeqSvpajLywOM6JWWw0w6r5HfWHTZzZK34wmNBHwW4uODC 5gIEpYKXtTIyHp+Ad1DBGbxyRQM/IaFWLmhhIKPQlcFXFG/mUaYiiToezfofC3kyhsUg 3FsOiReGkJx18pJBzbCgx2ldySlkPQtxgglVBG15e4YJwkoL2mToL+f/kOB75siLAsf8 Y4oHl03psuknSsjjCeqBsH6EBuQV7cRrSqOVl88x1W2LN5rxypAPzTW/es6Wy8LboXPY LPzw== X-Gm-Message-State: ANoB5pnQDhAyJDhj8VEl4IQfkhT8TKUWDP/l8TKObKqRC1+vg3W8WCmR JUBjEClK3opCvYrEloUQVvwjCtDLliOX X-Google-Smtp-Source: AA0mqf4Owhg9TSF5BqPmkokKmNN1T62eQp1AeaL0nFC6RJ1ulWDmRb4Tbo2Zj8w/ORKb01IV4bsRzBTCf1i+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bf0f:58f3:342e:c1ec]) (user=irogers job=sendgmr) by 2002:a05:690c:e:b0:388:2fb:57d9 with SMTP id bc14-20020a05690c000e00b0038802fb57d9mr4675335ywb.371.1668582792508; Tue, 15 Nov 2022 23:13:12 -0800 (PST) Date: Tue, 15 Nov 2022 23:12:59 -0800 In-Reply-To: <20221116071259.2832681-1-irogers@google.com> Message-Id: <20221116071259.2832681-5-irogers@google.com> Mime-Version: 1.0 References: <20221116071259.2832681-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH v1 4/4] perf list: List callback support for libpfm From: Ian Rogers To: Weilin Wang , Perry Taylor , Caleb Biggers , Leo Yan , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sandipan Das , Kajol Jain , Zhengjun Xing , Kan Liang , Ravi Bangoria , Xin Gao , Rob Herring , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Missed previously, add libpfm support for 'perf list' callbacks and thereby json support. Fixes: df936cadfb58ba93 ("perf stat: Add JSON output option") Signed-off-by: Ian Rogers --- tools/perf/util/pfm.c | 154 ++++++++++++++++++------------------------ tools/perf/util/pfm.h | 6 +- 2 files changed, 70 insertions(+), 90 deletions(-) diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c index f0bcfcab1a93..ac3227ba769c 100644 --- a/tools/perf/util/pfm.c +++ b/tools/perf/util/pfm.c @@ -12,6 +12,7 @@ #include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/strbuf.h" =20 #include #include @@ -130,53 +131,36 @@ static const char *srcs[PFM_ATTR_CTRL_MAX] =3D { }; =20 static void -print_attr_flags(pfm_event_attr_info_t *info) +print_attr_flags(struct strbuf *buf, const pfm_event_attr_info_t *info) { - int n =3D 0; + if (info->is_dfl) + strbuf_addf(buf, "[default] "); =20 - if (info->is_dfl) { - printf("[default] "); - n++; - } - - if (info->is_precise) { - printf("[precise] "); - n++; - } - - if (!n) - printf("- "); + if (info->is_precise) + strbuf_addf(buf, "[precise] "); } =20 static void -print_libpfm_events_detailed(pfm_event_info_t *info, bool long_desc) +print_libpfm_event(const struct print_callbacks *print_cb, void *print_sta= te, + const pfm_pmu_info_t *pinfo, const pfm_event_info_t *info, + struct strbuf *buf) { - pfm_event_attr_info_t ainfo; - const char *src; int j, ret; + char topic[80], name[80]; =20 - ainfo.size =3D sizeof(ainfo); + strbuf_setlen(buf, 0); + snprintf(topic, sizeof(topic), "pfm %s", pinfo->name); =20 - printf(" %s\n", info->name); - printf(" [%s]\n", info->desc); - if (long_desc) { - if (info->equiv) - printf(" Equiv: %s\n", info->equiv); + snprintf(name, sizeof(name), "%s::%s", pinfo->name, info->name); + strbuf_addf(buf, "Code: 0x%"PRIx64"\n", info->code); =20 - printf(" Code : 0x%"PRIx64"\n", info->code); - } pfm_for_each_event_attr(j, info) { - ret =3D pfm_get_event_attr_info(info->idx, j, - PFM_OS_PERF_EVENT_EXT, &ainfo); - if (ret !=3D PFM_SUCCESS) - continue; - - if (ainfo.type =3D=3D PFM_ATTR_UMASK) { - printf(" %s:%s\n", info->name, ainfo.name); - printf(" [%s]\n", ainfo.desc); - } + pfm_event_attr_info_t ainfo; + const char *src; =20 - if (!long_desc) + ainfo.size =3D sizeof(ainfo); + ret =3D pfm_get_event_attr_info(info->idx, j, PFM_OS_PERF_EVENT_EXT, &ai= nfo); + if (ret !=3D PFM_SUCCESS) continue; =20 if (ainfo.ctrl >=3D PFM_ATTR_CTRL_MAX) @@ -184,64 +168,74 @@ print_libpfm_events_detailed(pfm_event_info_t *info, = bool long_desc) =20 src =3D srcs[ainfo.ctrl]; switch (ainfo.type) { - case PFM_ATTR_UMASK: - printf(" Umask : 0x%02"PRIx64" : %s: ", - ainfo.code, src); - print_attr_flags(&ainfo); - putchar('\n'); + case PFM_ATTR_UMASK: /* Ignore for now */ break; case PFM_ATTR_MOD_BOOL: - printf(" Modif : %s: [%s] : %s (boolean)\n", src, - ainfo.name, ainfo.desc); + strbuf_addf(buf, " Modif: %s: [%s] : %s (boolean)\n", src, + ainfo.name, ainfo.desc); break; case PFM_ATTR_MOD_INTEGER: - printf(" Modif : %s: [%s] : %s (integer)\n", src, - ainfo.name, ainfo.desc); + strbuf_addf(buf, " Modif: %s: [%s] : %s (integer)\n", src, + ainfo.name, ainfo.desc); break; case PFM_ATTR_NONE: case PFM_ATTR_RAW_UMASK: case PFM_ATTR_MAX: default: - printf(" Attr : %s: [%s] : %s\n", src, - ainfo.name, ainfo.desc); + strbuf_addf(buf, " Attr: %s: [%s] : %s\n", src, + ainfo.name, ainfo.desc); } } -} + print_cb->print_event(print_state, + pinfo->name, + topic, + name, info->equiv, + /*scale_unit=3D*/NULL, + /*deprecated=3D*/NULL, "PFM event", + info->desc, /*long_desc=3D*/NULL, + /*encoding_desc=3D*/buf->buf, + /*metric_name=3D*/NULL, /*metric_expr=3D*/NULL); =20 -/* - * list all pmu::event:umask, pmu::event - * printed events may not be all valid combinations of umask for an event - */ -static void -print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info) -{ - pfm_event_attr_info_t ainfo; - int j, ret; - bool has_umask =3D false; + pfm_for_each_event_attr(j, info) { + pfm_event_attr_info_t ainfo; + const char *src; =20 - ainfo.size =3D sizeof(ainfo); + strbuf_setlen(buf, 0); =20 - pfm_for_each_event_attr(j, info) { - ret =3D pfm_get_event_attr_info(info->idx, j, - PFM_OS_PERF_EVENT_EXT, &ainfo); + ainfo.size =3D sizeof(ainfo); + ret =3D pfm_get_event_attr_info(info->idx, j, PFM_OS_PERF_EVENT_EXT, &ai= nfo); if (ret !=3D PFM_SUCCESS) continue; =20 - if (ainfo.type !=3D PFM_ATTR_UMASK) - continue; + if (ainfo.ctrl >=3D PFM_ATTR_CTRL_MAX) + ainfo.ctrl =3D PFM_ATTR_CTRL_UNKNOWN; =20 - printf("%s::%s:%s\n", pinfo->name, info->name, ainfo.name); - has_umask =3D true; + src =3D srcs[ainfo.ctrl]; + if (ainfo.type =3D=3D PFM_ATTR_UMASK) { + strbuf_addf(buf, "Umask: 0x%02"PRIx64" : %s: ", + ainfo.code, src); + print_attr_flags(buf, &ainfo); + snprintf(name, sizeof(name), "%s::%s:%s", + pinfo->name, info->name, ainfo.name); + print_cb->print_event(print_state, + pinfo->name, + topic, + name, /*alias=3D*/NULL, + /*scale_unit=3D*/NULL, + /*deprecated=3D*/NULL, "PFM event", + ainfo.desc, /*long_desc=3D*/NULL, + /*encoding_desc=3D*/buf->buf, + /*metric_name=3D*/NULL, /*metric_expr=3D*/NULL); + } } - if (!has_umask) - printf("%s::%s\n", pinfo->name, info->name); } =20 -void print_libpfm_events(bool name_only, bool long_desc) +void print_libpfm_events(const struct print_callbacks *print_cb, void *pri= nt_state) { pfm_event_info_t info; pfm_pmu_info_t pinfo; - int i, p, ret; + int p, ret; + struct strbuf storage; =20 libpfm_initialize(); =20 @@ -249,12 +243,9 @@ void print_libpfm_events(bool name_only, bool long_des= c) info.size =3D sizeof(info); pinfo.size =3D sizeof(pinfo); =20 - if (!name_only) - puts("\nList of pre-defined events (to be used in --pfm-events):\n"); + strbuf_init(&storage, 2048); =20 pfm_for_all_pmus(p) { - bool printed_pmu =3D false; - ret =3D pfm_get_pmu_info(p, &pinfo); if (ret !=3D PFM_SUCCESS) continue; @@ -267,25 +258,14 @@ void print_libpfm_events(bool name_only, bool long_de= sc) if (pinfo.pmu =3D=3D PFM_PMU_PERF_EVENT) continue; =20 - for (i =3D pinfo.first_event; i !=3D -1; - i =3D pfm_get_event_next(i)) { - + for (int i =3D pinfo.first_event; i !=3D -1; i =3D pfm_get_event_next(i)= ) { ret =3D pfm_get_event_info(i, PFM_OS_PERF_EVENT_EXT, &info); if (ret !=3D PFM_SUCCESS) continue; =20 - if (!name_only && !printed_pmu) { - printf("%s:\n", pinfo.name); - printed_pmu =3D true; - } - - if (!name_only) - print_libpfm_events_detailed(&info, long_desc); - else - print_libpfm_events_raw(&pinfo, &info); + print_libpfm_event(print_cb, print_state, &pinfo, &info, &storage); } - if (!name_only && printed_pmu) - putchar('\n'); } + strbuf_release(&storage); } diff --git a/tools/perf/util/pfm.h b/tools/perf/util/pfm.h index 7d70dda87012..9cc9bb1e0949 100644 --- a/tools/perf/util/pfm.h +++ b/tools/perf/util/pfm.h @@ -7,13 +7,14 @@ #ifndef __PERF_PFM_H #define __PERF_PFM_H =20 +#include "print-events.h" #include =20 #ifdef HAVE_LIBPFM int parse_libpfm_events_option(const struct option *opt, const char *str, int unset); =20 -void print_libpfm_events(bool name_only, bool long_desc); +void print_libpfm_events(const struct print_callbacks *print_cb, void *pri= nt_state); =20 #else #include @@ -26,8 +27,7 @@ static inline int parse_libpfm_events_option( return 0; } =20 -static inline void print_libpfm_events(bool name_only __maybe_unused, - bool long_desc __maybe_unused) +static inline void print_libpfm_events(const struct print_callbacks *print= _cb, void *print_state) { } =20 --=20 2.38.1.431.g37b22c650d-goog