From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 D071D21B9DE for ; Tue, 1 Apr 2025 18:24:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531895; cv=none; b=ecXL3DO6RQW7GjJCnLKjFXaXubyuRK0suFdB3td5zlij246ur3z1/VrlLey0PQ+RTGtU8HmQplrcMF+nxs1rvQjoHDEFMcx2eXLtpo22wjT5B9QZpDpZNWIaLe00zwlMfOIfvB5+g7VI96Nif5ZDinWay6s4/HEwGrR5pXG1Kxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531895; c=relaxed/simple; bh=evtKcJO6JgreVhXQ519ZpEqcukEoNZa/Zt1QGZHfhNE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=G9y5Pxzf1wWcKj6w2hVgBEWJZY+9tS/OJlen40LtOfR8bVb+r/4FtGFccg5E39mxmpyjvyWI+JkN7EB3R4vcYg/BrssBxssGmi6XpATXQ4zazPPt2sLSyNaklwTyHZobZ+2NUPI4iuI+xy6/UIWgwyhUfcuPqHCgP0VoYiTZm2A= 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=Gd6cS0+k; arc=none smtp.client-ip=209.85.214.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="Gd6cS0+k" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-22647ff3cf5so95124265ad.0 for ; Tue, 01 Apr 2025 11:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531893; x=1744136693; 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=G+pFNUFuvg3sBu986hGcTsi3XWrtdH4pSJphzXQPDGw=; b=Gd6cS0+kIcGRnPOkgw7XnXqvPKaw4y0gjKPuon5dneeOOFm6SEMPI7ggwdiC89ZVfG OCyfllYSOl7Ku7T8oPI9DJWMtqO0YKh7dVUK/BDFQY4jSB9zv4rUqjpnH1AC1NyQMb9E zpOB319wG02M73ibriJ/fE/mATIdMqlYZBn5rjIGIqT7lrScg3HWZ9XoInDr9Uo9UAKk V+2SMjF3MkzzrHYCvZFqEdnQvdyY/z1aJ8Bsokrh/4VUjn/2kY8r/ZDuIFYu3DMWDD+2 k8xfcb+r+Eu3KdWWBPq0G0hFMV6SiF4W4RwvtkgWlkSLfiQGnGV7t134opubyI/AJl2M 4D2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531893; x=1744136693; 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=G+pFNUFuvg3sBu986hGcTsi3XWrtdH4pSJphzXQPDGw=; b=DchGxVgASDgNU6K1e7mB32BiONPtnQeEKoWNBwkPjZKAuJTAgcuOzg/T9mDe2LG6Ai KJf40KbLlgvti9WEh5cGCt+lsIac2d/0QxAtiTTtVCsWTH/E6uraKUgp1VsrQ+zU9P4I 6kq7Ny3EJoIPXsJ9wvOd+9zZ/LVArRjyfaj8JHbVgI9PdHVbtrc05rOSedrVRi/cywTv ldOwf/Y1tB75EC0XMEdSmTnM80npM193VGXq7/9E6XqcLPiviWV9VLNMGir6CpOpO+HS RY2I7j+kvHvUcw1+mZt08Zamewvx5uNisw8Igaip9nLnJhYL6Ytl4o3l9ZeazUnn0kdu /R/Q== X-Forwarded-Encrypted: i=1; AJvYcCUBfZWCSqT4Iy4CuwQ3+i01NlQBl0Dbcws4q15JnEJRR/zQNzpXBrGxZkYyEgefXSTr4rHE@lists.linux.dev X-Gm-Message-State: AOJu0YwKT67C2N5PY9leEywZyadOSVSgxD4KppdgMBT2MWtVnEEufBw7 j9U4lJokfJ24Lo4TVd15+1JxIAJutgSbGp/8J7rCJPMuZPKVK/Gkm7VQbnlKRhDbJ7YhDQYKLMA hc+JQjw== X-Google-Smtp-Source: AGHT+IEGuoaOgsEiiCmj+DYkQlzD6TAEH+/gDN4mTjdSDcZNHVUirS5RJWIVMLKioVyAkZjKmJMVmsLL2Kq0 X-Received: from pfbln13.prod.google.com ([2002:a05:6a00:3ccd:b0:736:47b8:9b88]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2446:b0:223:525b:2a7 with SMTP id d9443c01a7336-2292f95f084mr213479705ad.15.1743531892980; Tue, 01 Apr 2025 11:24:52 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:06 -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-9-irogers@google.com> Subject: [PATCH v1 08/48] perf bench: 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/bench/breakpoint.c | 8 +++++--- tools/perf/bench/epoll-wait.c | 3 ++- tools/perf/bench/evlist-open-close.c | 8 ++++---- tools/perf/bench/find-bit-bench.c | 5 +++-- tools/perf/bench/futex.h | 4 ++-- tools/perf/bench/inject-buildid.c | 8 ++++---- tools/perf/bench/mem-functions.c | 2 +- tools/perf/bench/pmu-scan.c | 12 ++++++------ tools/perf/bench/sched-messaging.c | 4 ++-- tools/perf/bench/sched-pipe.c | 15 +++++++++------ tools/perf/bench/sched-seccomp-notify.c | 2 +- tools/perf/bench/synthesize.c | 6 +++--- tools/perf/builtin-bench.c | 2 +- 13 files changed, 43 insertions(+), 36 deletions(-) diff --git a/tools/perf/bench/breakpoint.c b/tools/perf/bench/breakpoint.c index dfd18f5db97d..72802b334eeb 100644 --- a/tools/perf/bench/breakpoint.c +++ b/tools/perf/bench/breakpoint.c @@ -57,7 +57,7 @@ static int breakpoint_setup(void *addr) attr.bp_addr = (unsigned long)addr; attr.bp_type = HW_BREAKPOINT_RW; attr.bp_len = HW_BREAKPOINT_LEN_1; - fd = syscall(SYS_perf_event_open, &attr, 0, -1, -1, 0); + fd = (int)syscall(SYS_perf_event_open, &attr, 0, -1, -1, 0); if (fd < 0) fd = -errno; @@ -111,7 +111,8 @@ static void *breakpoint_thread(void *arg) // then starts nparallel threads which create and join bench_repeat batches of nthreads threads. int bench_breakpoint_thread(int argc, const char **argv) { - unsigned int i, result_usec; + unsigned int i; + long result_usec; int repeat = bench_repeat; struct breakpoint *breakpoints; pthread_t *parallel; @@ -197,7 +198,8 @@ static const char * const enable_usage[] = { // and then disables and enables the breakpoint bench_repeat times. int bench_breakpoint_enable(int argc, const char **argv) { - unsigned int i, nthreads, result_usec, done = 0; + unsigned int i, nthreads, done = 0; + long result_usec; char watched; int fd; pthread_t *threads; diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c index 20fe4f72b4af..5ea3e0b2daf2 100644 --- a/tools/perf/bench/epoll-wait.c +++ b/tools/perf/bench/epoll-wait.c @@ -182,7 +182,8 @@ static void shuffle(void *array, size_t n, size_t size) static void *workerfn(void *arg) { - int fd, ret, r; + int fd, ret; + ssize_t r; struct worker *w = (struct worker *) arg; unsigned long ops = w->ops; struct epoll_event ev; diff --git a/tools/perf/bench/evlist-open-close.c b/tools/perf/bench/evlist-open-close.c index 5a27691469ed..770d9db176ee 100644 --- a/tools/perf/bench/evlist-open-close.c +++ b/tools/perf/bench/evlist-open-close.c @@ -192,16 +192,16 @@ static char *bench__repeat_event_string(const char *evstr, int n) { char sbuf[STRERR_BUFSIZE]; struct strbuf buf; - int i, str_size = strlen(evstr), - final_size = str_size * n + n, - err = strbuf_init(&buf, final_size); + size_t str_size = strlen(evstr); + size_t final_size = str_size * n + n; + int err = strbuf_init(&buf, final_size); if (err) { pr_err("strbuf_init: %s\n", str_error_r(err, sbuf, sizeof(sbuf))); goto out_error; } - for (i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { err = strbuf_add(&buf, evstr, str_size); if (err) { pr_err("strbuf_add: %s\n", str_error_r(err, sbuf, sizeof(sbuf))); diff --git a/tools/perf/bench/find-bit-bench.c b/tools/perf/bench/find-bit-bench.c index 7e25b0e413f6..59b00e89f71b 100644 --- a/tools/perf/bench/find-bit-bench.c +++ b/tools/perf/bench/find-bit-bench.c @@ -31,7 +31,7 @@ static const char *const bench_usage[] = { static unsigned int accumulator; static unsigned int use_of_val; -static noinline void workload(int val) +static noinline void workload(unsigned long val) { use_of_val += val; accumulator++; @@ -59,8 +59,9 @@ static int do_for_each_set_bit(unsigned int num_bits) u64 runtime_us; struct stats fb_time_stats, tb_time_stats; double time_average, time_stddev; - unsigned int bit, i, j; + unsigned int i, j; unsigned int set_bits, skip; + unsigned long bit; init_stats(&fb_time_stats); init_stats(&tb_time_stats); diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h index ebdc2b032afc..6d9076e091eb 100644 --- a/tools/perf/bench/futex.h +++ b/tools/perf/bench/futex.h @@ -49,14 +49,14 @@ static inline int futex_syscall(volatile u_int32_t *uaddr, int op, u_int32_t val, struct timespec *timeout, volatile u_int32_t *uaddr2, int val3, int opflags) { - return syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3); + return (int)syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3); } static inline int futex_syscall_nr_requeue(volatile u_int32_t *uaddr, int op, u_int32_t val, int nr_requeue, volatile u_int32_t *uaddr2, int val3, int opflags) { - return syscall(SYS_futex, uaddr, op | opflags, val, nr_requeue, uaddr2, val3); + return (int)syscall(SYS_futex, uaddr, op | opflags, val, nr_requeue, uaddr2, val3); } /** diff --git a/tools/perf/bench/inject-buildid.c b/tools/perf/bench/inject-buildid.c index f55c07e4be94..b78de817e721 100644 --- a/tools/perf/bench/inject-buildid.c +++ b/tools/perf/bench/inject-buildid.c @@ -175,7 +175,7 @@ static ssize_t synthesize_mmap(struct bench_data *data, struct bench_dso *dso, u union perf_event event; size_t len = offsetof(struct perf_record_mmap2, filename); u64 *id_hdr_ptr = (void *)&event; - int ts_idx; + size_t ts_idx; len += roundup(strlen(dso->name) + 1, 8) + bench_id_hdr_size; @@ -250,14 +250,14 @@ static void *data_reader(void *arg) struct bench_data *data = arg; char buf[8192]; int flag; - int n; flag = fcntl(data->output_pipe[0], F_GETFL); fcntl(data->output_pipe[0], F_SETFL, flag | O_NONBLOCK); /* read out data from child */ while (true) { - n = read(data->output_pipe[0], buf, sizeof(buf)); + ssize_t n = read(data->output_pipe[0], buf, sizeof(buf)); + if (n > 0) continue; if (n == 0) @@ -451,7 +451,7 @@ static void do_inject_loop(struct bench_data *data, bool build_id_all) static int do_inject_loops(struct bench_data *data) { - srand(time(NULL)); + srand((int)time(NULL)); symbol__init(NULL); bench_sample_type = PERF_SAMPLE_IDENTIFIER | PERF_SAMPLE_IP; diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c index 19d45c377ac1..672b76eb8f99 100644 --- a/tools/perf/bench/mem-functions.c +++ b/tools/perf/bench/mem-functions.c @@ -82,7 +82,7 @@ static int init_cycles(void) static u64 get_cycles(void) { - int ret; + ssize_t ret; u64 clk; ret = read(cycles_fd, &clk, sizeof(u64)); diff --git a/tools/perf/bench/pmu-scan.c b/tools/perf/bench/pmu-scan.c index 9e4d36486f62..4a885d4bd279 100644 --- a/tools/perf/bench/pmu-scan.c +++ b/tools/perf/bench/pmu-scan.c @@ -19,8 +19,8 @@ static unsigned int iterations = 100; struct pmu_scan_result { char *name; - int nr_aliases; - int nr_formats; + size_t nr_aliases; + size_t nr_formats; int nr_caps; bool is_core; }; @@ -63,7 +63,7 @@ static int save_result(void) list_for_each(list, &pmu->format) r->nr_formats++; - pr_debug("pmu[%d] name=%s, nr_caps=%d, nr_aliases=%d, nr_formats=%d\n", + pr_debug("pmu[%d] name=%s, nr_caps=%d, nr_aliases=%zu, nr_formats=%zu\n", nr_pmus, r->name, r->nr_caps, r->nr_aliases, r->nr_formats); nr_pmus++; } @@ -77,7 +77,7 @@ static int check_result(bool core_only) struct pmu_scan_result *r; struct perf_pmu *pmu; struct list_head *list; - int nr; + size_t nr; for (int i = 0; i < nr_pmus; i++) { r = &results[i]; @@ -98,7 +98,7 @@ static int check_result(bool core_only) nr = perf_pmu__num_events(pmu); if (nr != r->nr_aliases) { - pr_err("Unmatched number of event aliases in %s: expect %d vs got %d\n", + pr_err("Unmatched number of event aliases in %s: expect %zu vs got %zu\n", pmu->name, r->nr_aliases, nr); return -1; } @@ -107,7 +107,7 @@ static int check_result(bool core_only) list_for_each(list, &pmu->format) nr++; if (nr != r->nr_formats) { - pr_err("Unmatched number of event formats in %s: expect %d vs got %d\n", + pr_err("Unmatched number of event formats in %s: expect %zu vs got %zu\n", pmu->name, r->nr_formats, nr); return -1; } diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c index 93dcd9dba3d0..a2eb47944f44 100644 --- a/tools/perf/bench/sched-messaging.c +++ b/tools/perf/bench/sched-messaging.c @@ -102,7 +102,7 @@ static void *sender(struct sender_context *ctx) /* Now pump to every receiver. */ for (i = 0; i < nr_loops; i++) { for (j = 0; j < ctx->num_fds; j++) { - int ret, done = 0; + ssize_t ret, done = 0; again: ret = write(ctx->out_fds[j], data + done, @@ -133,7 +133,7 @@ static void *receiver(struct receiver_context* ctx) /* Receive them all */ for (i = 0; i < ctx->num_packets; i++) { char data[DATASIZE]; - int ret, done = 0; + ssize_t ret, done = 0; again: ret = read(ctx->in_fds[0], data + done, DATASIZE - done); diff --git a/tools/perf/bench/sched-pipe.c b/tools/perf/bench/sched-pipe.c index 70139036d68f..b847213fd616 100644 --- a/tools/perf/bench/sched-pipe.c +++ b/tools/perf/bench/sched-pipe.c @@ -102,7 +102,8 @@ static const char * const bench_sched_pipe_usage[] = { static int enter_cgroup(int nr) { char buf[32]; - int fd, len, ret; + int fd; + ssize_t ret, len; int saved_errno; struct cgroup *cgrp; pid_t pid; @@ -118,7 +119,7 @@ static int enter_cgroup(int nr) cgrp = cgrps[nr]; if (threaded) - pid = syscall(__NR_gettid); + pid = (pid_t)syscall(__NR_gettid); else pid = getpid(); @@ -172,23 +173,25 @@ static void exit_cgroup(int nr) static inline int read_pipe(struct thread_data *td) { - int ret, m; + ssize_t ret; + int m; retry: if (nonblocking) { ret = epoll_wait(td->epoll_fd, &td->epoll_ev, 1, -1); if (ret < 0) - return ret; + return (int)ret; } ret = read(td->pipe_read, &m, sizeof(int)); if (nonblocking && ret < 0 && errno == EWOULDBLOCK) goto retry; - return ret; + return (int)ret; } static void *worker_thread(void *__tdata) { struct thread_data *td = __tdata; - int i, ret, m = 0; + int i, m = 0; + ssize_t ret; ret = enter_cgroup(td->nr); if (ret < 0) { diff --git a/tools/perf/bench/sched-seccomp-notify.c b/tools/perf/bench/sched-seccomp-notify.c index 269c1f4a6852..4f0c68b366e3 100644 --- a/tools/perf/bench/sched-seccomp-notify.c +++ b/tools/perf/bench/sched-seccomp-notify.c @@ -43,7 +43,7 @@ static const char * const bench_seccomp_usage[] = { static int seccomp(unsigned int op, unsigned int flags, void *args) { - return syscall(__NR_seccomp, op, flags, args); + return (int)syscall(__NR_seccomp, op, flags, args); } static int user_notif_syscall(int nr, unsigned int flags) diff --git a/tools/perf/bench/synthesize.c b/tools/perf/bench/synthesize.c index 9b333276cbdb..484ba825fcf4 100644 --- a/tools/perf/bench/synthesize.c +++ b/tools/perf/bench/synthesize.c @@ -120,7 +120,7 @@ static int run_single_threaded(void) session = perf_session__new(NULL, NULL); if (IS_ERR(session)) { pr_err("Session creation failed.\n"); - return PTR_ERR(session); + return (int)PTR_ERR(session); } threads = thread_map__new_by_pid(getpid()); if (!threads) { @@ -163,7 +163,7 @@ static int do_run_multi_threaded(struct target *target, for (i = 0; i < multi_iterations; i++) { session = perf_session__new(NULL, NULL); if (IS_ERR(session)) - return PTR_ERR(session); + return (int)PTR_ERR(session); atomic_set(&event_count, 0); gettimeofday(&start, NULL); @@ -210,7 +210,7 @@ static int run_multi_threaded(void) int err; if (max_threads == UINT_MAX) - max_threads = sysconf(_SC_NPROCESSORS_ONLN); + max_threads = (int)sysconf(_SC_NPROCESSORS_ONLN); puts( "Computing performance of multi threaded perf event synthesis by\n" diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c index 2c1a9f3d847a..2f6a34908273 100644 --- a/tools/perf/builtin-bench.c +++ b/tools/perf/builtin-bench.c @@ -212,7 +212,7 @@ static int bench_str2int(const char *str) static int run_bench(const char *coll_name, const char *bench_name, bench_fn_t fn, int argc, const char **argv) { - int size; + size_t size; char *name; int ret; -- 2.49.0.504.g3bcea36a83-goog