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=-17.1 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 B84E3C433DB for ; Fri, 25 Dec 2020 01:17:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BBFC22AAA for ; Fri, 25 Dec 2020 01:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729094AbgLYBMP (ORCPT ); Thu, 24 Dec 2020 20:12:15 -0500 Received: from mga14.intel.com ([192.55.52.115]:43304 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729020AbgLYBMO (ORCPT ); Thu, 24 Dec 2020 20:12:14 -0500 IronPort-SDR: mbJArsxW6ajJUpU1ly+P4n4XULDZXMKWnuvFc9KKqGqNwdU0RTj4q8ZAGV2zl3ViuBQqbDi2gF AV8LQgQi09cQ== X-IronPort-AV: E=McAfee;i="6000,8403,9845"; a="175413061" X-IronPort-AV: E=Sophos;i="5.78,446,1599548400"; d="scan'208";a="175413061" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Dec 2020 17:10:27 -0800 IronPort-SDR: +OHHilq/IrPO+iJzvYm5xAjWvjMoWs3Gr46iZLUmp8CnjYUno7Bfd9IbtUJrOyPlPnXftgZ9// FJJTLhkD0UhQ== X-IronPort-AV: E=Sophos;i="5.78,446,1599548400"; d="scan'208";a="458693055" Received: from yjin15-mobl1.ccr.corp.intel.com (HELO [10.238.4.27]) ([10.238.4.27]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Dec 2020 17:10:25 -0800 Subject: Re: [PATCH v2] perf script: Fix overrun issue for dynamically-allocated pmu type number To: Adrian Hunter , acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com References: <20201209005828.21302-1-yao.jin@linux.intel.com> <3fcdc860-d858-0166-de23-34fc6fe5c1cd@intel.com> From: "Jin, Yao" Message-ID: <18fde68f-0d24-5bcb-38e1-11dcf6f70bc1@linux.intel.com> Date: Fri, 25 Dec 2020 09:10:23 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <3fcdc860-d858-0166-de23-34fc6fe5c1cd@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnaldo, Jiri, On 12/11/2020 2:10 PM, Adrian Hunter wrote: > On 9/12/20 2:58 am, Jin Yao wrote: >> When unpacking the event which is from dynamic pmu, the array >> output[OUTPUT_TYPE_MAX] may be overrun. For example, type number of >> SKL uncore_imc is 10, but OUTPUT_TYPE_MAX is 7 now (OUTPUT_TYPE_MAX = >> PERF_TYPE_MAX + 1). >> >> /* In builtin-script.c */ >> process_event() >> { >> unsigned int type = output_type(attr->type); >> >> if (output[type].fields == 0) >> return; >> } >> >> output[10] is overrun. >> >> Create a type OUTPUT_TYPE_OTHER for dynamic pmu events, then >> output_type(attr->type) will return OUTPUT_TYPE_OTHER here. >> >> Note that if PERF_TYPE_MAX ever changed, then there would be a conflict >> between old perf.data files that had a dynamicaliy allocated PMU number >> that would then be the same as a fixed PERF_TYPE. >> >> Example: >> >> perf record --switch-events -C 0 -e "{cpu-clock,uncore_imc/data_reads/,uncore_imc/data_writes/}:SD" -a -- sleep 1 >> perf script >> >> Before: >> swapper 0 [000] 1479253.987551: 277766 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.987797: 246709 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.988127: 329883 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.988273: 146393 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.988523: 249977 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.988877: 354090 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.989023: 145940 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.989383: 359856 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1479253.989523: 140082 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> >> After: >> swapper 0 [000] 1397040.402011: 272384 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1397040.402011: 5396 uncore_imc/data_reads/: >> swapper 0 [000] 1397040.402011: 967 uncore_imc/data_writes/: >> swapper 0 [000] 1397040.402259: 249153 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1397040.402259: 7231 uncore_imc/data_reads/: >> swapper 0 [000] 1397040.402259: 1297 uncore_imc/data_writes/: >> swapper 0 [000] 1397040.402508: 249108 cpu-clock: ffffffff9d4ddb6f cpuidle_enter_state+0xdf ([kernel.kallsyms]) >> swapper 0 [000] 1397040.402508: 5333 uncore_imc/data_reads/: >> swapper 0 [000] 1397040.402508: 1008 uncore_imc/data_writes/: >> >> Signed-off-by: Jin Yao > > Acked-by: Adrian Hunter > Can this patch be accepted? :) Thanks Jin Yao >> --- >> v2: >> Remove Fixes tag because this issue has always been here, not caused by >> 1405720d4f26 ("perf script: Add 'synth' event type for synthesized events"). >> No functional change in v2. >> >> tools/perf/builtin-script.c | 18 +++++++++++++++++- >> 1 file changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c >> index 1c322c129185..5d8a64836228 100644 >> --- a/tools/perf/builtin-script.c >> +++ b/tools/perf/builtin-script.c >> @@ -183,6 +183,7 @@ struct output_option { >> >> enum { >> OUTPUT_TYPE_SYNTH = PERF_TYPE_MAX, >> + OUTPUT_TYPE_OTHER, >> OUTPUT_TYPE_MAX >> }; >> >> @@ -279,6 +280,18 @@ static struct { >> >> .invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT, >> }, >> + >> + [OUTPUT_TYPE_OTHER] = { >> + .user_set = false, >> + >> + .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID | >> + PERF_OUTPUT_CPU | PERF_OUTPUT_TIME | >> + PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP | >> + PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET | >> + PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD, >> + >> + .invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT, >> + }, >> }; >> >> struct evsel_script { >> @@ -339,8 +352,11 @@ static inline int output_type(unsigned int type) >> case PERF_TYPE_SYNTH: >> return OUTPUT_TYPE_SYNTH; >> default: >> - return type; >> + if (type < PERF_TYPE_MAX) >> + return type; >> } >> + >> + return OUTPUT_TYPE_OTHER; >> } >> >> static inline unsigned int attr_type(unsigned int type) >> >