From nobody Fri Dec 19 17:28:36 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 51B32268FF9 for ; Wed, 30 Apr 2025 17:52:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035548; cv=none; b=Q6Pj//82aIFshDQr+LA7fHcpr2uU+wWGObL46cgAUWVS6E8RHsa0uRUVawhl/B+V/4sUM4DdR3Oz530sUaL44ynhAqhzLlKVzuRcSqC7w8VS+XzjEpKzM9QtGWP/53IfJj1+hWQLDQJHNRYusmtzDdS9aLQm3Yl863D/9KEgl3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035548; c=relaxed/simple; bh=IEVhFbGtv/MY6ax1CnLFxWZmewSGHk0UaIriVsm9XHA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZNBVdcHQ6XxfTda2Jg2RP0AsGYgdo10GuDuXIvENf8u90W/dOApZmoEQ0+bY51/y4Z+5c2m6/LiOQ6p0NCg0dTxZwAENAk4gtg49swl3gpRBlOQQzUSQ0twKQzJrSV9GKQkgp0J96sXbFZ4iS58AmgPVp++EHiOeQcaHqPUS9Pg= 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=C5EXNsBF; arc=none smtp.client-ip=209.85.215.201 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="C5EXNsBF" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b090c7c2c6aso68226a12.0 for ; Wed, 30 Apr 2025 10:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746035546; x=1746640346; 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=y4JyVeE0G5OKWgexdeeqez424oVPV1s2LHT8ajZyfuM=; b=C5EXNsBF55qaXU/bS99tfrON56PZv+euwCW8Xp2ttgCSWXHMT4nVoygnHs+b7ZloEA +6tWebnTrN/EcLELEy1WlGpAjBdrnNA68xqz38m5cCPge8gZsH3na7VRcO3zvdMeXJUA LwQGquu7eCefqSnH1QCbp2Tnice3qsHuxZczPlmyeNXPnoZ5HYx7awGzlnc/f4C8FzM/ SNpuK/ztoVwngs0p0z+EfmZ7JYb/5TXVtC8JbmTQB7wU/OelI31dgIxJV5JZxODpinD0 65BScG92/gtWcDdGVJ4vCIkbBzaq7SjpTtzjw/52wFigz5Gj99vLkh/+h7Ri7BXtaPtT L3HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746035546; x=1746640346; 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=y4JyVeE0G5OKWgexdeeqez424oVPV1s2LHT8ajZyfuM=; b=dBDGZDEoWqkT7o8R+zD1NFB27d+4eJoBfLn7HmMcflxYGoCGhNH3U4FwYyCmil/a6Z vZNs/7HfiQ0IWsRXws4Bf9dhNp9ZslvtS15MhCsJsHOJu/G0szvRbm9Li29b9dU4cnyP detu+nbRdzrDLfxQ9cdKrGuytJRd8VIo+n2KLD0lIAMUBBScFIxS4lWg8ikcdMxaqpod LnT/LYnrksHH6R/WeJ+AsIg9Ckj13TV9L5ngA5w07HlDf91DjzK6vPEUip3JN4G9i9RC P8EJ/dzspQNqo46hi/d1MuPEOvgbgTPqB+MQ7KzPy3kdeTiLhGUGay6lSjnAItgFL3Kc 8vOA== X-Forwarded-Encrypted: i=1; AJvYcCX3PKfQfx0HQa9GsspzT6gf852wOf6mcqKATxcGXjjOUVcmMlyVJOKKe1uw9IzarKW66aJ3QfbmmZqwNTI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0DMxI/iD8Cd4l7Rp2VJpAfwj+Nf7EMYuNY9unvYh3LT+11c3j F4PsXoOBqWag3XZKaMr0bfzwysjT529mYzhsD2ER28n/ent6kZkjSIzvtA/QbOEWUkXYKPNooT6 b9FsRIQ== X-Google-Smtp-Source: AGHT+IGYp3KGiWRNpHW9cl6IEhh2D6Xt5I4o7WIWFbQIyD5kPbBfjUlxoJC0ztTW/Z4nyltf4VwXC9Albvke X-Received: from pjbpl2.prod.google.com ([2002:a17:90b:2682:b0:2fc:d77:541]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1846:b0:2ff:58a4:9db3 with SMTP id 98e67ed59e1d1-30a3446ca02mr5824433a91.35.1746035546484; Wed, 30 Apr 2025 10:52:26 -0700 (PDT) Date: Wed, 30 Apr 2025 10:50:32 -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-45-irogers@google.com> Subject: [PATCH v2 44/47] perf symbol: 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/util/symbol-elf.c | 33 +++++++++++++++++---------------- tools/perf/util/symbol.c | 10 +++++----- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index fbf6d0f73af9..9de6e963ca79 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -261,7 +261,7 @@ static int elf_read_program_header(Elf *elf, u64 vaddr,= GElf_Phdr *phdr) return -1; =20 for (i =3D 0; i < phdrnum; i++) { - if (gelf_getphdr(elf, i, phdr) =3D=3D NULL) + if (gelf_getphdr(elf, (int)i, phdr) =3D=3D NULL) return -1; =20 if (phdr->p_type !=3D PT_LOAD) @@ -550,7 +550,7 @@ static void get_rela_dyn_info(Elf *elf, GElf_Ehdr *ehdr= , struct rela_dyn_info *d if (!scn || !rela_dyn_shdr.sh_link || !rela_dyn_shdr.sh_entsize) return; =20 - di->nr_entries =3D rela_dyn_shdr.sh_size / rela_dyn_shdr.sh_entsize; + di->nr_entries =3D (u32)(rela_dyn_shdr.sh_size / rela_dyn_shdr.sh_entsize= ); di->rela_dyn_data =3D elf_getdata(scn, NULL); =20 scn =3D elf_getscn(elf, rela_dyn_shdr.sh_link); @@ -789,7 +789,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct= symsrc *ss) if (symstrs->d_size =3D=3D 0) goto out_elf_end; =20 - ri.nr_entries =3D shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize; + ri.nr_entries =3D (u32)(shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize); =20 ri.is_rela =3D shdr_rel_plt.sh_type =3D=3D SHT_RELA; =20 @@ -925,7 +925,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t= size) size_t sz =3D min(size, descsz); memcpy(bf, ptr, sz); memset(bf + sz, 0, size - sz); - err =3D sz; + err =3D (int)sz; break; } } @@ -1066,14 +1066,14 @@ int sysfs__read_build_id(const char *filename, stru= ct build_id *bid) } else if (read(fd, bf, descsz) !=3D (ssize_t)descsz) break; } else { - int n =3D namesz + descsz; + size_t n =3D namesz + descsz; =20 - if (n > (int)sizeof(bf)) { + if (n > sizeof(bf)) { n =3D sizeof(bf); pr_debug("%s: truncating reading of build id in sysfs file %s: n_names= z=3D%u, n_descsz=3D%u.\n", __func__, filename, nhdr.n_namesz, nhdr.n_descsz); } - if (read(fd, bf, n) !=3D n) + if (read(fd, bf, n) !=3D (ssize_t)n) break; } } @@ -1426,7 +1426,7 @@ static u64 max_text_section(Elf *elf, GElf_Ehdr *ehdr) if (!gelf_getshdr(sec, &shdr)) break; =20 - if (!is_exe_text(shdr.sh_flags)) + if (!is_exe_text((int)shdr.sh_flags)) continue; =20 /* .init and .exit sections are not placed with .text */ @@ -1546,7 +1546,7 @@ static int dso__process_kernel_symbol(struct dso *dso= , struct map *map, * perf does not record module section addresses except for .text, but * some sections can use the same mapping as .text. */ - if (kmodule && adjust_kernel_syms && is_exe_text(shdr->sh_flags) && + if (kmodule && adjust_kernel_syms && is_exe_text((int)shdr->sh_flags) && shdr->sh_offset <=3D max_text_sh_offset) { dso__put(*curr_dsop); *curr_dsop =3D dso__get(dso); @@ -1672,7 +1672,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, if (secstrs_sym =3D=3D NULL) goto out_elf_end; =20 - nr_syms =3D shdr.sh_size / shdr.sh_entsize; + nr_syms =3D (uint32_t)(shdr.sh_size / shdr.sh_entsize); =20 memset(&sym, 0, sizeof(sym)); =20 @@ -1734,7 +1734,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, } =20 if (runtime_ss->opdsec && sym.st_shndx =3D=3D runtime_ss->opdidx) { - u32 offset =3D sym.st_value - syms_ss->opdshdr.sh_addr; + u32 offset =3D (u32)(sym.st_value - syms_ss->opdshdr.sh_addr); u64 *opd =3D opddata->d_buf + offset; sym.st_value =3D DSO__SWAP(dso, u64, *opd); sym.st_shndx =3D elf_addr_to_index(runtime_ss->elf, @@ -1946,7 +1946,7 @@ static int elf_read_maps(Elf *elf, bool exe, mapfn_t = mapfn, void *data) return -1; =20 for (i =3D 0; i < phdrnum; i++) { - if (gelf_getphdr(elf, i, &phdr) =3D=3D NULL) + if (gelf_getphdr(elf, (int)i, &phdr) =3D=3D NULL) return -1; if (phdr.p_type !=3D PT_LOAD) continue; @@ -2767,14 +2767,15 @@ static void sdt_adjust_loc(struct sdt_note *tmp, GE= lf_Addr base_off) if (!base_off) return; =20 - if (tmp->bit32) + if (tmp->bit32) { tmp->addr.a32[SDT_NOTE_IDX_LOC] =3D - tmp->addr.a32[SDT_NOTE_IDX_LOC] + base_off - - tmp->addr.a32[SDT_NOTE_IDX_BASE]; - else + (Elf32_Addr)(tmp->addr.a32[SDT_NOTE_IDX_LOC] + base_off - + tmp->addr.a32[SDT_NOTE_IDX_BASE]); + } else { tmp->addr.a64[SDT_NOTE_IDX_LOC] =3D tmp->addr.a64[SDT_NOTE_IDX_LOC] + base_off - tmp->addr.a64[SDT_NOTE_IDX_BASE]; + } } =20 static void sdt_adjust_refctr(struct sdt_note *tmp, GElf_Addr base_addr, diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 11540219481b..7eceb6679ed5 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -111,7 +111,7 @@ static int prefix_underscores_count(const char *str) while (*tail =3D=3D '_') tail++; =20 - return tail - str; + return (int)(tail - str); } =20 const char * __weak arch__normalize_symbol_name(const char *name) @@ -481,10 +481,10 @@ int symbol__match_symbol_name(const char *name, const= char *str, =20 if (includes =3D=3D SYMBOL_TAG_INCLUDE__DEFAULT_ONLY && (versioning =3D strstr(name, "@@"))) { - int len =3D strlen(str); + int len =3D (int)strlen(str); =20 if (len < versioning - name) - len =3D versioning - name; + len =3D (int)(versioning - name); =20 return arch__compare_symbol_names_n(name, str, len); } else @@ -638,7 +638,7 @@ void dso__sort_by_name(struct dso *dso) * While we find nice hex chars, build a long_val. * Return number of chars processed. */ -static int hex2u64(const char *ptr, u64 *long_val) +static size_t hex2u64(const char *ptr, u64 *long_val) { char *p; =20 @@ -1532,7 +1532,7 @@ static int dso__load_perf_map(const char *map_path, s= truct dso *dso) while (!feof(file)) { u64 start, size; struct symbol *sym; - int line_len, len; + size_t line_len, len; =20 line_len =3D getline(&line, &n, file); if (line_len < 0) --=20 2.49.0.906.g1f30a19c02-goog