From nobody Fri Dec 19 17:27:01 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 32954289E00 for ; Wed, 30 Apr 2025 17:51:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035504; cv=none; b=FDNwYxvKCXHPllisaN4vWvIsZ+mv2xrAYTsFCvZv0FepSEIr3Dck4hbBhYnK85x9993R7v4myi1XgxEgJhz0I+Lt3076B46WJu8RjmbxhUfuJQeFsEJT/6T0L2rKztxD1aGR9NhDLXV0juBsRX3WFq4yt6ngCoTn2xLmT9DwLdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035504; c=relaxed/simple; bh=HtEi870zwLq6ctFcnBRLp+ytP6nQssFq45sLuZd5sJg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MWEHS6h9aqItgDwDv8quACFOqz0uh2JTfXXg0q3DhbW+/n3N4ZiiNJmsQQjus1QRb1z5bEnBH9Q2gFACcHNRUBBrJlwiC3xpkwtRB5ajGBIL+jhg2Uorrz4XTPQxv2+tOnMvj562f3Y+0s4zPloIYXBQCCNyOLWRln5aEBbBWho= 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=dwLixvBK; arc=none smtp.client-ip=209.85.216.74 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="dwLixvBK" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-30a2b6c8ff2so146410a91.3 for ; Wed, 30 Apr 2025 10:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746035501; x=1746640301; 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=QU4fF1ojZigMaeFSYqEf31ecZKLdrPKuyzN12ALOJyE=; b=dwLixvBK/mgYE9i8+2M55LRDSEgIpOqEXvEjc+1hzkGaOLZjn5Q2V+VfSbSm1mFCjt TY6DYZJpgumu2rgIOhDUOe4CFX/RO7HVUD+INn0tO5t27+f0AaazUaSG0pL1pgGmNZZ8 0i0GdbSDmHzu1W99q5vemdFhAh+Js+vtMK+n0xHrcQl6dxRDpBOVbMfyNf8mSHslILCA 9rSMpqzXZECcA39OEgxLS5I8stvEeqTX8G9IkOpHVAFBYg9kEuADlIsPtqeGtr+mMDuI 2mLgOFO6gBp8dwC2ClQxrk0C84v6ttWIGik2oLxxhNYtj0IhyHyeUmCaKYcyqCcCzzQp 71Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746035501; x=1746640301; 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=QU4fF1ojZigMaeFSYqEf31ecZKLdrPKuyzN12ALOJyE=; b=CNzrTrJAFoq0/tTM8pf0gnVgO5760C7rDzIAilpi61QHbsHA+Io0w5PMyGx9792UTC 0kE5ZOnrCZxkJolLLh64IIGNPjFkEZ22crL1J2lyTH0ZPso5ebWNc+WQCbk6MtACmO7C Rv8Eat5hJRR1OLUHVncYO3bBAV/PJwxug8KmSXJ6aR6oLDz8OBvfgROmpGYlKQUId9b+ 5t3WRlKidm9CYQOYDyjmrrhW4ce4yDHT2t8Jp0l/TMt5kwwnmcEK8veFeNNOgR0WvHij rEvwDG5dAv78hNC7+ycNGwOFAZyFUmVG+zfe2EGU3eLcYgtLpu/HYUYDd4e9NSv6fMDn 1UFw== X-Forwarded-Encrypted: i=1; AJvYcCVIy63DI2WPO03KFgcrrE4Uob+/LO7qYqumW0m8sACQgMtNFBjiY9H3VP2gB5q0revXCOkGYsnS1kL+6Yk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6pky9Ui/e4clx5jTvU3/EmWwgyKs9YYiZblocFP++tgy1Bizo xLRr15aJXCKMcdVhxVEXfZBi5xAB5sScfVqDL4TCcMBdRizcjq9uTt7JPoM+eYzHuQQ3UDboCPg yST/DJw== X-Google-Smtp-Source: AGHT+IEyGPUBxMB6EpZfVFCzzx4iOi+6sy5uLJmR1hik9If22WqT2MHcyOSep4d8z+0agoaxbHwiyXwQLHex X-Received: from pjk3.prod.google.com ([2002:a17:90b:5583:b0:2ef:7af4:5e8e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1b0d:b0:2ee:d433:7c50 with SMTP id 98e67ed59e1d1-30a3335ef40mr4881540a91.23.1746035501383; Wed, 30 Apr 2025 10:51:41 -0700 (PDT) Date: Wed, 30 Apr 2025 10:50:10 -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-23-irogers@google.com> Subject: [PATCH v2 22/47] perf annotate: 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-annotate.c | 4 ++-- tools/perf/util/annotate.c | 22 +++++++++++----------- tools/perf/util/disasm.c | 11 ++++++----- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 9833c2c82a2f..97943a12b6c9 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -157,7 +157,7 @@ static void process_branch_stack(struct branch_stack *b= s, struct addr_location * if (!bi) return; =20 - for (i =3D bs->nr - 1; i >=3D 0; i--) { + for (i =3D (int)bs->nr - 1; i >=3D 0; i--) { /* * XXX filter against symbol */ @@ -880,7 +880,7 @@ int cmd_annotate(int argc, const char **argv) =20 annotate.session =3D perf_session__new(&data, &annotate.tool); if (IS_ERR(annotate.session)) - return PTR_ERR(annotate.session); + return (int)PTR_ERR(annotate.session); =20 annotate.session->itrace_synth_opts =3D &itrace_synth_opts; =20 diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 264a212b47df..055f3da1b95b 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -337,7 +337,8 @@ static int symbol__account_br_cntr(struct annotated_bra= nch *branch, unsigned int base =3D evsel__leader(evsel)->br_cntr_idx; unsigned int off =3D offset * evsel->evlist->nr_br_cntr; u64 *branch_br_cntr =3D branch->br_cntr; - unsigned int i, mask, width; + unsigned int i, width; + u64 mask; =20 if (!br_cntr || !branch_br_cntr) return 0; @@ -360,7 +361,7 @@ static int symbol__account_cycles(u64 addr, u64 start, = struct symbol *sym, u64 br_cntr) { struct annotated_branch *branch; - unsigned offset; + unsigned int offset; int ret; =20 if (sym =3D=3D NULL) @@ -377,7 +378,7 @@ static int symbol__account_cycles(u64 addr, u64 start, = struct symbol *sym, if (start >=3D addr) start =3D 0; } - offset =3D addr - sym->start; + offset =3D (unsigned int)(addr - sym->start); ret =3D __symbol__account_cycles(branch->cycles_hist, start ? start - sym->start : 0, offset, cycles, @@ -1563,7 +1564,7 @@ static int annotation__max_ins_name(struct annotation= *notes) if (al->offset =3D=3D -1) continue; =20 - len =3D strlen(disasm_line(al)->ins.name); + len =3D (int)strlen(disasm_line(al)->ins.name); if (max_name < len) max_name =3D len; } @@ -2183,20 +2184,20 @@ static int annotation_options__add_disassemblers_st= r(struct annotation_options * { while (str && *str !=3D '\0') { const char *comma =3D strchr(str, ','); - int len =3D comma ? comma - str : (int)strlen(str); + size_t len =3D comma ? (size_t)(comma - str) : strlen(str); bool match =3D false; =20 for (u8 i =3D 0; i < ARRAY_SIZE(perf_disassembler__strs); i++) { const char *dis_str =3D perf_disassembler__strs[i]; =20 - if (len =3D=3D (int)strlen(dis_str) && !strncmp(str, dis_str, len)) { + if (len =3D=3D strlen(dis_str) && !strncmp(str, dis_str, len)) { annotation_options__add_disassembler(options, i); match =3D true; break; } } if (!match) { - pr_err("Invalid disassembler '%.*s'\n", len, str); + pr_err("Invalid disassembler '%.*s'\n", (int)len, str); return -1; } str =3D comma ? comma + 1 : NULL; @@ -2406,7 +2407,7 @@ static int extract_reg_offset(struct arch *arch, cons= t char *str, str++; } =20 - op_loc->offset =3D strtol(str, &p, 0); + op_loc->offset =3D (int)strtol(str, &p, 0); =20 p =3D strchr(p, arch->objdump.register_char); if (p =3D=3D NULL) @@ -2516,8 +2517,7 @@ int annotate_get_insn_location(struct arch *arch, str= uct disasm_line *dl, /* FIXME: Handle other segment registers */ if (!strncmp(insn_str, "%gs:", 4)) { op_loc->segment =3D INSN_SEG_X86_GS; - op_loc->offset =3D strtol(insn_str + 4, - &p, 0); + op_loc->offset =3D (int)strtol(insn_str + 4, &p, 0); if (p && p !=3D insn_str + 4) op_loc->imm =3D true; continue; @@ -2531,7 +2531,7 @@ int annotate_get_insn_location(struct arch *arch, str= uct disasm_line *dl, if (*s =3D=3D arch->objdump.register_char) op_loc->reg1 =3D get_dwarf_regnum(s, arch->e_machine, arch->e_flags); else if (*s =3D=3D arch->objdump.imm_char) { - op_loc->offset =3D strtol(s + 1, &p, 0); + op_loc->offset =3D (int)strtol(s + 1, &p, 0); if (p && p !=3D s + 1) op_loc->imm =3D true; } diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 8f0eb56c6fc6..7e24851a3934 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -856,7 +856,7 @@ static int ins__cmp(const void *a, const void *b) =20 static void ins__sort(struct arch *arch) { - const int nmemb =3D arch->nr_instructions; + const size_t nmemb =3D arch->nr_instructions; =20 qsort(arch->instructions, nmemb, sizeof(struct ins), ins__cmp); } @@ -864,7 +864,7 @@ static void ins__sort(struct arch *arch) static struct ins_ops *__ins__find(struct arch *arch, const char *name, st= ruct disasm_line *dl) { struct ins *ins; - const int nmemb =3D arch->nr_instructions; + const size_t nmemb =3D arch->nr_instructions; =20 if (arch__is(arch, "powerpc")) { /* @@ -1263,7 +1263,7 @@ static int dso__disassemble_filename(struct dso *dso,= char *filename, size_t fil char *build_id_filename; char *build_id_path =3D NULL; char *pos; - int len; + size_t len; =20 if (dso__symtab_type(dso) =3D=3D DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore(dso)) @@ -1754,7 +1754,8 @@ static int symbol__disassemble_raw(char *filename, st= ruct symbol *sym, u64 end =3D map__rip_2objdump(map, sym->end); u64 len =3D end - start; u64 offset; - int i, count; + int i; + ssize_t count; u8 *buf =3D NULL; char disasm_buf[512]; struct disasm_line *dl; @@ -1823,7 +1824,7 @@ static int symbol__disassemble_raw(char *filename, st= ruct symbol *sym, =20 out: free(buf); - return count < 0 ? count : 0; + return count < 0 ? (int)count : 0; =20 err: count =3D -1; --=20 2.49.0.906.g1f30a19c02-goog