From nobody Thu Apr 9 20:27:21 2026 Received: from mail-24418.protonmail.ch (mail-24418.protonmail.ch [109.224.244.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F991369203 for ; Thu, 5 Mar 2026 23:57:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772755041; cv=none; b=Kd8P4iUrCl/BKycB08KtVxPzcvxxUYNZOjInxfA0SuFEXbunerPozvhzWnDEhUeNLyk0WpU6Qhpw0T5v7vvpCV0hcZbZct2XQf2tkLu6BDLWcV2euKif/qvU3tww+EFtqXLMMQcKETlyyTKvwMgPeTuvmFeZuY4vUU9bJmUJBuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772755041; c=relaxed/simple; bh=6IZKTJrJvzbsm/ibVEY4n+vwPVOWltwlcO2dNwTkOHg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=afY799qdYcXhJiebajW6WbrSYzjHLwpYw2xDYUS1Jz3jk/x4lnE3At6NsDjgTNnQt4IQIWK9LAB4hLh1nirbvYwdiNVYoCpGBfBVRC/hSmch+WKl7U1P/LE7J6WFj3BBwNikX31BbwBp+qKOqbjwHYQk1wiae3oA2vEIei2KIOw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=proton.me; spf=pass smtp.mailfrom=proton.me; dkim=pass (2048-bit key) header.d=proton.me header.i=@proton.me header.b=ZuL52Ada; arc=none smtp.client-ip=109.224.244.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=proton.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=proton.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=proton.me header.i=@proton.me header.b="ZuL52Ada" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1772755029; x=1773014229; bh=qcE3fSZShVbS69qvE8kAwinPp1Bs0spVc3DiuJqZBTQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ZuL52AdaQVvNKN/CCV6kZFF+mChX1rFxpD/aHhW0GvXawp3I0eFs06f1neGawFKLf 1vWpQTg8ShZaO38w0YO/dRnDiC8zCbBcu09L1+NcGHRkDbsphFQ2aGLOUnO9+crhMu LSyGELniJxhiHZVDgGHIoyHj16UtpsgZ5GiGmCxzFHbjyCSm13L5G2tA5uaICzCvCL okxJ6iZGtDDjeSLpMaD9HUFsL3XCZo8UVSdA8BX6OMzq3vv2GX9GVueYKOFOMk3+qT hfK2gNJY6ICQGgDLhCnD6vQT6jB7jMQGnrnjdVY4sLz9dY6wEVgvhnGds1wZGY0cO0 7F3G5viYhseqw== Date: Thu, 05 Mar 2026 23:57:05 +0000 To: namhyung@kernel.org From: Ricky Ringler Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ricky Ringler Subject: [PATCH v2] perf utilities: cln_size header Message-ID: <20260305235655.40779-1-ricky.ringler@proton.me> In-Reply-To: References: <20260214040659.168769-2-ricky.ringler@proton.me> Feedback-ID: 171348601:user:proton X-Pm-Message-ID: 6a9e396da5b15261d1df84e8bc5351b34b3b7941 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Store cacheline size during perf record in header, so that cacheline size can be used for other features, like sort. Follow-up patch from message ID "aYZiQk6Uftzlb_JV@x1" Testing: - Built perf - Ran record + report with feat enabled - Ran record + report with feat disabled Tested-by: Ricky Ringler Signed-off-by: Ricky Ringler --- tools/perf/builtin-inject.c | 1 + tools/perf/util/env.h | 1 + tools/perf/util/header.c | 29 +++++++++++++++++++++++++++++ tools/perf/util/header.h | 1 + tools/perf/util/sort.c | 37 ++++++++++++++++++++++++++----------- 5 files changed, 58 insertions(+), 11 deletions(-) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index aa7be4fb5838..9639154459d9 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -2047,6 +2047,7 @@ static bool keep_feat(int feat) case HEADER_CLOCK_DATA: case HEADER_HYBRID_TOPOLOGY: case HEADER_PMU_CAPS: + case HEADER_CLN_SIZE: return true; /* Information that can be updated */ case HEADER_BUILD_ID: diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 9977b85523a8..04580c64847b 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -93,6 +93,7 @@ struct perf_env { struct cpu_topology_map *cpu; struct cpu_cache_level *caches; int caches_cnt; + unsigned int cln_size; u32 comp_ratio; u32 comp_ver; u32 comp_type; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index f5cad377c99e..ad15829acc69 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -54,6 +54,7 @@ #include "bpf-event.h" #include "bpf-utils.h" #include "clockid.h" +#include "cacheline.h" =20 #include #include @@ -1288,6 +1289,18 @@ static int write_cache(struct feat_fd *ff, return ret; } =20 +static int write_cln_size(struct feat_fd *ff, + struct evlist *evlist __maybe_unused) +{ + int cln_size =3D cacheline_size(); + + if (!cln_size) + cln_size =3D 0; + ff->ph->env.cln_size =3D cln_size; + + return do_write(ff, &cln_size, sizeof(cln_size)); +} + static int write_stat(struct feat_fd *ff __maybe_unused, struct evlist *evlist __maybe_unused) { @@ -2084,6 +2097,11 @@ static void print_cache(struct feat_fd *ff, FILE *fp= __maybe_unused) } } =20 +static void print_cln_size(struct feat_fd *ff, FILE *fp __maybe_unused) +{ + fprintf(fp, "# cacheline size: %u\n", ff->ph->env.cln_size); +} + static void print_compressed(struct feat_fd *ff, FILE *fp) { fprintf(fp, "# compressed : %s, level =3D %d, ratio =3D %d\n", @@ -2933,6 +2951,16 @@ static int process_cache(struct feat_fd *ff, void *d= ata __maybe_unused) return -1; } =20 +static int process_cln_size(struct feat_fd *ff, void *data __maybe_unused) +{ + struct perf_env *env =3D &ff->ph->env; + + if (do_read_u32(ff, &env->cln_size)) + return -1; + + return 0; +} + static int process_sample_time(struct feat_fd *ff, void *data __maybe_unus= ed) { struct perf_session *session; @@ -3453,6 +3481,7 @@ const struct perf_header_feature_ops feat_ops[HEADER_= LAST_FEATURE] =3D { FEAT_OPR(CLOCK_DATA, clock_data, false), FEAT_OPN(HYBRID_TOPOLOGY, hybrid_topology, true), FEAT_OPR(PMU_CAPS, pmu_caps, false), + FEAT_OPR(CLN_SIZE, cln_size, false), }; =20 struct header_print_data { diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index c058021c3150..04394331630f 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -53,6 +53,7 @@ enum { HEADER_CLOCK_DATA, HEADER_HYBRID_TOPOLOGY, HEADER_PMU_CAPS, + HEADER_CLN_SIZE, HEADER_LAST_FEATURE, HEADER_FEAT_BITS =3D 256, }; diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index aa79eb6476dd..e636b9f88e5c 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -30,6 +30,7 @@ #include "time-utils.h" #include "cgroup.h" #include "machine.h" +#include "session.h" #include "trace-event.h" #include #include @@ -2474,7 +2475,26 @@ struct sort_entry sort_type_offset =3D { =20 /* --sort typecln */ =20 -#define DEFAULT_CACHELINE_SIZE 64 +static int +hist_entry__cln_size(struct hist_entry *he) +{ + int ret =3D 0; + + if (he && he->hists) { + struct evsel *evsel =3D hists_to_evsel(he->hists); + + if (evsel && evsel->evlist->session && evsel->evlist->session) + ret =3D evsel->evlist->session->header.env.cln_size; + } + + if (!ret || ret < 1) { + int default_cacheline_size =3D 64; // avoid div/0 later + + ret =3D default_cacheline_size; + } + + return ret; +} =20 static int64_t sort__typecln_sort(struct hist_entry *left, struct hist_entry *right) @@ -2482,11 +2502,9 @@ sort__typecln_sort(struct hist_entry *left, struct h= ist_entry *right) struct annotated_data_type *left_type =3D left->mem_type; struct annotated_data_type *right_type =3D right->mem_type; int64_t left_cln, right_cln; + int64_t cln_size_left =3D hist_entry__cln_size(left); + int64_t cln_size_right =3D hist_entry__cln_size(right); int64_t ret; - int cln_size =3D cacheline_size(); - - if (cln_size =3D=3D 0) - cln_size =3D DEFAULT_CACHELINE_SIZE; =20 if (!left_type) { sort__type_init(left); @@ -2502,8 +2520,8 @@ sort__typecln_sort(struct hist_entry *left, struct hi= st_entry *right) if (ret) return ret; =20 - left_cln =3D left->mem_type_off / cln_size; - right_cln =3D right->mem_type_off / cln_size; + left_cln =3D left->mem_type_off / cln_size_left; + right_cln =3D right->mem_type_off / cln_size_right; return left_cln - right_cln; } =20 @@ -2511,10 +2529,7 @@ static int hist_entry__typecln_snprintf(struct hist_= entry *he, char *bf, size_t size, unsigned int width __maybe_unused) { struct annotated_data_type *he_type =3D he->mem_type; - int cln_size =3D cacheline_size(); - - if (cln_size =3D=3D 0) - cln_size =3D DEFAULT_CACHELINE_SIZE; + int cln_size =3D hist_entry__cln_size(he); =20 return repsep_snprintf(bf, size, "%s: cache-line %d", he_type->self.type_= name, he->mem_type_off / cln_size); --=20 2.53.0