From nobody Fri Dec 19 17:19:14 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 9E36E295501 for ; Wed, 30 Apr 2025 17:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035520; cv=none; b=fDP1YIFsAw+wwlJ4QUpD3cPEYvfEj7EazjALFWET6H7PECFnGZkI38TmTh573tvAySsRNFI4xRoL71dJ+H54U5gABCRQXw4QhowTYU1HISsrunngrQkDlhLov6oBn72XhnSTl6utsNYS6TY0NjgEhnQ/9V0o5FchxqUDiW7qsfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035520; c=relaxed/simple; bh=N9Bs69Q0gHmhI4eo8xMCY3Rp0tQZHLDjeB46JguulvE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bfyYo1VkAmHs/rT8rn6AL+MQ7+KPPXjTYuERLj/e9Kez5vCCcpuaSF9GT/XhSj7vQESHr2l+IH1PY/xG40u2+ovu5VGV3h/SINMWAWFQB783xjY2D7Xe8CvQ+0sKb2ThSVHRAFZt9wRBs2+jn07hdK7XolXoLwzePR6/3yf2mBk= 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=HfDckrfa; arc=none smtp.client-ip=209.85.215.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="HfDckrfa" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b15e08f1eb4so57360a12.0 for ; Wed, 30 Apr 2025 10:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746035518; x=1746640318; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=7DcJ1qi6x2GgioZqECz9ghmDuadJ5RenRHwjo+uvBnM=; b=HfDckrfazPrUzCPJh4dZ897C02A1scHNWj2beT6nTQZ52hVyNFXZksOhS1KybWX11p yXjLi9fhVYWQqQ3005lvS8IqqGmg3NIJLgFWFc2r4aK+mZlgRBJJd8FEDIPh9ULstFq7 S7pUbzRZTkgVlzWpI0G9c/pWb48hZV/rZ027+emsbMDlrekEeO7cDXkkMrJNF/amUnVb fX8x2lNh0YyOoQ4etUbBB5xnqZSpDveWduXGObQYEdqUUmxobELLID5eYh08JPVbAqnP P81+H8WzzMRC1O0clK2ZHWRapBHkOyw2Ti1OjvPFwU8eTPURWO/gpiEPwSGCaemiU+C9 0gnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746035518; x=1746640318; h=cc: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=7DcJ1qi6x2GgioZqECz9ghmDuadJ5RenRHwjo+uvBnM=; b=r5QaUPAQbombNWOcn5ZRB/RGS0ghMzJC5kXQFHI9I5HqWXPZ3+g+ePZ86ukKwL+eyJ rvehIQk4wjy0gv2GT82tRBL4ud+oNzYcV1BQU+J6BauuYkI+jvLkBRZDIwoIRzRxwtUy GN3JWtYyE/k4tZCL6R2jktzfOBT82/rm3weXaVP45TsJcMbZQigjZEpxYp9J7LUqN9jL q7+6h8zDFMwagybo9PIyryiaxCW0EV0J7CBgf6nhc5AOGYFPsNC7nuBlHFQmD/XvjHnN JKMiHfRCXfiokHD1xVKmGagRGJYHI71pP3c/GGH3t8R6eRFq/DzYk5AFjLncacjAKH6J Ewpw== X-Forwarded-Encrypted: i=1; AJvYcCUuvV0FeN6vJXTHf60kTpQfykpSowQhx3DeZ2RD7ZP/Q2eeWKyv/4XNM7Q3G79+jpcgfRJfg5lNJQAvm08=@vger.kernel.org X-Gm-Message-State: AOJu0Yx24dj8mX7KiqIafw12B8fL43dn0g2d45s/03ZXjLZBkOE/bYeu jtDEUAmJIgJB/nEvGgLDiR7OAufDIGgVAPbEWOksZq1bJPL17ncwjnfZeJNTW29z1bG+vZBh84c CdYJ9SA== X-Google-Smtp-Source: AGHT+IHk8/+NAcFZh2Wb9xOYFIlypRhZRhl9IF5IJNwhrNiC5zF54w1KI/Rd0Fsj1chyjvEwC8kJjpt3MV8G X-Received: from pjbee6.prod.google.com ([2002:a17:90a:fc46:b0:2ff:852c:ceb8]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5745:b0:2ea:a9ac:eee1 with SMTP id 98e67ed59e1d1-30a332f6c1bmr6642182a91.10.1746035517863; Wed, 30 Apr 2025 10:51:57 -0700 (PDT) Date: Wed, 30 Apr 2025 10:50:18 -0700 In-Reply-To: <20250430175036.184610-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: <20250430175036.184610-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250430175036.184610-31-irogers@google.com> Subject: [PATCH v2 30/47] perf mem: Silence -Wshorten-64-to-32 warnings From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , Yury Norov , Rasmus Villemoes , Thomas Gleixner , Darren Hart , Davidlohr Bueso , "=?UTF-8?q?Andr=C3=A9=20Almeida?=" , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Yicong Yang , Jonathan Cameron , Nathan Chancellor , Bill Wendling , Justin Stitt , Josh Poimboeuf , Al Viro , Kyle Meyer , Ben Gainey , Athira Rajeev , Kajol Jain , Aditya Gupta , Eder Zulian , Dapeng Mi , Kuan-Wei Chiu , He Zhe , Dirk Gouders , Brian Geffon , Ravi Bangoria , Howard Chu , Charlie Jenkins , Colin Ian King , Dominique Martinet , Jann Horn , Masahiro Yamada , Arnd Bergmann , Yang Jihong , Dmitry Vyukov , Andi Kleen , Graham Woodward , Ilkka Koskinen , Anshuman Khandual , Zhongqiu Han , Hao Ge , Tengda Wu , Gabriele Monaco , Chun-Tse Shao , Casey Chen , "Dr. David Alan Gilbert" , Li Huafei , "Steinar H. Gunderson" , Levi Yun , Weilin Wang , Thomas Falcon , Thomas Richter , Andrew Kreimer , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Christophe Leroy , Jean-Philippe Romain , Junhao He , "Masami Hiramatsu (Google)" , Xu Yang , Steve Clevenger , Zixian Cai , Stephen Brennan , Yujie Liu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The clang warning -Wshorten-64-to-32 can be useful to catch inadvertent truncation. In some instances this truncation can lead to changing the sign of a result, for example, truncation to return an int to fit a sort routine. Silence the warning by making the implicit truncation explicit. Signed-off-by: Ian Rogers --- tools/perf/builtin-c2c.c | 21 ++++++++++--------- tools/perf/builtin-kmem.c | 39 ++++++++++++++++++------------------ tools/perf/builtin-mem.c | 2 +- tools/perf/util/mem-events.c | 12 +++++------ tools/perf/util/mem2node.c | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index e2e257bcc461..c99266b4f365 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -1206,7 +1206,7 @@ node_entry(struct perf_hpp_fmt *fmt __maybe_unused, s= truct perf_hpp *hpp, break; case 1: { - int num =3D bitmap_weight(set, c2c.cpus_cnt); + int num =3D (int)bitmap_weight(set, c2c.cpus_cnt); struct c2c_stats *stats =3D &c2c_he->node_stats[node]; =20 ret =3D scnprintf(hpp->buf, hpp->size, "%2d{%2d ", node, num); @@ -1249,7 +1249,7 @@ node_entry(struct perf_hpp_fmt *fmt __maybe_unused, s= truct perf_hpp *hpp, ret =3D scnprintf(hpp->buf, hpp->size, "%2d{", node); advance_hpp(hpp, ret); =20 - ret =3D bitmap_scnprintf(set, c2c.cpus_cnt, hpp->buf, hpp->size); + ret =3D (int)bitmap_scnprintf(set, c2c.cpus_cnt, hpp->buf, hpp->size); advance_hpp(hpp, ret); =20 ret =3D scnprintf(hpp->buf, hpp->size, "}"); @@ -1911,7 +1911,7 @@ static int c2c_se_entry(struct perf_hpp_fmt *fmt, str= uct perf_hpp *hpp, len =3D symbol_width(he->hists, dim->se); } =20 - return dim->se->se_snprintf(he, hpp->buf, hpp->size, len); + return dim->se->se_snprintf(he, hpp->buf, hpp->size, (unsigned int)len); } =20 static int64_t c2c_se_cmp(struct perf_hpp_fmt *fmt, @@ -2164,7 +2164,7 @@ static void set_node_width(struct c2c_hist_entry *c2c= _he, int len) static int set_nodestr(struct c2c_hist_entry *c2c_he) { char buf[30]; - int len; + size_t len; =20 if (c2c_he->nodestr) return 0; @@ -2176,7 +2176,7 @@ static int set_nodestr(struct c2c_hist_entry *c2c_he) len =3D scnprintf(buf, sizeof(buf), "N/A"); } =20 - set_node_width(c2c_he, len); + set_node_width(c2c_he, (int)len); c2c_he->nodestr =3D strdup(buf); return c2c_he->nodestr ? 0 : -ENOMEM; } @@ -2353,7 +2353,7 @@ static int hists__iterate_cb(struct hists *hists, his= ts__resort_cb_t cb) =20 static void print_c2c__display_stats(FILE *out) { - int llc_misses; + uint64_t llc_misses; struct c2c_stats *stats =3D &c2c.hists.stats; =20 llc_misses =3D get_load_llc_misses(stats); @@ -2379,7 +2379,7 @@ static void print_c2c__display_stats(FILE *out) fprintf(out, " Load Remote DRAM : %10d\n", stats->rmt_d= ram); fprintf(out, " Load MESI State Exclusive : %10d\n", stats->ld_ex= cl); fprintf(out, " Load MESI State Shared : %10d\n", stats->ld_sh= ared); - fprintf(out, " Load LLC Misses : %10d\n", llc_misses); + fprintf(out, " Load LLC Misses : %10"PRIu64"\n", llc_m= isses); fprintf(out, " Load access blocked by data : %10d\n", stats->blk_d= ata); fprintf(out, " Load access blocked by address : %10d\n", stats->blk_a= ddr); fprintf(out, " Load HIT Local Peer : %10d\n", stats->lcl_p= eer); @@ -2738,9 +2738,10 @@ static void perf_c2c_display(struct perf_session *se= ssion) } #endif /* HAVE_SLANG_SUPPORT */ =20 -static char *fill_line(const char *orig, int len) +static char *fill_line(const char *orig, size_t len) { - int i, j, olen =3D strlen(orig); + size_t i, j; + size_t olen =3D strlen(orig); char *buf; =20 buf =3D zalloc(len + 1); @@ -3068,7 +3069,7 @@ static int perf_c2c__report(int argc, const char **ar= gv) c2c.tool.ordering_requires_timestamps =3D true; session =3D perf_session__new(&data, &c2c.tool); if (IS_ERR(session)) { - err =3D PTR_ERR(session); + err =3D (int)PTR_ERR(session); pr_debug("Error creating perf session\n"); goto out; } diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 67fb1946ef13..6a905161f21b 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -173,10 +173,10 @@ static int insert_caller_stat(unsigned long call_site, =20 static int evsel__process_alloc_event(struct evsel *evsel, struct perf_sam= ple *sample) { - unsigned long ptr =3D evsel__intval(evsel, sample, "ptr"), - call_site =3D evsel__intval(evsel, sample, "call_site"); - int bytes_req =3D evsel__intval(evsel, sample, "bytes_req"), - bytes_alloc =3D evsel__intval(evsel, sample, "bytes_alloc"); + unsigned long ptr =3D evsel__intval(evsel, sample, "ptr"); + unsigned long call_site =3D evsel__intval(evsel, sample, "call_site"); + int bytes_req =3D (int)evsel__intval(evsel, sample, "bytes_req"); + int bytes_alloc =3D (int)evsel__intval(evsel, sample, "bytes_alloc"); =20 if (insert_alloc_stat(call_site, ptr, bytes_req, bytes_alloc, sample->cpu= ) || insert_caller_stat(call_site, bytes_req, bytes_alloc)) @@ -202,7 +202,7 @@ static int evsel__process_alloc_event(struct evsel *evs= el, struct perf_sample *s int node1, node2; =20 node1 =3D cpu__get_node((struct perf_cpu){.cpu =3D sample->cpu}); - node2 =3D evsel__intval(evsel, sample, "node"); + node2 =3D (int)evsel__intval(evsel, sample, "node"); =20 /* * If the field "node" is NUMA_NO_NODE (-1), we don't take it @@ -737,7 +737,7 @@ static char *compact_gfp_flags(char *gfp_flags) return new_flags; } =20 -static char *compact_gfp_string(unsigned long gfp_flags) +static char *compact_gfp_string(unsigned int gfp_flags) { struct gfp_flag key =3D { .flags =3D gfp_flags, @@ -808,10 +808,9 @@ static int parse_gfp_flags(struct evsel *evsel, struct= perf_sample *sample, static int evsel__process_page_alloc_event(struct evsel *evsel, struct per= f_sample *sample) { u64 page; - unsigned int order =3D evsel__intval(evsel, sample, "order"); - unsigned int gfp_flags =3D evsel__intval(evsel, sample, "gfp_flags"); - unsigned int migrate_type =3D evsel__intval(evsel, sample, - "migratetype"); + unsigned int order =3D (unsigned int)evsel__intval(evsel, sample, "order"= ); + unsigned int gfp_flags =3D (unsigned int)evsel__intval(evsel, sample, "gf= p_flags"); + unsigned int migrate_type =3D (unsigned int)evsel__intval(evsel, sample, = "migratetype"); u64 bytes =3D kmem_page_size << order; u64 callsite; struct page_stat *pstat; @@ -880,7 +879,7 @@ static int evsel__process_page_alloc_event(struct evsel= *evsel, struct perf_samp static int evsel__process_page_free_event(struct evsel *evsel, struct perf= _sample *sample) { u64 page; - unsigned int order =3D evsel__intval(evsel, sample, "order"); + unsigned int order =3D (unsigned int)evsel__intval(evsel, sample, "order"= ); u64 bytes =3D kmem_page_size << order; struct page_stat *pstat; struct page_stat this =3D { @@ -1064,12 +1063,12 @@ static void __print_page_alloc_result(struct perf_s= ession *session, int n_lines) struct rb_node *next =3D rb_first(&page_alloc_sorted); struct machine *machine =3D &session->machines.host; const char *format; - int gfp_len =3D max(strlen("GFP flags"), max_gfp_len); + size_t gfp_len =3D max(strlen("GFP flags"), max_gfp_len); =20 printf("\n%.105s\n", graph_dotted_line); printf(" %-16s | %5s alloc (KB) | Hits | Order | Mig.type | %-*s | C= allsite\n", use_pfn ? "PFN" : "Page", live_page ? "Live" : "Total", - gfp_len, "GFP flags"); + (int)gfp_len, "GFP flags"); printf("%.105s\n", graph_dotted_line); =20 if (use_pfn) @@ -1102,7 +1101,7 @@ static void __print_page_alloc_result(struct perf_ses= sion *session, int n_lines) =20 if (n_lines =3D=3D -1) { printf(" ... | ... | ... | ... | ... = | %-*s | ...\n", - gfp_len, "..."); + (int)gfp_len, "..."); } =20 printf("%.105s\n", graph_dotted_line); @@ -1112,11 +1111,11 @@ static void __print_page_caller_result(struct perf_= session *session, int n_lines { struct rb_node *next =3D rb_first(&page_caller_sorted); struct machine *machine =3D &session->machines.host; - int gfp_len =3D max(strlen("GFP flags"), max_gfp_len); + size_t gfp_len =3D max(strlen("GFP flags"), max_gfp_len); =20 printf("\n%.105s\n", graph_dotted_line); printf(" %5s alloc (KB) | Hits | Order | Mig.type | %-*s | Callsite\= n", - live_page ? "Live" : "Total", gfp_len, "GFP flags"); + live_page ? "Live" : "Total", (int)gfp_len, "GFP flags"); printf("%.105s\n", graph_dotted_line); =20 while (next && n_lines--) { @@ -1137,14 +1136,14 @@ static void __print_page_caller_result(struct perf_= session *session, int n_lines (unsigned long long)data->alloc_bytes / 1024, data->nr_alloc, data->order, migrate_type_str[data->migrate_type], - gfp_len, compact_gfp_string(data->gfp_flags), caller); + (int)gfp_len, compact_gfp_string(data->gfp_flags), caller); =20 next =3D rb_next(next); } =20 if (n_lines =3D=3D -1) { printf(" ... | ... | ... | ... | %-*s | ...\n", - gfp_len, "..."); + (int)gfp_len, "..."); } =20 printf("%.105s\n", graph_dotted_line); @@ -1828,7 +1827,7 @@ static int parse_line_opt(const struct option *opt __= maybe_unused, if (!arg) return -1; =20 - lines =3D strtoul(arg, NULL, 10); + lines =3D (int)strtoul(arg, NULL, 10); =20 if (caller_flag > alloc_flag) caller_lines =3D lines; @@ -2001,7 +2000,7 @@ int cmd_kmem(int argc, const char **argv) =20 kmem_session =3D session =3D perf_session__new(&data, &perf_kmem); if (IS_ERR(session)) - return PTR_ERR(session); + return (int)PTR_ERR(session); =20 ret =3D -1; =20 diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index 5ec83cd85650..988b3877cde8 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -293,7 +293,7 @@ static int report_raw_events(struct perf_mem *mem) session =3D perf_session__new(&data, &mem->tool); =20 if (IS_ERR(session)) - return PTR_ERR(session); + return (int)PTR_ERR(session); =20 session->itrace_synth_opts =3D &itrace_synth_opts; =20 diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 884d9aebce91..6ad99ace56e3 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -364,7 +364,7 @@ int perf_mem__tlb_scnprintf(char *out, size_t sz, const= struct mem_info *mem_inf if (miss) l +=3D scnprintf(out + l, sz - l, " miss"); =20 - return l; + return (int)l; } =20 static const char * const mem_lvl[] =3D { @@ -476,7 +476,7 @@ int perf_mem__lvl_scnprintf(char *out, size_t sz, const= struct mem_info *mem_inf l +=3D scnprintf(out + l, sz - l, "Unknown level %d", lvl); =20 l +=3D scnprintf(out + l, sz - l, " %s", hit_miss); - return l; + return (int)l; } =20 lvl =3D data_src.mem_lvl; @@ -499,7 +499,7 @@ int perf_mem__lvl_scnprintf(char *out, size_t sz, const= struct mem_info *mem_inf =20 if (printed) { l +=3D scnprintf(out + l, sz - l, " %s", hit_miss); - return l; + return (int)l; } =20 na: @@ -559,7 +559,7 @@ int perf_mem__snp_scnprintf(char *out, size_t sz, const= struct mem_info *mem_inf if (*out =3D=3D '\0') l +=3D scnprintf(out, sz - l, "N/A"); =20 - return l; + return (int)l; } =20 int perf_mem__lck_scnprintf(char *out, size_t sz, const struct mem_info *m= em_info) @@ -593,14 +593,14 @@ int perf_mem__blk_scnprintf(char *out, size_t sz, con= st struct mem_info *mem_inf =20 if (!mask || (mask & PERF_MEM_BLK_NA)) { l +=3D scnprintf(out + l, sz - l, " N/A"); - return l; + return (int)l; } if (mask & PERF_MEM_BLK_DATA) l +=3D scnprintf(out + l, sz - l, " Data"); if (mask & PERF_MEM_BLK_ADDR) l +=3D scnprintf(out + l, sz - l, " Addr"); =20 - return l; + return (int)l; } =20 int perf_script__meminfo_scnprintf(char *out, size_t sz, const struct mem_= info *mem_info) diff --git a/tools/perf/util/mem2node.c b/tools/perf/util/mem2node.c index 03a7d7b27737..2d76626dec01 100644 --- a/tools/perf/util/mem2node.c +++ b/tools/perf/util/mem2node.c @@ -56,7 +56,7 @@ int mem2node__init(struct mem2node *map, struct perf_env = *env) =20 for (i =3D 0; i < env->nr_memory_nodes; i++) { n =3D &nodes[i]; - max +=3D bitmap_weight(n->set, n->size); + max +=3D bitmap_weight(n->set, (unsigned int)n->size); } =20 entries =3D zalloc(sizeof(*entries) * max); --=20 2.49.0.906.g1f30a19c02-goog