From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 5C8E7224AF2 for ; Tue, 1 Apr 2025 18:25:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531945; cv=none; b=sYMBpFK0RUiHj39ivuYRNqkQPIfdjjzDYDwFVygwL5+3hf4U6NDDLyQrrVRB/5j41hYH72JQgw5db1L84PF+yRpWGYRunFYa3SPiBmKmFZ4VLLtTv9jaQ89KNWgJVuIbNS3B/5XYrScoVDfLxx5hPfekw9+i6vXq6o7E1JUFSsY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531945; c=relaxed/simple; bh=al5Mxt8nXAS1u6U/cGK5MI8j815Cmws4dfAODtLpLL8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=WfVqtr+Z6rs6AQr9ojACZr6vnDC6VrWhDGIk3TLt95HQolcgwEetqR4+BPm3WE2spFAhGJmOSFOd5GqKgMnxnhvRAGEBbffcLZ3E2PNbwn2BtpyUGw1us9d3POVLExFa1OZ97rCyd4wgFiuDPnlbr+gLEgugTJ8JssRx/0gT97Q= 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=zFSFCN+a; arc=none smtp.client-ip=209.85.214.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="zFSFCN+a" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-225974c6272so1282945ad.1 for ; Tue, 01 Apr 2025 11:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531942; x=1744136742; 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=Rm6T1zPzmDTC1F8AVzBi/d+/IoyjicMPmiE+ir3anfM=; b=zFSFCN+arvbAsVBEkt9qRGHC2FTp1wshELpFsK90wioiy4P+kvKz32w7QELMzFVujG An2FBt615EjqUwGgbfHCVchqlhNHWVRP4ChiSUUAszy+70xcTg62RS9tQjFd8qxmlaSs J9jLeyVwtcFOPKOjRR2rD1Khk8AsFa+587pCK0h00Xbot+s9Eo5uO/mMbuHCbJZ6u6Bb 0/K4lKX8EB2ALW57I+6L/sBoaBq4vHiyDWaSltyPAA7XiKH+Ife8K0Yq08izGsR3loqh CKHYaaNEu3PTPMvUCCRICoQY9qCVgCQvGY5UlH6o9QMoCprA+s97HN8sAzD2d0qbimNe vXyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531942; x=1744136742; 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=Rm6T1zPzmDTC1F8AVzBi/d+/IoyjicMPmiE+ir3anfM=; b=L9+K8BNH0J9T66snhK7a2t/lVZTilc+iEm+tfqPijDrrElDfYJTLLKdapONWjg2Qh6 J95na6LLC3NV+zJlJobebEyp12xRFHlhshxn64L69yi9YHeMAzYXr044da4hPNmJoNJH fAQzK70wBINy1RmpsPzPURNNnXAaUZ7wj/9S4l6CUCxhIDhKCCelyatd1GmePfLugXCM Styj8n7AX31FEe5y5uZTwwK/6fJr06R1WeHAeUSdy5gYHddNKaqW+sIOUTf1gNScZ2c/ U9kaYSwGr9TIwO1KxMwKDGWGxYwz63wZ2fc9L25c/dhCgApQ7ihUho4YWpEm692vXSOk 1Ahw== X-Forwarded-Encrypted: i=1; AJvYcCUGELGGc37oVUEIB9te1Dpj795Oq12Ah782jU0b1hZ4y+/4XFEjcjeazXoGhHhSqveTN+1s@lists.linux.dev X-Gm-Message-State: AOJu0YxE2H3FKmi/PR1L7GC12/kp5567ObnnNrIcRSSe4JxQ7b8YDDiQ QpHwFhWR1Yb+wxC1xrFGyUkDxSWaHY6kBFCziaow2gnQpwHb96y03bZU1PJN2wnvArTW74jCopQ rDzvkPA== X-Google-Smtp-Source: AGHT+IHKVFE7gUqlBrBiDOADaQ8FyWydoZ9FtAQo/eYfkCA1HXkf5tOSXncxrIuq49BPlqeHQvnDd3W85GCd X-Received: from plps15.prod.google.com ([2002:a17:902:988f:b0:223:fab5:e761]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1cf:b0:21f:6ce8:29df with SMTP id d9443c01a7336-2296828f748mr12279175ad.3.1743531942438; Tue, 01 Apr 2025 11:25:42 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:31 -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-34-irogers@google.com> Subject: [PATCH v1 33/48] perf evlist: 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/builtin-evlist.c | 2 +- tools/perf/util/evlist.c | 29 +++++++++++++++-------------- tools/perf/util/evsel.c | 35 ++++++++++++++--------------------- 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c index a9bd7bbef5a9..d8888c46238a 100644 --- a/tools/perf/builtin-evlist.c +++ b/tools/perf/builtin-evlist.c @@ -44,7 +44,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details tool.feature = process_header_feature; session = perf_session__new(&data, &tool); if (IS_ERR(session)) - return PTR_ERR(session); + return (int)PTR_ERR(session); if (data.is_pipe) perf_session__process_events(session); diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index c1a04141aed0..5692ea9f5717 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -920,7 +920,7 @@ int __evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str) return -1; } - *mmap_pages = pages; + *mmap_pages = (unsigned int)pages; return 0; } @@ -1442,7 +1442,7 @@ int evlist__prepare_workload(struct evlist *evlist, struct target *target, const } if (!evlist->workload.pid) { - int ret; + ssize_t ret; if (pipe_output) dup2(2, 1); @@ -1482,7 +1482,7 @@ int evlist__prepare_workload(struct evlist *evlist, struct target *target, const if (ret != 1) { if (ret == -1) perror("unable to read pipe"); - exit(ret); + exit((int)ret); } execvp(argv[0], (char **)argv); @@ -1543,7 +1543,7 @@ int evlist__start_workload(struct evlist *evlist) { if (evlist->workload.cork_fd >= 0) { char bf = 0; - int ret; + ssize_t ret; /* * Remove the cork, let it rip! */ @@ -1553,7 +1553,7 @@ int evlist__start_workload(struct evlist *evlist) close(evlist->workload.cork_fd); evlist->workload.cork_fd = -1; - return ret; + return (int)ret; } return 0; @@ -1656,7 +1656,8 @@ int evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_t size int evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size) { char sbuf[STRERR_BUFSIZE], *emsg = str_error_r(err, sbuf, sizeof(sbuf)); - int pages_attempted = evlist->core.mmap_len / 1024, pages_max_per_user, printed = 0; + int pages_attempted = (int)evlist->core.mmap_len / 1024; + int pages_max_per_user, printed = 0; switch (err) { case EPERM: @@ -1941,7 +1942,7 @@ int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *c if (strncmp(str, "fd:", 3)) return evlist__parse_control_fifo(str, ctl_fd, ctl_fd_ack, ctl_fd_close); - *ctl_fd = strtoul(&str[3], &endptr, 0); + *ctl_fd = (int)strtoul(&str[3], &endptr, 0); if (endptr == &str[3]) return -EINVAL; @@ -1950,7 +1951,7 @@ int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *c if (endptr != comma) return -EINVAL; - *ctl_fd_ack = strtoul(comma + 1, &endptr, 0); + *ctl_fd_ack = (int)strtoul(comma + 1, &endptr, 0); if (endptr == comma + 1 || *endptr != '\0') return -EINVAL; } @@ -2016,7 +2017,7 @@ int evlist__finalize_ctlfd(struct evlist *evlist) static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, char *cmd_data, size_t data_size) { - int err; + ssize_t err; char c; size_t bytes_read = 0; @@ -2070,12 +2071,12 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, } } - return bytes_read ? (int)bytes_read : err; + return bytes_read ? (int)bytes_read : (int)err; } int evlist__ctlfd_ack(struct evlist *evlist) { - int err; + ssize_t err; if (evlist->ctl_fd.ack == -1) return 0; @@ -2085,7 +2086,7 @@ int evlist__ctlfd_ack(struct evlist *evlist) if (err == -1) pr_err("failed to write to ctl_ack_fd %d: %m\n", evlist->ctl_fd.ack); - return err; + return (int)err; } static int get_cmd_arg(char *cmd_data, size_t cmd_size, char **arg) @@ -2305,7 +2306,7 @@ static int str_to_delay(const char *str) d = strtol(str, &endptr, 10); if (*endptr || d > INT_MAX || d < -1) return 0; - return d; + return (int)d; } int evlist__parse_event_enable_time(struct evlist *evlist, struct record_opts *opts, @@ -2326,7 +2327,7 @@ int evlist__parse_event_enable_time(struct evlist *evlist, struct record_opts *o ret = parse_event_enable_times(str, NULL); if (ret < 0) - return ret; + return (int)ret; times_cnt = ret; if (times_cnt == 0) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 1974395492d7..8b0a3cbb16a0 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -655,12 +655,12 @@ struct tep_event *evsel__tp_format(struct evsel *evsel) return NULL; if (!evsel->tp_sys) - tp_format = trace_event__tp_format_id(evsel->core.attr.config); + tp_format = trace_event__tp_format_id((int)evsel->core.attr.config); else tp_format = trace_event__tp_format(evsel->tp_sys, evsel->tp_name); if (IS_ERR(tp_format)) { - int err = -PTR_ERR(evsel->tp_format); + int err = (int)-PTR_ERR(evsel->tp_format); pr_err("Error getting tracepoint format '%s' '%s'(%d)\n", evsel__name(evsel), strerror(err), err); @@ -688,7 +688,7 @@ char *evsel__bpf_counter_events; bool evsel__match_bpf_counter_events(const char *name) { - int name_len; + size_t name_len; bool match; char *ptr; @@ -1154,7 +1154,7 @@ static void evsel__apply_config_terms(struct evsel *evsel, evsel__reset_sample_bit(evsel, BRANCH_STACK); break; case EVSEL__CONFIG_TERM_STACK_USER: - dump_size = term->val.stack_user; + dump_size = (u32)term->val.stack_user; break; case EVSEL__CONFIG_TERM_MAX_STACK: max_stack = term->val.max_stack; @@ -1772,7 +1772,7 @@ static u64 evsel__group_read_size(struct evsel *leader) u64 read_format = leader->core.attr.read_format; int entry = sizeof(u64); /* value */ int size = 0; - int nr = 1; + u64 nr = 1; if (!evsel__group_has_tpebs(leader)) return perf_evsel__read_size(&leader->core); @@ -1836,7 +1836,7 @@ static int evsel__read_group(struct evsel *leader, int cpu_map_idx, int thread) { struct perf_stat_evsel *ps = leader->stats; u64 read_format = leader->core.attr.read_format; - int size = evsel__group_read_size(leader); + size_t size = evsel__group_read_size(leader); u64 *data = ps->group_data; if (!(read_format & PERF_FORMAT_ID)) @@ -2178,31 +2178,27 @@ int evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus, static bool __has_attr_feature(struct perf_event_attr *attr, struct perf_cpu cpu, unsigned long flags) { - int fd = syscall(SYS_perf_event_open, attr, /*pid=*/0, cpu.cpu, - /*group_fd=*/-1, flags); + int fd = sys_perf_event_open(attr, /*pid=*/0, cpu.cpu, /*group_fd=*/-1, flags); close(fd); if (fd < 0) { attr->exclude_kernel = 1; - fd = syscall(SYS_perf_event_open, attr, /*pid=*/0, cpu.cpu, - /*group_fd=*/-1, flags); + fd = sys_perf_event_open(attr, /*pid=*/0, cpu.cpu, /*group_fd=*/-1, flags); close(fd); } if (fd < 0) { attr->exclude_hv = 1; - fd = syscall(SYS_perf_event_open, attr, /*pid=*/0, cpu.cpu, - /*group_fd=*/-1, flags); + fd = sys_perf_event_open(attr, /*pid=*/0, cpu.cpu, /*group_fd=*/-1, flags); close(fd); } if (fd < 0) { attr->exclude_guest = 1; - fd = syscall(SYS_perf_event_open, attr, /*pid=*/0, cpu.cpu, - /*group_fd=*/-1, flags); + fd = sys_perf_event_open(attr, /*pid=*/0, cpu.cpu, /*group_fd=*/-1, flags); close(fd); } @@ -3488,7 +3484,7 @@ char evsel__taskstate(struct evsel *evsel, struct perf_sample *sample, const cha * We can change this if we have a good reason in the future. */ val = evsel__intval(evsel, sample, name); - bit = val ? ffs(val) : 0; + bit = val ? ffs((int)val) : 0; state = (!bit || bit > strlen(states)) ? 'R' : states[bit-1]; return state; } @@ -3833,18 +3829,15 @@ struct perf_env *evsel__env(struct evsel *evsel) static int store_evsel_ids(struct evsel *evsel, struct evlist *evlist) { - int cpu_map_idx, thread; - if (evsel__is_retire_lat(evsel)) return 0; - for (cpu_map_idx = 0; cpu_map_idx < xyarray__max_x(evsel->core.fd); cpu_map_idx++) { - for (thread = 0; thread < xyarray__max_y(evsel->core.fd); - thread++) { + for (size_t cpu_map_idx = 0; cpu_map_idx < xyarray__max_x(evsel->core.fd); cpu_map_idx++) { + for (size_t thread = 0; thread < xyarray__max_y(evsel->core.fd); thread++) { int fd = FD(evsel, cpu_map_idx, thread); if (perf_evlist__id_add_fd(&evlist->core, &evsel->core, - cpu_map_idx, thread, fd) < 0) + (int)cpu_map_idx, (int)thread, fd) < 0) return -1; } } -- 2.49.0.504.g3bcea36a83-goog