From nobody Fri Dec 19 17:38:31 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 327662690E7 for ; Wed, 30 Apr 2025 17:52:09 +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=1746035531; cv=none; b=jcS1Dx2gMxe7S5dUdkeAvkwedbuE7AvCFt6cm0zesJ//LwyzJpEGT43caXJrPOwQuSWjcmPWEIfNPyd7Y6WauO24h9r/2JRXVoxAv7bGbgRifGxHWoNRR+2AHki9IOzFS0RZj+A/jCfQ5sl1iTRn4rOD+UU451IwqAd9WsDvCaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035531; c=relaxed/simple; bh=n73KmiK/kNN5ufQMB3kNSo8ge+ozEbe/HJSdGbtSj0Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=K5otztpYEatsKdfpJ3Csnioe/oajmDaYNWzz4n9efayzieE4sLBlpsh0wwm0HwlCaiQ+LXGOER+wojofHxQ1fwrH/fzqepA89XxCPZTu/unFZTQWg7K3n+WFrnBbJKE4ctGPPDEpBkRrz9/tnGMkY1UktmnvdjK5C4JV6Iws6m4= 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=Y4ZGjD0Y; 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="Y4ZGjD0Y" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff798e8c3bso157097a91.2 for ; Wed, 30 Apr 2025 10:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746035528; x=1746640328; 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=cD+4f+lnvjGG2DFoE148AKCMlfm6WJypnmmIVtU2xCU=; b=Y4ZGjD0Yw56IGXgglKDntCJbVpd05vYGBXDovatPp1zzgALevOb5VPI3Lkf32xyml5 DtUmDasUcUut7+4c/9mApZs0CIEuZlLiQ5zlWbpeqDMoIBuYUzK8cwODRzc5UJxwcGhL PX6x81QaGtp2XEqQE7An+xTfvBwSP0imB1uMNnS7ODWQYvYcXMAwsPdwyNsgzEYxXGQS CRbaNtm0umbXVTrRLIWS+t/ZGhjmbR2/Ut1rXSXg6nJ02HQMa1iD/vw/ixVXAib9+Fl3 kHrfETkhKAqYa33vxMVmbC27UUGQpBig/MmdNt4EHWnxYqoyh3pk8pIappLkLHo+pQ1a j38g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746035528; x=1746640328; 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=cD+4f+lnvjGG2DFoE148AKCMlfm6WJypnmmIVtU2xCU=; b=WMdaCj9MF4sLJwp4+qMfOTdxro1TDiTQD5eqM22ioa7IVu8SXd1zG5OwbeIS6Z+oXo ZzSr6fcaEZkYgNlJWDzK5McjzGDcEPCuCOeL8UrHzL3dLI5zw/KHFBhtiwNwItqA3aZe r+HCMxj9K8YJ5BR0t6kp1L9XI3y0/lspm3yVbe1/9EjCxfdbZnSpZXXQJ8OnB0FZC9am vjle6bKjqjOn7k2P6msaxj2ZDzREhct9u7RRtiARFGCkH+3L4/gNbVQigyNRq+dcPBuk DBRlJ2Rygslb5a0sFVjNTOd1j0Scc9b9MiK2O00ba6B6UUKKqIRufvcAKsuA9yPFvlAv HBGg== X-Forwarded-Encrypted: i=1; AJvYcCVm+b7wYtC3Fwxvig32UUPLtjHgZcc3a799vrbe1vs6ReTNBv93T+n5hpem3qDvqv8/rm4diBNRciqPp+Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2kg2CH7DXTq2saJfZq0DlhjGbO1N7Qc6dL86ndaxF/fqIIRH+ uoWyXoxPKRdIi5rMJaWIr74xnR99zcMCRVEMLyVMQSW0qSkkqAX06g68iaCBAkql3YOdJbWCEkj le4jKOw== X-Google-Smtp-Source: AGHT+IEtSQE7pShiBcCl/bNRHA2itLNUeOrSRXZm3f4tCByowFROZewilmBcO/UZWo9Xl43LHlwDFWeC6+hr X-Received: from pjbsb11.prod.google.com ([2002:a17:90b:50cb:b0:2fa:15aa:4d2b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5445:b0:2ef:114d:7bf8 with SMTP id 98e67ed59e1d1-30a332d5c05mr5146504a91.6.1746035528216; Wed, 30 Apr 2025 10:52:08 -0700 (PDT) Date: Wed, 30 Apr 2025 10:50:23 -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-36-irogers@google.com> Subject: [PATCH v2 35/47] perf record: 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-record.c | 66 ++++++++++++++++++----------------- tools/perf/builtin-top.c | 4 +-- tools/perf/util/auxtrace.c | 8 ++--- tools/perf/util/bpf-filter.c | 20 +++++------ tools/perf/util/bpf_off_cpu.c | 4 +-- tools/perf/util/mmap.c | 6 ++-- 6 files changed, 55 insertions(+), 53 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index ba20bf7c011d..e524b9cae531 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -443,7 +443,7 @@ static int record__aio_pushfn(struct mmap *map, void *t= o, void *buf, size_t size =20 aio->size +=3D size; =20 - return size; + return (int)size; } =20 static int record__aio_push(struct record *rec, struct mmap *map, off_t *o= ff) @@ -523,7 +523,7 @@ static int record__aio_parse(const struct option *opt, opts->nr_cblocks =3D 0; } else { if (str) - opts->nr_cblocks =3D strtol(str, NULL, 0); + opts->nr_cblocks =3D (int)strtol(str, NULL, 0); if (!opts->nr_cblocks) opts->nr_cblocks =3D nr_cblocks_default; } @@ -577,15 +577,15 @@ static int record__mmap_flush_parse(const struct opti= on *opt, return 0; =20 if (str) { - opts->mmap_flush =3D parse_tag_value(str, tags); + opts->mmap_flush =3D (int)parse_tag_value(str, tags); if (opts->mmap_flush =3D=3D (int)-1) - opts->mmap_flush =3D strtol(str, NULL, 0); + opts->mmap_flush =3D (int)strtol(str, NULL, 0); } =20 if (!opts->mmap_flush) opts->mmap_flush =3D MMAP_FLUSH_DEFAULT; =20 - flush_max =3D evlist__mmap_size(opts->mmap_pages); + flush_max =3D (int)evlist__mmap_size(opts->mmap_pages); flush_max /=3D 4; if (opts->mmap_flush > flush_max) opts->mmap_flush =3D flush_max; @@ -604,7 +604,7 @@ static int record__parse_comp_level(const struct option= *opt, const char *str, i opts->comp_level =3D 0; } else { if (str) - opts->comp_level =3D strtol(str, NULL, 0); + opts->comp_level =3D (unsigned int)strtol(str, NULL, 0); if (!opts->comp_level) opts->comp_level =3D comp_level_default; } @@ -1080,11 +1080,12 @@ static int record__thread_data_init_maps(struct rec= ord_thread *thread_data, stru struct perf_cpu_map *cpus =3D evlist->core.all_cpus; bool per_thread =3D evlist__per_thread(evlist); =20 - if (per_thread) + if (per_thread) { thread_data->nr_mmaps =3D nr_mmaps; - else - thread_data->nr_mmaps =3D bitmap_weight(thread_data->mask->maps.bits, - thread_data->mask->maps.nbits); + } else { + thread_data->nr_mmaps =3D (int)bitmap_weight(thread_data->mask->maps.bit= s, + (unsigned int)thread_data->mask->maps.nbits); + } if (mmap) { thread_data->maps =3D zalloc(thread_data->nr_mmaps * sizeof(struct mmap = *)); if (!thread_data->maps) @@ -1519,10 +1520,11 @@ static void record__adjust_affinity(struct record *= rec, struct mmap *map) { if (rec->opts.affinity !=3D PERF_AFFINITY_SYS && !bitmap_equal(thread->mask->affinity.bits, map->affinity_mask.bits, - thread->mask->affinity.nbits)) { - bitmap_zero(thread->mask->affinity.bits, thread->mask->affinity.nbits); + (unsigned int)thread->mask->affinity.nbits)) { + bitmap_zero(thread->mask->affinity.bits, + (unsigned int)thread->mask->affinity.nbits); bitmap_or(thread->mask->affinity.bits, thread->mask->affinity.bits, - map->affinity_mask.bits, thread->mask->affinity.nbits); + map->affinity_mask.bits, (unsigned int)thread->mask->affinity.nbits); sched_setaffinity(0, MMAP_CPU_MASK_BYTES(&thread->mask->affinity), (cpu_set_t *)thread->mask->affinity.bits); if (verbose =3D=3D 2) { @@ -1688,7 +1690,7 @@ static void *record__thread(void *arg) thread =3D arg; thread->tid =3D gettid(); =20 - err =3D write(thread->pipes.ack[1], &msg, sizeof(msg)); + err =3D (int)write(thread->pipes.ack[1], &msg, sizeof(msg)); if (err =3D=3D -1) pr_warning("threads[%d]: failed to notify on start: %s\n", thread->tid, strerror(errno)); @@ -1732,7 +1734,7 @@ static void *record__thread(void *arg) } record__mmap_read_all(thread->rec, true); =20 - err =3D write(thread->pipes.ack[1], &msg, sizeof(msg)); + err =3D (int)write(thread->pipes.ack[1], &msg, sizeof(msg)); if (err =3D=3D -1) pr_warning("threads[%d]: failed to notify on termination: %s\n", thread->tid, strerror(errno)); @@ -1958,8 +1960,8 @@ static void record__read_lost_samples(struct record *= rec) continue; } =20 - for (int x =3D 0; x < xyarray__max_x(xy); x++) { - for (int y =3D 0; y < xyarray__max_y(xy); y++) { + for (int x =3D 0; x < (int)xyarray__max_x(xy); x++) { + for (int y =3D 0; y < (int)xyarray__max_y(xy); y++) { struct perf_counts_values count; =20 if (perf_evsel__read(&evsel->core, x, y, &count) < 0) { @@ -2246,7 +2248,7 @@ static int record__terminate_thread(struct record_thr= ead *thread_data) =20 close(thread_data->pipes.msg[1]); thread_data->pipes.msg[1] =3D -1; - err =3D read(thread_data->pipes.ack[0], &ack, sizeof(ack)); + err =3D (int)read(thread_data->pipes.ack[0], &ack, sizeof(ack)); if (err > 0) pr_debug2("threads[%d]: sent %s\n", tid, thread_msg_tags[ack]); else @@ -2294,7 +2296,7 @@ static int record__start_threads(struct record *rec) goto out_err; } =20 - err =3D read(thread_data[t].pipes.ack[0], &msg, sizeof(msg)); + err =3D (int)read(thread_data[t].pipes.ack[0], &msg, sizeof(msg)); if (err > 0) pr_debug2("threads[%d]: sent %s\n", rec->thread_data[t].tid, thread_msg_tags[msg]); @@ -2409,7 +2411,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) session =3D perf_session__new(data, tool); if (IS_ERR(session)) { pr_err("Perf session creation failed.\n"); - return PTR_ERR(session); + return (int)PTR_ERR(session); } =20 if (record__threads_enabled(rec)) { @@ -2495,7 +2497,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) } /* Debug message used by test scripts */ pr_debug3("perf record done opening and mmapping events\n"); - session->header.env.comp_mmap_len =3D session->evlist->core.mmap_len; + session->header.env.comp_mmap_len =3D (u32)session->evlist->core.mmap_len; =20 if (rec->opts.kcore) { err =3D record__kcore_copy(&session->machines.host, data); @@ -2713,7 +2715,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) =20 /* re-arm the alarm */ if (rec->switch_output.time) - alarm(rec->switch_output.time); + alarm((unsigned int)rec->switch_output.time); } =20 if (hits =3D=3D thread->samples) { @@ -2976,7 +2978,7 @@ static int perf_record_config(const char *var, const = char *value, void *cb) } #ifdef HAVE_AIO_SUPPORT if (!strcmp(var, "record.aio")) { - rec->opts.nr_cblocks =3D strtol(value, NULL, 0); + rec->opts.nr_cblocks =3D (int)strtol(value, NULL, 0); if (!rec->opts.nr_cblocks) rec->opts.nr_cblocks =3D nr_cblocks_default; } @@ -3016,7 +3018,7 @@ static int record__parse_affinity(const struct option= *opt, const char *str, int static int record__mmap_cpu_mask_alloc(struct mmap_cpu_mask *mask, int nr_= bits) { mask->nbits =3D nr_bits; - mask->bits =3D bitmap_zalloc(mask->nbits); + mask->bits =3D bitmap_zalloc((int)mask->nbits); if (!mask->bits) return -ENOMEM; =20 @@ -3604,7 +3606,7 @@ static int record__mmap_cpu_mask_init_spec(struct mma= p_cpu_mask *mask, const cha if (!cpus) return -ENOMEM; =20 - bitmap_zero(mask->bits, mask->nbits); + bitmap_zero(mask->bits, (unsigned int)mask->nbits); if (record__mmap_cpu_mask_init(mask, cpus)) return -ENODEV; =20 @@ -3722,13 +3724,13 @@ static int record__init_thread_masks_spec(struct re= cord *rec, struct perf_cpu_ma =20 /* ignore invalid CPUs but do not allow empty masks */ if (!bitmap_and(thread_mask.maps.bits, thread_mask.maps.bits, - cpus_mask.bits, thread_mask.maps.nbits)) { + cpus_mask.bits, (unsigned int)thread_mask.maps.nbits)) { pr_err("Empty maps mask: %s\n", maps_spec[s]); ret =3D -EINVAL; goto out_free; } if (!bitmap_and(thread_mask.affinity.bits, thread_mask.affinity.bits, - cpus_mask.bits, thread_mask.affinity.nbits)) { + cpus_mask.bits, (unsigned int)thread_mask.affinity.nbits)) { pr_err("Empty affinity mask: %s\n", affinity_spec[s]); ret =3D -EINVAL; goto out_free; @@ -3736,22 +3738,22 @@ static int record__init_thread_masks_spec(struct re= cord *rec, struct perf_cpu_ma =20 /* do not allow intersection with other masks (full_mask) */ if (bitmap_intersects(thread_mask.maps.bits, full_mask.maps.bits, - thread_mask.maps.nbits)) { + (unsigned int)thread_mask.maps.nbits)) { pr_err("Intersecting maps mask: %s\n", maps_spec[s]); ret =3D -EINVAL; goto out_free; } if (bitmap_intersects(thread_mask.affinity.bits, full_mask.affinity.bits, - thread_mask.affinity.nbits)) { + (unsigned int)thread_mask.affinity.nbits)) { pr_err("Intersecting affinity mask: %s\n", affinity_spec[s]); ret =3D -EINVAL; goto out_free; } =20 bitmap_or(full_mask.maps.bits, full_mask.maps.bits, - thread_mask.maps.bits, full_mask.maps.nbits); + thread_mask.maps.bits, (unsigned int)full_mask.maps.nbits); bitmap_or(full_mask.affinity.bits, full_mask.affinity.bits, - thread_mask.affinity.bits, full_mask.maps.nbits); + thread_mask.affinity.bits, (unsigned int)full_mask.maps.nbits); =20 thread_masks =3D realloc(rec->thread_masks, (t + 1) * sizeof(struct thre= ad_mask)); if (!thread_masks) { @@ -4101,7 +4103,7 @@ int cmd_record(int argc, const char **argv) =20 if (rec->switch_output.time) { signal(SIGALRM, alarm_sig_handler); - alarm(rec->switch_output.time); + alarm((unsigned int)rec->switch_output.time); } =20 if (rec->switch_output.num_files) { diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index f9f31391bddb..c24a945b873d 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -375,7 +375,7 @@ static void prompt_integer(int *target, const char *msg) goto out_free; p++; } - tmp =3D strtoul(buf, NULL, 10); + tmp =3D (int)strtoul(buf, NULL, 10); *target =3D tmp; out_free: free(buf); @@ -1817,7 +1817,7 @@ int cmd_top(int argc, const char **argv) =20 top.session =3D perf_session__new(NULL, NULL); if (IS_ERR(top.session)) { - status =3D PTR_ERR(top.session); + status =3D (int)PTR_ERR(top.session); top.session =3D NULL; goto out_delete_evlist; } diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 03211c2623de..0caacd38b538 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -780,7 +780,7 @@ int auxtrace_parse_sample_options(struct auxtrace_recor= d *itr, if (evsel__is_group_leader(evsel)) { has_aux_leader =3D evsel__is_aux_event(evsel); } else if (has_aux_leader) { - evsel->core.attr.aux_sample_size =3D sz; + evsel->core.attr.aux_sample_size =3D (__u32)sz; } } no_opt: @@ -1647,7 +1647,7 @@ int itrace_do_parse_synth_opts(struct itrace_synth_op= ts *synth_opts, if (isdigit(*p)) { unsigned int val; =20 - val =3D strtoul(p, &endptr, 10); + val =3D (unsigned int)strtoul(p, &endptr, 10); p =3D endptr; if (!val || val > PERF_ITRACE_MAX_CALLCHAIN_SZ) goto out_err; @@ -1667,7 +1667,7 @@ int itrace_do_parse_synth_opts(struct itrace_synth_op= ts *synth_opts, if (isdigit(*p)) { unsigned int val; =20 - val =3D strtoul(p, &endptr, 10); + val =3D (unsigned int)strtoul(p, &endptr, 10); p =3D endptr; if (!val || val > PERF_ITRACE_MAX_LAST_BRANCH_SZ) @@ -2300,7 +2300,7 @@ static int parse_sym_idx(char **inp, int *idx) if (endptr =3D=3D *inp || num > INT_MAX) return -EINVAL; *inp =3D endptr; - *idx =3D num; + *idx =3D (int)num; } =20 return 0; diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c index a4fdf6911ec1..7ad4d5e8fa49 100644 --- a/tools/perf/util/bpf-filter.c +++ b/tools/perf/util/bpf-filter.c @@ -217,7 +217,7 @@ static int convert_to_tgid(int tid) return -1; } =20 - tgid =3D strtol(p + 6, &q, 0); + tgid =3D (int)strtol(p + 6, &q, 0); free(buf); if (*q !=3D '\n') return -1; @@ -284,7 +284,7 @@ static void destroy_event_hash(u64 event_id) */ static u64 create_event_hash(struct evsel *evsel) { - int x, y, fd; + int fd; u64 the_id =3D 0, id; =20 fd =3D get_pinned_fd("event_hash"); @@ -293,8 +293,8 @@ static u64 create_event_hash(struct evsel *evsel) return 0; } =20 - for (x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { - for (y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { + for (size_t x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { + for (size_t y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { int ret =3D ioctl(FD(evsel, x, y), PERF_EVENT_IOC_ID, &id); =20 if (ret < 0) { @@ -444,7 +444,7 @@ static int create_idx_hash(struct evsel *evsel, struct = perf_bpf_filter_entry *en =20 int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target) { - int i, x, y, fd, ret; + int i, fd, ret; struct sample_filter_bpf *skel =3D NULL; struct bpf_program *prog; struct bpf_link *link; @@ -485,8 +485,8 @@ int perf_bpf_filter__prepare(struct evsel *evsel, struc= t target *target) goto err; } =20 - for (x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { - for (y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { + for (size_t x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { + for (size_t y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { ret =3D ioctl(FD(evsel, x, y), PERF_EVENT_IOC_SET_BPF, fd); if (ret < 0) { pr_err("Failed to attach perf sample-filter\n"); @@ -519,12 +519,12 @@ int perf_bpf_filter__prepare(struct evsel *evsel, str= uct target *target) } =20 prog =3D skel->progs.perf_sample_filter; - for (x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { - for (y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { + for (size_t x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { + for (size_t y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { link =3D bpf_program__attach_perf_event(prog, FD(evsel, x, y)); if (IS_ERR(link)) { pr_err("Failed to attach perf sample-filter program\n"); - ret =3D PTR_ERR(link); + ret =3D (int)PTR_ERR(link); goto err; } } diff --git a/tools/perf/util/bpf_off_cpu.c b/tools/perf/util/bpf_off_cpu.c index 4269b41d1771..3f0a65fb987d 100644 --- a/tools/perf/util/bpf_off_cpu.c +++ b/tools/perf/util/bpf_off_cpu.c @@ -164,7 +164,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, ntasks =3D 0; strlist__for_each_entry(pos, pid_slist) { char *end_ptr; - int pid =3D strtol(pos->s, &end_ptr, 10); + int pid =3D (int)strtol(pos->s, &end_ptr, 10); =20 if (pid =3D=3D INT_MIN || pid =3D=3D INT_MAX || (*end_ptr !=3D '\0' && *end_ptr !=3D ',')) @@ -234,7 +234,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, strlist__for_each_entry(pos, pid_slist) { char *end_ptr; u32 tgid; - int pid =3D strtol(pos->s, &end_ptr, 10); + int pid =3D (int)strtol(pos->s, &end_ptr, 10); =20 if (pid =3D=3D INT_MIN || pid =3D=3D INT_MAX || (*end_ptr !=3D '\0' && *end_ptr !=3D ',')) diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c index a34726219af3..b8e8865aeb22 100644 --- a/tools/perf/util/mmap.c +++ b/tools/perf/util/mmap.c @@ -31,7 +31,7 @@ void mmap_cpu_mask__scnprintf(struct mmap_cpu_mask *mask,= const char *tag) char buf[MASK_SIZE + 1]; size_t len; =20 - len =3D bitmap_scnprintf(mask->bits, mask->nbits, buf, MASK_SIZE); + len =3D bitmap_scnprintf(mask->bits, (unsigned int)mask->nbits, buf, MASK= _SIZE); buf[len] =3D '\0'; pr_debug("%p: %s mask[%zd]: %s\n", mask, tag, mask->nbits, buf); } @@ -165,7 +165,7 @@ static int perf_mmap__aio_mmap(struct mmap *map, struct= mmap_params *mp) pr_debug2("failed to allocate data buffer, error %m\n"); return -1; } - delta_max =3D sysconf(_SC_AIO_PRIO_DELTA_MAX); + delta_max =3D (int)sysconf(_SC_AIO_PRIO_DELTA_MAX); for (i =3D 0; i < map->aio.nr_cblocks; ++i) { ret =3D perf_mmap__aio_alloc(map, i); if (ret =3D=3D -1) { @@ -261,7 +261,7 @@ static void build_node_mask(int node, struct mmap_cpu_m= ask *mask) static int perf_mmap__setup_affinity_mask(struct mmap *map, struct mmap_pa= rams *mp) { map->affinity_mask.nbits =3D cpu__max_cpu().cpu; - map->affinity_mask.bits =3D bitmap_zalloc(map->affinity_mask.nbits); + map->affinity_mask.bits =3D bitmap_zalloc((int)map->affinity_mask.nbits); if (!map->affinity_mask.bits) return -1; =20 --=20 2.49.0.906.g1f30a19c02-goog