From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f73.google.com (mail-ot1-f73.google.com [209.85.210.73]) (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 E6A2A228C8D for ; Tue, 1 Apr 2025 18:26:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531971; cv=none; b=fFGjkvMhQi0npSnT2IqTkPDsThqbQL8mEEOckRi8nCchJhxDyu/V+hi4kDtE5iY6PBOO/x3HodHlTSAxAu/MFSyzOL4fHcaUV4SPHeLIlXhwmSS/l0+fv0/CXjWA3IB922PsQgDFFCoovFeZctiNEuzGSxSrxOS7bmgJmihwnYk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531971; c=relaxed/simple; bh=loSeINwlbc6XnjqNUnme9Ii2wesULU3u9gelnKxDOWo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=RnhaVD1jqvXOE2PPwRz1XCWwizuC1DP77UCmQyuZGdAI8ey/dHXspXHegCsC9Q4+DoQ1RBUIJP7BE6p4KU1X2ZsXwd5d4Q6jsRhgNVPPF+N7/3y7Ujv9y3LGOzCIC4c0HQsVyYeSvL0AI/CSNiY4GGvPkX6xqObOXVQon77vrRI= 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=H5N8QoVX; arc=none smtp.client-ip=209.85.210.73 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="H5N8QoVX" Received: by mail-ot1-f73.google.com with SMTP id 46e09a7af769-72bc289077fso343240a34.0 for ; Tue, 01 Apr 2025 11:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531968; x=1744136768; darn=lists.linux.dev; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=iXDN2IiTwXgBiyK9J/TipFHWdZHNwXGG7JKhdVlTKrc=; b=H5N8QoVXtf8WFz8jLlQO1ZIFFS+yYJ3VtMUEUli8kwc9aHGfYTvJ7QnMvAVmSVys4k HylDEgPKYGQNMljUG/1lN1SzzVb5YWNAvEE8wV9m4AYpA9U17OCZuk0QFiEFSXp9/LRj RfBqizuZw6UE0Z8SjbniK7Z09Cu/MFKW/JvSUGU1gQLKTxqQo0q50oik1Wp0MmT0iLLN w6e+/38ilhsGhaSI9mlmqZTVGplT4JrFhnDRkK6aquBFnF7WcpMoJxQmOpbaKaQck/Mq zQUtBkfFxbGxjI4Azr9Ws4hrobuDxs0DyW8RajyKEqpTuQTWgfPizsqxWtIayfk1YRIA AF8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531968; x=1744136768; 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=iXDN2IiTwXgBiyK9J/TipFHWdZHNwXGG7JKhdVlTKrc=; b=X+R89mwUdE5N/1vpiCecPgwaf6Ni8tY7KpmPKNtDs6A7gVFezVQFOxZ+YwQpq/VGz5 IpInTJGbWoSQ31aVY8GPTfVJu3ah6GAGZYxL8ygssxtcrSbR6cs9dFkY4acqGs8DwpFY Uzv0c6xJg2Q8PDe/Df+/T5zVQfLgBYRQGXfkAJJ5gaJhKzrsOJyG/9YSv32zigA6OyZu 5jmWhQDUHddKgFsM7GayWARU2b3iEPnTehbdvL2vOfJtYRxML0RPL0e3W1q4d+KIywEt DemliKa7ejGHLIWmn8eRpayEMXkJMhzyOfHJGbabb1HgTYDuDgnA7jqB7EiRH5l4XebQ s8Yg== X-Forwarded-Encrypted: i=1; AJvYcCUZd4gx3yjCPMYnCurlC+euLMIR4FUWj18sgNJR50ukEaxtauHsrSCZtSetu5pBnIcRrTIc@lists.linux.dev X-Gm-Message-State: AOJu0YyLx6v+nhXhaubBcUquE0QdSr4iZ98mIn/ttsV3WwDQKHQ7dmiD l/cuyWVZ/6pzbRY3dBZe6E3/jYdvYyU3MZTz5+Dlvi+5xdo1PWhzhqN+Ybcv/hRiB3kwXhWCa6d wfcY6Qg== X-Google-Smtp-Source: AGHT+IHUffenbdrxtR2eLoeeVEpZywaWbKXEVYkXtogEfzNSPRpDS6P26p637BPNcEuYtvO3lbjegNy1msNO X-Received: from oabhi26.prod.google.com ([2002:a05:6870:c99a:b0:2c1:5c70:acac]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6830:2808:b0:72a:f44b:13ed with SMTP id 46e09a7af769-72c637771c3mr8057489a34.2.1743531968061; Tue, 01 Apr 2025 11:26:08 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:43 -0700 In-Reply-To: <20250401182347.3422199-1-irogers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250401182347.3422199-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250401182347.3422199-46-irogers@google.com> Subject: [PATCH v1 45/48] perf symbol: Silence -Wshorten-64-to-32 warnings From: Ian Rogers To: Yury Norov , Rasmus Villemoes , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , 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 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; for (i = 0; i < phdrnum; i++) { - if (gelf_getphdr(elf, i, phdr) == NULL) + if (gelf_getphdr(elf, (int)i, phdr) == NULL) return -1; if (phdr->p_type != 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; - di->nr_entries = rela_dyn_shdr.sh_size / rela_dyn_shdr.sh_entsize; + di->nr_entries = (u32)(rela_dyn_shdr.sh_size / rela_dyn_shdr.sh_entsize); di->rela_dyn_data = elf_getdata(scn, NULL); scn = 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 == 0) goto out_elf_end; - ri.nr_entries = shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize; + ri.nr_entries = (u32)(shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize); ri.is_rela = shdr_rel_plt.sh_type == SHT_RELA; @@ -925,7 +925,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size) size_t sz = min(size, descsz); memcpy(bf, ptr, sz); memset(bf + sz, 0, size - sz); - err = sz; + err = (int)sz; break; } } @@ -1066,14 +1066,14 @@ int sysfs__read_build_id(const char *filename, struct build_id *bid) } else if (read(fd, bf, descsz) != (ssize_t)descsz) break; } else { - int n = namesz + descsz; + size_t n = namesz + descsz; - if (n > (int)sizeof(bf)) { + if (n > sizeof(bf)) { n = sizeof(bf); pr_debug("%s: truncating reading of build id in sysfs file %s: n_namesz=%u, n_descsz=%u.\n", __func__, filename, nhdr.n_namesz, nhdr.n_descsz); } - if (read(fd, bf, n) != n) + if (read(fd, bf, n) != (ssize_t)n) break; } } @@ -1426,7 +1426,7 @@ static u64 max_text_section(Elf *elf, GElf_Ehdr *ehdr) if (!gelf_getshdr(sec, &shdr)) break; - if (!is_exe_text(shdr.sh_flags)) + if (!is_exe_text((int)shdr.sh_flags)) continue; /* .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 <= max_text_sh_offset) { dso__put(*curr_dsop); *curr_dsop = dso__get(dso); @@ -1672,7 +1672,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss, if (secstrs_sym == NULL) goto out_elf_end; - nr_syms = shdr.sh_size / shdr.sh_entsize; + nr_syms = (uint32_t)(shdr.sh_size / shdr.sh_entsize); memset(&sym, 0, sizeof(sym)); @@ -1734,7 +1734,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss, } if (runtime_ss->opdsec && sym.st_shndx == runtime_ss->opdidx) { - u32 offset = sym.st_value - syms_ss->opdshdr.sh_addr; + u32 offset = (u32)(sym.st_value - syms_ss->opdshdr.sh_addr); u64 *opd = opddata->d_buf + offset; sym.st_value = DSO__SWAP(dso, u64, *opd); sym.st_shndx = 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; for (i = 0; i < phdrnum; i++) { - if (gelf_getphdr(elf, i, &phdr) == NULL) + if (gelf_getphdr(elf, (int)i, &phdr) == NULL) return -1; if (phdr.p_type != PT_LOAD) continue; @@ -2767,14 +2767,15 @@ static void sdt_adjust_loc(struct sdt_note *tmp, GElf_Addr base_off) if (!base_off) return; - if (tmp->bit32) + if (tmp->bit32) { tmp->addr.a32[SDT_NOTE_IDX_LOC] = - 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] = tmp->addr.a64[SDT_NOTE_IDX_LOC] + base_off - tmp->addr.a64[SDT_NOTE_IDX_BASE]; + } } 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 == '_') tail++; - return tail - str; + return (int)(tail - str); } 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, if (includes == SYMBOL_TAG_INCLUDE__DEFAULT_ONLY && (versioning = strstr(name, "@@"))) { - int len = strlen(str); + int len = (int)strlen(str); if (len < versioning - name) - len = versioning - name; + len = (int)(versioning - name); 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; @@ -1532,7 +1532,7 @@ static int dso__load_perf_map(const char *map_path, struct dso *dso) while (!feof(file)) { u64 start, size; struct symbol *sym; - int line_len, len; + size_t line_len, len; line_len = getline(&line, &n, file); if (line_len < 0) -- 2.49.0.504.g3bcea36a83-goog