From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4A4539934F for ; Thu, 19 Mar 2026 22:12:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773958343; cv=none; b=b0AwMejGGpBR8Mkhz8It+icGV3VKDM2iFWNuoZtPt/oDdJ+63jb7wWknlL1T5p/EppBNdtbDoSPdCp7VsizLZR5/6EH1FJz3Grm/4y4eqHX92bh7ZykJa5WGZKC1uBJauoMY4vzfwR8L65ZQODV+xCkjp0sA4RgCIHKptaULMQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773958343; c=relaxed/simple; bh=XmLbLrRjceSwXv6zJQ8+KYhU8L/1jbSWQDQH19D3wEw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=VJfrgth9o/8TkQur5TOoX9czZRJK6iSQfjtf1AvpAyVFthePueair2oWbFpmuyMwWG+gZ6xZSYxPiaw1B6op5yS7xQURq+odyXHXRMSzXKtU5DKOtbwiGwg2/QbGBL1mLHB7FBLT+wB5qCuRJWX4ER/9xfRB+HyxD7bsgLqSBQ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RkxKgDBV; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RkxKgDBV" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c0ba59a830so70938eec.0 for ; Thu, 19 Mar 2026 15:12:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773958341; x=1774563141; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=0I922xoaPU5hhzRGRg2d7tZLIGlSXmrSaPuYFLhDEl0=; b=RkxKgDBV1oGfWTf9AFstu+hyThXjZzhnChB0Ry77TeVZVwX83VZdspsiH55Xr429yJ Vdaw0xcxGKT6khII83uJSXZORNtvl2nhWL25/M2uY+9Sdop8a/UGWenSct8SKgXSMh4q Tg6wAWPsS4oPZZiAYlsoAfcIL45phSudTIGixsHefE2eqar5Y4d2H7VBiLFP+PkozRe5 8SXYxRErWeeLLTmbEMZFQQi0dneMIXdmWxZspi7m3WTv5xu/UAYPD3vdUAXdqHrVtyOu ZbIm/seCjgPAkKUUM1hisHpKtTaRfE0CwMZX1ju4gw4dRpGx45oI6lvNwU9fa4ub6Xmi Zi0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773958341; x=1774563141; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0I922xoaPU5hhzRGRg2d7tZLIGlSXmrSaPuYFLhDEl0=; b=OBZE8UYhZRkKoJ5TD4NS0ibandApZRpGBzTsP18F94DTKYrQPKhVsXt4yycC0aU2oa s0kPx0ierhQLy1iXnajj3heie5yYsJPu3FCpYHzkiKSdb6bGdpyzQ2Px/SdsMzQqxL0M 8ThamdeXZq93SO+UtJKK1NZwXhxJwfV+sCcVIwypPOGko9TzzkxIt29dqzkbia2oj7R6 cBGO06zuMiAzGQl3XnZJfaaQK7mB96gOdo7FU/O4yBUwT+W3/aP+BuTnZ2sWeQmkqSEw oVKXDo1bAzWF6Qh8URnZ4dK+Uallt/Z1DgKA2vIaKdmtdiJfzdMathNNqytIOl1BIjMH AhLg== X-Forwarded-Encrypted: i=1; AJvYcCVhhGCVR9yjyXMuz3chojvixdn9oyNGdQwBVvmhPlYsOOTbXQa7RczXdpU9WAPgrTVlai+haUPeQ7kdiEc=@vger.kernel.org X-Gm-Message-State: AOJu0YxKq2EcaNWInlGyPF/UjMemmhGYdLfbwzO2EVjVr5GdPs7Wz6r2 Z/IxKmAiuXVmkXXNS6x+Rqqf5aHI3/qNXAtllBaXvXj/hpanFeDJ62pgf4fQsbDgwl9RwXqAGmc 32Mdrt25ukg== X-Received: from dlbvv26.prod.google.com ([2002:a05:7022:5f1a:b0:128:f012:2b7f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:43a4:b0:128:d5bd:3572 with SMTP id a92af1059eb24-12a726f5b50mr438145c88.31.1773958340689; Thu, 19 Mar 2026 15:12:20 -0700 (PDT) Date: Thu, 19 Mar 2026 15:12:15 -0700 In-Reply-To: <20260319221215.207951-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260319221215.207951-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.959.g497ff81fa9-goog Message-ID: <20260319221215.207951-2-irogers@google.com> Subject: [PATCH v1 2/2] perf stat: Fix opt->value type for parse_cache_level From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Commit f5803651b4a4 ("perf stat: Choose the most disaggregate command line option") changed aggregation option handling for `perf stat` but not `perf stat report` leading to parse_cache_level being passed a struct in the `perf stat` case but erroneously an aggr_mode enum value for `perf stat report`. Change the `perf stat report` aggregation handling to use the same opt_aggr_mode as `perf stat`. Also, just pass the boolean for consistency with other boolean argument handling. Fixes: f5803651b4a4 ("perf stat: Choose the most disaggregate command line option") Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 73c2ba7e3076..a00af7cfd50e 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -164,7 +164,7 @@ struct opt_aggr_mode { }; /* Turn command line option into most generic aggregation mode setting. */ -static enum aggr_mode opt_aggr_mode_to_aggr_mode(struct opt_aggr_mode *opt_mode) +static enum aggr_mode opt_aggr_mode_to_aggr_mode(const struct opt_aggr_mode *opt_mode) { enum aggr_mode mode = AGGR_GLOBAL; @@ -1219,8 +1219,8 @@ static int parse_cache_level(const struct option *opt, int unset __maybe_unused) { int level; - struct opt_aggr_mode *opt_aggr_mode = (struct opt_aggr_mode *)opt->value; - u32 *aggr_level = (u32 *)opt->data; + bool *per_cache = opt->value; + u32 *aggr_level = opt->data; /* * If no string is specified, aggregate based on the topology of @@ -1258,7 +1258,7 @@ static int parse_cache_level(const struct option *opt, return -EINVAL; } out: - opt_aggr_mode->cache = true; + *per_cache = true; *aggr_level = level; return 0; } @@ -2305,24 +2305,23 @@ static struct perf_stat perf_stat = { static int __cmd_report(int argc, const char **argv) { struct perf_session *session; + struct opt_aggr_mode opt_mode = {}; const struct option options[] = { OPT_STRING('i', "input", &input_name, "file", "input file name"), - OPT_SET_UINT(0, "per-socket", &perf_stat.aggr_mode, - "aggregate counts per processor socket", AGGR_SOCKET), - OPT_SET_UINT(0, "per-die", &perf_stat.aggr_mode, - "aggregate counts per processor die", AGGR_DIE), - OPT_SET_UINT(0, "per-cluster", &perf_stat.aggr_mode, - "aggregate counts perf processor cluster", AGGR_CLUSTER), - OPT_CALLBACK_OPTARG(0, "per-cache", &perf_stat.aggr_mode, &perf_stat.aggr_level, - "cache level", - "aggregate count at this cache level (Default: LLC)", + OPT_BOOLEAN(0, "per-thread", &opt_mode.thread, "aggregate counts per thread"), + OPT_BOOLEAN(0, "per-socket", &opt_mode.socket, + "aggregate counts per processor socket"), + OPT_BOOLEAN(0, "per-die", &opt_mode.die, "aggregate counts per processor die"), + OPT_BOOLEAN(0, "per-cluster", &opt_mode.cluster, + "aggregate counts per processor cluster"), + OPT_CALLBACK_OPTARG(0, "per-cache", &opt_mode.cache, &stat_config.aggr_level, + "cache level", "aggregate count at this cache level (Default: LLC)", parse_cache_level), - OPT_SET_UINT(0, "per-core", &perf_stat.aggr_mode, - "aggregate counts per physical processor core", AGGR_CORE), - OPT_SET_UINT(0, "per-node", &perf_stat.aggr_mode, - "aggregate counts per numa node", AGGR_NODE), - OPT_SET_UINT('A', "no-aggr", &perf_stat.aggr_mode, - "disable CPU count aggregation", AGGR_NONE), + OPT_BOOLEAN(0, "per-core", &opt_mode.core, + "aggregate counts per physical processor core"), + OPT_BOOLEAN(0, "per-node", &opt_mode.node, "aggregate counts per numa node"), + OPT_BOOLEAN('A', "no-aggr", &opt_mode.no_aggr, + "disable aggregation across CPUs or PMUs"), OPT_END() }; struct stat st; @@ -2330,6 +2329,8 @@ static int __cmd_report(int argc, const char **argv) argc = parse_options(argc, argv, options, stat_report_usage, 0); + perf_stat.aggr_mode = opt_aggr_mode_to_aggr_mode(&opt_mode); + if (!input_name || !strlen(input_name)) { if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode)) input_name = "-"; @@ -2506,7 +2507,7 @@ int cmd_stat(int argc, const char **argv) OPT_BOOLEAN(0, "per-die", &opt_mode.die, "aggregate counts per processor die"), OPT_BOOLEAN(0, "per-cluster", &opt_mode.cluster, "aggregate counts per processor cluster"), - OPT_CALLBACK_OPTARG(0, "per-cache", &opt_mode, &stat_config.aggr_level, + OPT_CALLBACK_OPTARG(0, "per-cache", &opt_mode.cache, &stat_config.aggr_level, "cache level", "aggregate count at this cache level (Default: LLC)", parse_cache_level), OPT_BOOLEAN(0, "per-core", &opt_mode.core, -- 2.53.0.959.g497ff81fa9-goog