From nobody Fri Dec 19 17:26:43 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 D298827E7C8 for ; Wed, 30 Apr 2025 17:51:22 +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=1746035487; cv=none; b=PK1yc3mw1Wh33uL0lmnb5Ro7q1GPCPcDtnkriZBFoIDHTs46/SgiOpy9nFSdDEP0WQIj8DrmPtGo39mLckzbP+WPMSnOJ5p9WhDgV12cRVyXxcFwisHLsAekLL4dKJ5GkblqpdGw//yEvV+dWDSHhNBT3sJ4zGP7iWG84b3Me1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746035487; c=relaxed/simple; bh=55gkw5+Dsv4uJLFOfWyKp+xidNOP8KgohK3fMQWaGPM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ELQ9LhxmD8VkDJHnWtwRcAVMlKoxDJXQcTwRocx0/GKNVaKVgFndrivTRva9VTGt5N+1YEYYVv3gdkA8HHTEIAi1WwtRHzOvp8ZsjCTIV6pHsoJPlfOUGKB9bfGOuSnNKimrfV6sKllzpxIXkse6saLUcagjZfWPHNR+XvJBOGQ= 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=wl6CNRQQ; 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="wl6CNRQQ" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-30364fc706fso150301a91.3 for ; Wed, 30 Apr 2025 10:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746035482; x=1746640282; 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=N7DRnZ7ucT5mm71KrCK4qE8zl4cFsuSVaVpRJmbMj9s=; b=wl6CNRQQgOH6R41ANzRT9q5OTQy11JUfQyshHST+TCCE6YQvFQtqZiGHAM5+g5wcbw Im8Fdapu6UXxTWpdnw0ipOclFtsNiKNafaP2THpWRtT8GK+HDpBwlD+1OL3Z/D5Er5Qn VDFFrSeEhdA3rUN5UPZRi/9j3l0yYRIWCIM95Xq/4uCJiDsXN+9/XBviE8ZDsOHgyhhw ulVs4QqkE2d+IrzKyRIrUbNhaLwisNFAlpu/T+4rARaD7BVaKFE6q0DQEDZZsIw3KqG8 qI3fBJWPg1mHj832dBYrWbofu6TCS7CHpOQBg0wVCl2jY1YXIIfFekrp4Zr5cyuBd0Fp Ewyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746035482; x=1746640282; 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=N7DRnZ7ucT5mm71KrCK4qE8zl4cFsuSVaVpRJmbMj9s=; b=hJhldpfq8bTIBX3J0b34V+8Cho/FIC0Tk9mcIMlVJ/nOw54SKuXEl9oziFv4s8Vtv0 GMyMIQXBb89iJM4l9/LdJjvQO9LNyCu404TOblP2KD2LOgcNJAXGmQyVRMJXCGCPu+1v j4GVWBGpSTDESOzqX/I7AYQjRwCArTTP0w7xU6s8pEbbvVanIagLtc9bwNBlJ/Kaiyy6 dZyvvjQ7eH4fPx0yheeprBhm+H1Ph8EK07USHMZTFyXbM4IF6pVGCJ8Js9SmOJv4dDUn iEIj1w5Iv+29uUupQfcEaHfJ5allgTjMHIf0LjbfZ2DdomGHOeaNOS+b4rFL4ArzphU0 D69Q== X-Forwarded-Encrypted: i=1; AJvYcCWvxFdaCkUclpuJ8pnrsl1Mssw/AGi+voJiYIQ7SzS9pGgfKLkCTG7BGnqi1X55vUEfCuKrpeB/4j5ENXo=@vger.kernel.org X-Gm-Message-State: AOJu0YwnN2r8MhyjrAglXxgwV0DzlJ1FpJWmVAtYFDdWR+j4rFd/te4U g/CPrG23ilQMSirE1EoEwKHSu1s5XHJazv4AUBxPTKVtlcDLJiE7hvKR62sbbD7PAB8TU5whn0W lCDr0Zg== X-Google-Smtp-Source: AGHT+IGXihYm6lca80vTJFrz4yZuh8FisQJJvSYc8WbMH1oituST9svv5MBYSGZ/XaSJKJ1RLG3e63vc/Aro X-Received: from pjd16.prod.google.com ([2002:a17:90b:54d0:b0:2f9:e05f:187f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3cc6:b0:2ff:5e4e:861 with SMTP id 98e67ed59e1d1-30a33356142mr6097441a91.24.1746035481976; Wed, 30 Apr 2025 10:51:21 -0700 (PDT) Date: Wed, 30 Apr 2025 10:50:00 -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-13-irogers@google.com> Subject: [PATCH v2 12/47] perf trace: 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-trace.c | 98 ++++++++++--------- tools/perf/trace/beauty/arch_prctl.c | 2 +- tools/perf/trace/beauty/eventfd.c | 2 +- tools/perf/trace/beauty/fcntl.c | 5 +- tools/perf/trace/beauty/flock.c | 2 +- tools/perf/trace/beauty/fs_at_flags.c | 4 +- tools/perf/trace/beauty/futex_op.c | 2 +- tools/perf/trace/beauty/futex_val3.c | 2 +- tools/perf/trace/beauty/ioctl.c | 2 +- tools/perf/trace/beauty/kcmp.c | 8 +- tools/perf/trace/beauty/mmap.c | 2 +- tools/perf/trace/beauty/mode_t.c | 2 +- tools/perf/trace/beauty/msg_flags.c | 2 +- tools/perf/trace/beauty/open_flags.c | 2 +- tools/perf/trace/beauty/perf_event_open.c | 4 +- tools/perf/trace/beauty/pid.c | 2 +- tools/perf/trace/beauty/pkey_alloc.c | 2 +- tools/perf/trace/beauty/prctl.c | 10 +- tools/perf/trace/beauty/sched_policy.c | 2 +- tools/perf/trace/beauty/seccomp.c | 4 +- tools/perf/trace/beauty/signum.c | 2 +- tools/perf/trace/beauty/socket.c | 6 +- tools/perf/trace/beauty/socket_type.c | 2 +- tools/perf/trace/beauty/statx.c | 2 +- .../beauty/tracepoints/x86_irq_vectors.c | 3 +- tools/perf/trace/beauty/tracepoints/x86_msr.c | 3 +- tools/perf/trace/beauty/waitid_options.c | 2 +- 27 files changed, 94 insertions(+), 85 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 809b4d5b0a8a..5da84d4eba7c 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -549,7 +549,7 @@ static struct evsel *perf_evsel__raw_syscall_newtp(cons= t char *direction, void * =20 size_t strarray__scnprintf_suffix(struct strarray *sa, char *bf, size_t si= ze, const char *intfmt, bool show_suffix, int val) { - int idx =3D val - sa->offset; + int idx =3D (int)(val - sa->offset); =20 if (idx < 0 || idx >=3D sa->nr_entries || sa->entries[idx] =3D=3D NULL) { size_t printed =3D scnprintf(bf, size, intfmt, val); @@ -563,7 +563,7 @@ size_t strarray__scnprintf_suffix(struct strarray *sa, = char *bf, size_t size, co =20 size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, con= st char *intfmt, bool show_prefix, int val) { - int idx =3D val - sa->offset; + int idx =3D (int)(val - sa->offset); =20 if (idx < 0 || idx >=3D sa->nr_entries || sa->entries[idx] =3D=3D NULL) { size_t printed =3D scnprintf(bf, size, intfmt, val); @@ -579,7 +579,8 @@ static size_t __syscall_arg__scnprintf_strarray(char *b= f, size_t size, const char *intfmt, struct syscall_arg *arg) { - return strarray__scnprintf(arg->parm, bf, size, intfmt, arg->show_string_= prefix, arg->val); + return strarray__scnprintf(arg->parm, bf, size, intfmt, arg->show_string_= prefix, + (int)arg->val); } =20 static size_t syscall_arg__scnprintf_strarray(char *bf, size_t size, @@ -617,7 +618,7 @@ size_t strarrays__scnprintf(struct strarrays *sas, char= *bf, size_t size, const =20 for (i =3D 0; i < sas->nr_entries; ++i) { struct strarray *sa =3D sas->entries[i]; - int idx =3D val - sa->offset; + int idx =3D (int)(val - sa->offset); =20 if (idx >=3D 0 && idx < sa->nr_entries) { if (sa->entries[idx] =3D=3D NULL) @@ -654,7 +655,7 @@ bool strarray__strtoul_flags(struct strarray *sa, char = *bf, size_t size, u64 *re *ret =3D 0; =20 while (size !=3D 0) { - int toklen =3D size; + size_t toklen =3D size; =20 sep =3D memchr(tok, '|', size); if (sep !=3D NULL) { @@ -703,7 +704,8 @@ bool strarrays__strtoul(struct strarrays *sas, char *bf= , size_t size, u64 *ret) size_t syscall_arg__scnprintf_strarrays(char *bf, size_t size, struct syscall_arg *arg) { - return strarrays__scnprintf(arg->parm, bf, size, "%d", arg->show_string_p= refix, arg->val); + return strarrays__scnprintf(arg->parm, bf, size, "%d", arg->show_string_p= refix, + (int)arg->val); } =20 #ifndef AT_FDCWD @@ -713,7 +715,7 @@ size_t syscall_arg__scnprintf_strarrays(char *bf, size_= t size, static size_t syscall_arg__scnprintf_fd_at(char *bf, size_t size, struct syscall_arg *arg) { - int fd =3D arg->val; + int fd =3D (int)arg->val; const char *prefix =3D "AT_FD"; =20 if (fd =3D=3D AT_FDCWD) @@ -855,7 +857,7 @@ static size_t syscall_arg__scnprintf_access_mode(char *= bf, size_t size, bool show_prefix =3D arg->show_string_prefix; const char *suffix =3D "_OK"; size_t printed =3D 0; - int mode =3D arg->val; + int mode =3D (int)arg->val; =20 if (mode =3D=3D F_OK) /* 0 */ return scnprintf(bf, size, "F%s", show_prefix ? suffix : ""); @@ -897,7 +899,7 @@ static size_t syscall_arg__scnprintf_pipe_flags(char *b= f, size_t size, { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "O_"; - int printed =3D 0, flags =3D arg->val; + int printed =3D 0, flags =3D (int)arg->val; =20 #define P_FLAG(n) \ if (flags & O_##n) { \ @@ -929,7 +931,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(ch= ar *bf, size_t size, { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "GRND_"; - int printed =3D 0, flags =3D arg->val; + int printed =3D 0, flags =3D (int)arg->val; =20 #define P_FLAG(n) \ if (flags & GRND_##n) { \ @@ -975,7 +977,7 @@ static bool syscall_arg__strtoul_btf_enum(char *bf, siz= e_t size, struct syscall_ =20 for (int i =3D 0; i < btf_vlen(bt); ++i, ++be) { const char *name =3D btf__name_by_offset(btf, be->name_off); - int max_len =3D max(size, strlen(name)); + size_t max_len =3D max(size, strlen(name)); =20 if (strncmp(name, bf, max_len) =3D=3D 0) { *val =3D be->val; @@ -1713,7 +1715,7 @@ static int thread__read_fd_path(struct thread *thread= , int fd) { char linkname[PATH_MAX], pathname[PATH_MAX]; struct stat st; - int ret; + ssize_t ret; =20 if (thread__pid(thread) =3D=3D thread__tid(thread)) { scnprintf(linkname, sizeof(linkname), @@ -1760,7 +1762,7 @@ static const char *thread__fd_path(struct thread *thr= ead, int fd, =20 size_t syscall_arg__scnprintf_fd(char *bf, size_t size, struct syscall_arg= *arg) { - int fd =3D arg->val; + int fd =3D (int)arg->val; size_t printed =3D scnprintf(bf, size, "%d", fd); const char *path =3D thread__fd_path(arg->thread, fd, arg->trace); =20 @@ -1790,7 +1792,7 @@ size_t pid__scnprintf_fd(struct trace *trace, pid_t p= id, int fd, char *bf, size_ static size_t syscall_arg__scnprintf_close_fd(char *bf, size_t size, struct syscall_arg *arg) { - int fd =3D arg->val; + int fd =3D (int)arg->val; size_t printed =3D syscall_arg__scnprintf_fd(bf, size, arg); struct thread_trace *ttrace =3D thread__priv(arg->thread); =20 @@ -2063,11 +2065,11 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt = *arg, struct tep_format_field bool *use_btf) { struct tep_format_field *last_field =3D NULL; - int len; =20 for (; field; field =3D field->next, ++arg) { - last_field =3D field; + size_t len; =20 + last_field =3D field; if (arg->scnprintf) continue; =20 @@ -2167,7 +2169,7 @@ static int syscall__read_info(struct syscall *sc, str= uct trace *trace) */ if (IS_ERR(sc->tp_format)) { sc->nonexistent =3D true; - err =3D PTR_ERR(sc->tp_format); + err =3D (int)PTR_ERR(sc->tp_format); sc->tp_format =3D NULL; return err; } @@ -2436,7 +2438,8 @@ static size_t syscall__scnprintf_args(struct syscall = *sc, char *bf, size_t size, =20 if (trace->force_btf || default_scnprintf =3D=3D NULL || default_scnpri= ntf =3D=3D SCA_PTR) { btf_printed =3D trace__btf_scnprintf(trace, &arg, bf + printed, - size - printed, val, field->type); + size - printed, (int)val, + field->type); if (btf_printed) { printed +=3D btf_printed; continue; @@ -2653,7 +2656,7 @@ static void thread__update_stats(struct thread *threa= d, struct thread_trace *ttr } =20 stats->errnos =3D new_errnos; - stats->max_errno =3D err; + stats->max_errno =3D (int)err; } =20 ++stats->errnos[err - 1]; @@ -2685,7 +2688,7 @@ static int trace__printf_interrupted_entry(struct tra= ce *trace) ttrace->entry_pending =3D false; ++trace->nr_events_printed; =20 - return printed; + return (int)printed; } =20 static int trace__fprintf_sample(struct trace *trace, struct evsel *evsel, @@ -2752,8 +2755,8 @@ static int trace__sys_enter(struct trace *trace, stru= ct evsel *evsel, void *args; int printed =3D 0; struct thread *thread; - int id =3D perf_evsel__sc_tp_uint(evsel, id, sample), err =3D -1; - int augmented_args_size =3D 0, e_machine; + int id =3D (int)perf_evsel__sc_tp_uint(evsel, id, sample); + int err =3D -1, augmented_args_size =3D 0, e_machine; void *augmented_args =3D NULL; struct syscall *sc; struct thread_trace *ttrace; @@ -2829,11 +2832,11 @@ static int trace__fprintf_sys_enter(struct trace *t= race, struct evsel *evsel, { struct thread_trace *ttrace; struct thread *thread; - int id =3D perf_evsel__sc_tp_uint(evsel, id, sample), err =3D -1; + int id =3D (int)perf_evsel__sc_tp_uint(evsel, id, sample); struct syscall *sc; char msg[1024]; void *args, *augmented_args =3D NULL; - int augmented_args_size, e_machine; + int err =3D -1, augmented_args_size, e_machine; size_t printed =3D 0; =20 =20 @@ -2905,7 +2908,8 @@ static int trace__sys_exit(struct trace *trace, struc= t evsel *evsel, u64 duration =3D 0; bool duration_calculated =3D false; struct thread *thread; - int id =3D perf_evsel__sc_tp_uint(evsel, id, sample), err =3D -1, callcha= in_ret =3D 0, printed =3D 0; + int id =3D (int)perf_evsel__sc_tp_uint(evsel, id, sample); + int err =3D -1, callchain_ret =3D 0, printed =3D 0; int alignment =3D trace->args_alignment, e_machine; struct syscall *sc; struct thread_trace *ttrace; @@ -2927,7 +2931,7 @@ static int trace__sys_exit(struct trace *trace, struc= t evsel *evsel, thread__update_stats(thread, ttrace, id, sample, ret, trace); =20 if (!trace->fd_path_disabled && sc->is_open && ret >=3D 0 && ttrace->file= name.pending_open) { - trace__set_fd_pathname(thread, ret, ttrace->filename.name); + trace__set_fd_pathname(thread, (int)ret, ttrace->filename.name); ttrace->filename.pending_open =3D false; ++trace->stats.vfs_getname; } @@ -2982,8 +2986,8 @@ static int trace__sys_exit(struct trace *trace, struc= t evsel *evsel, } else if (ret < 0) { errno_print: { char bf[STRERR_BUFSIZE]; - const char *emsg =3D str_error_r(-ret, bf, sizeof(bf)), - *e =3D errno_to_name(evsel, -ret); + const char *emsg =3D str_error_r((int)-ret, bf, sizeof(bf)); + const char *e =3D errno_to_name(evsel, (int)-ret); =20 fprintf(trace->output, "-1 %s (%s)", e, emsg); } @@ -3002,7 +3006,7 @@ errno_print: { } else if (sc->fmt->hexret) fprintf(trace->output, "%#lx", ret); else if (sc->fmt->errpid) { - struct thread *child =3D machine__find_thread(trace->host, ret, ret); + struct thread *child =3D machine__find_thread(trace->host, (int)ret, (in= t)ret); =20 if (child !=3D NULL) { fprintf(trace->output, "%ld", ret); @@ -3062,7 +3066,7 @@ static int trace__vfs_getname(struct trace *trace, st= ruct evsel *evsel, if (f =3D=3D NULL) goto out_put; =20 - ttrace->filename.namelen =3D filename_len; + ttrace->filename.namelen =3D (unsigned int)filename_len; ttrace->filename.name =3D f; } =20 @@ -3190,7 +3194,8 @@ static size_t trace__fprintf_tp_fields(struct trace *= trace, struct evsel *evsel, int offset =3D field->offset; =20 if (field->flags & TEP_FIELD_IS_DYNAMIC) { - offset =3D format_field__intval(field, sample, evsel->needs_swap); + offset =3D (int)format_field__intval(field, sample, + evsel->needs_swap); syscall_arg.len =3D offset >> 16; offset &=3D 0xffff; if (tep_field_is_relative(field->flags)) @@ -3215,7 +3220,8 @@ static size_t trace__fprintf_tp_fields(struct trace *= trace, struct evsel *evsel, if (trace->show_arg_names) printed +=3D scnprintf(bf + printed, size - printed, "%s: ", field->nam= e); =20 - btf_printed =3D trace__btf_scnprintf(trace, &syscall_arg, bf + printed, = size - printed, val, field->type); + btf_printed =3D trace__btf_scnprintf(trace, &syscall_arg, bf + printed, + size - printed, (int)val, field->type); if (btf_printed) { printed +=3D btf_printed; continue; @@ -3260,7 +3266,7 @@ static int trace__event_handler(struct trace *trace, = struct evsel *evsel, trace__fprintf_comm_tid(trace, thread, trace->output); =20 if (evsel =3D=3D trace->syscalls.events.bpf_output) { - int id =3D perf_evsel__sc_tp_uint(evsel, id, sample); + int id =3D (int)perf_evsel__sc_tp_uint(evsel, id, sample); int e_machine =3D thread ? thread__e_machine(thread, trace->host) : EM_H= OST; struct syscall *sc =3D trace__syscall_info(trace, evsel, e_machine, id); =20 @@ -4277,8 +4283,8 @@ static int trace__expand_filter(struct trace *trace, = struct evsel *evsel) =20 if (isalpha(*right)) { struct syscall_arg_fmt *fmt; - int left_size =3D tok - left, - right_size =3D right_end - right; + int left_size =3D (int)(tok - left); + int right_size =3D (int)(right_end - right); char arg[128], *type; =20 while (isspace(left[left_size - 1])) @@ -4308,7 +4314,7 @@ static int trace__expand_filter(struct trace *trace, = struct evsel *evsel) if (fmt->strtoul(right, right_size, &syscall_arg, &val)) { char *n, expansion[19]; int expansion_lenght =3D scnprintf(expansion, sizeof(expansion), "%#"= PRIx64, val); - int expansion_offset =3D right - new_filter; + int expansion_offset =3D (int)(right - new_filter); =20 pr_debug("%s", expansion); =20 @@ -4737,7 +4743,7 @@ static int trace__replay(struct trace *trace) =20 session =3D perf_session__new(&data, &trace->tool); if (IS_ERR(session)) - return PTR_ERR(session); + return (int)PTR_ERR(session); =20 if (trace->opts.target.pid) symbol_conf.pid_list_str =3D strdup(trace->opts.target.pid); @@ -4835,7 +4841,7 @@ static struct syscall_entry *syscall__sort_stats(stru= ct hashmap *syscall_stats) { struct syscall_entry *entry; struct hashmap_entry *pos; - unsigned bkt, i, nr; + size_t bkt, i, nr; =20 nr =3D syscall_stats->sz; entry =3D malloc(nr * sizeof(*entry)); @@ -4849,7 +4855,7 @@ static struct syscall_entry *syscall__sort_stats(stru= ct hashmap *syscall_stats) =20 entry[i].stats =3D ss; entry[i].msecs =3D (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC); - entry[i].syscall =3D pos->key; + entry[i].syscall =3D (int)pos->key; i++; } assert(i =3D=3D nr); @@ -5030,7 +5036,6 @@ static int trace__set_filter_pids_from_option(const s= truct option *opt, const ch int unset __maybe_unused) { int ret =3D -1; - size_t i; struct trace *trace =3D opt->value; /* * FIXME: introduce a intarray class, plain parse csv and create a @@ -5041,16 +5046,16 @@ static int trace__set_filter_pids_from_option(const= struct option *opt, const ch if (list =3D=3D NULL) return -1; =20 - i =3D trace->filter_pids.nr =3D intlist__nr_entries(list) + 1; - trace->filter_pids.entries =3D calloc(i, sizeof(pid_t)); + trace->filter_pids.nr =3D intlist__nr_entries(list) + 1; + trace->filter_pids.entries =3D calloc(trace->filter_pids.nr, sizeof(pid_t= )); =20 if (trace->filter_pids.entries =3D=3D NULL) goto out; =20 trace->filter_pids.entries[0] =3D getpid(); =20 - for (i =3D 1; i < trace->filter_pids.nr; ++i) - trace->filter_pids.entries[i] =3D intlist__entry(list, i - 1)->i; + for (unsigned int i =3D 1; i < trace->filter_pids.nr; ++i) + trace->filter_pids.entries[i] =3D (pid_t)intlist__entry(list, i - 1)->i; =20 intlist__delete(list); ret =3D 0; @@ -5186,7 +5191,8 @@ static int trace__parse_events_option(const struct op= tion *opt, const char *str, struct trace *trace =3D (struct trace *)opt->value; const char *s =3D str; char *sep =3D NULL, *lists[2] =3D { NULL, NULL, }; - int len =3D strlen(str) + 1, err =3D -1, list, idx; + size_t len =3D strlen(str) + 1; + int err =3D -1, list, idx; char *strace_groups_dir =3D system_path(STRACE_GROUPS_DIR); char group_name[PATH_MAX]; const struct syscall_fmt *fmt; @@ -5653,7 +5659,7 @@ int cmd_trace(int argc, const char **argv) =20 if (callchain_param.enabled) { if (!mmap_pages_user_set && geteuid() =3D=3D 0) - trace.opts.mmap_pages =3D perf_event_mlock_kb_in_pages() * 4; + trace.opts.mmap_pages =3D (unsigned int)perf_event_mlock_kb_in_pages() = * 4; =20 symbol_conf.use_callchain =3D true; } diff --git a/tools/perf/trace/beauty/arch_prctl.c b/tools/perf/trace/beauty= /arch_prctl.c index a211348d3204..c8193e04831d 100644 --- a/tools/perf/trace/beauty/arch_prctl.c +++ b/tools/perf/trace/beauty/arch_prctl.c @@ -29,7 +29,7 @@ static size_t x86_arch_prctl__scnprintf_code(int option, = char *bf, size_t size, =20 size_t syscall_arg__scnprintf_x86_arch_prctl_code(char *bf, size_t size, s= truct syscall_arg *arg) { - unsigned long code =3D arg->val; + int code =3D (int)arg->val; =20 return x86_arch_prctl__scnprintf_code(code, bf, size, arg->show_string_pr= efix); } diff --git a/tools/perf/trace/beauty/eventfd.c b/tools/perf/trace/beauty/ev= entfd.c index 4bab106213c6..38d9e6585375 100644 --- a/tools/perf/trace/beauty/eventfd.c +++ b/tools/perf/trace/beauty/eventfd.c @@ -15,7 +15,7 @@ static size_t syscall_arg__scnprintf_eventfd_flags(char *= bf, size_t size, struct { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "EFD_"; - int printed =3D 0, flags =3D arg->val; + int printed =3D 0, flags =3D (int)arg->val; =20 if (flags =3D=3D 0) return scnprintf(bf, size, "NONE"); diff --git a/tools/perf/trace/beauty/fcntl.c b/tools/perf/trace/beauty/fcnt= l.c index d075904dccce..6fbeeb1fcf82 100644 --- a/tools/perf/trace/beauty/fcntl.c +++ b/tools/perf/trace/beauty/fcntl.c @@ -25,7 +25,8 @@ static size_t fcntl__scnprintf_getlease(unsigned long val= , char *bf, size_t size static const char *fcntl_setlease[] =3D { "RDLCK", "WRLCK", "UNLCK", }; static DEFINE_STRARRAY(fcntl_setlease, "F_"); =20 - return strarray__scnprintf(&strarray__fcntl_setlease, bf, size, "%x", sho= w_prefix, val); + return strarray__scnprintf(&strarray__fcntl_setlease, bf, size, "%x", sho= w_prefix, + (int)val); } =20 static size_t syscall_arg__scnprintf_fcntl_getlease(char *bf, size_t size,= struct syscall_arg *arg) @@ -70,7 +71,7 @@ size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t = size, struct syscall_ar size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct sysc= all_arg *arg) { bool show_prefix =3D arg->show_string_prefix; - int cmd =3D syscall_arg__val(arg, 1); + size_t cmd =3D syscall_arg__val(arg, 1); =20 if (cmd =3D=3D F_DUPFD) return syscall_arg__scnprintf_fd(bf, size, arg); diff --git a/tools/perf/trace/beauty/flock.c b/tools/perf/trace/beauty/floc= k.c index a6514a6f07cf..ace7309ee1fc 100644 --- a/tools/perf/trace/beauty/flock.c +++ b/tools/perf/trace/beauty/flock.c @@ -24,7 +24,7 @@ size_t syscall_arg__scnprintf_flock(char *bf, size_t size= , struct syscall_arg *a { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "LOCK_"; - int printed =3D 0, op =3D arg->val; + int printed =3D 0, op =3D (int)arg->val; =20 if (op =3D=3D 0) return scnprintf(bf, size, "NONE"); diff --git a/tools/perf/trace/beauty/fs_at_flags.c b/tools/perf/trace/beaut= y/fs_at_flags.c index c200669cb944..f9ab43300171 100644 --- a/tools/perf/trace/beauty/fs_at_flags.c +++ b/tools/perf/trace/beauty/fs_at_flags.c @@ -29,7 +29,7 @@ static size_t fs_at__scnprintf_flags(unsigned long flags,= char *bf, size_t size, size_t syscall_arg__scnprintf_fs_at_flags(char *bf, size_t size, struct sy= scall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; - int flags =3D arg->val; + int flags =3D (int)arg->val; =20 return fs_at__scnprintf_flags(flags, bf, size, show_prefix); } @@ -52,7 +52,7 @@ static size_t faccessat2__scnprintf_flags(unsigned long f= lags, char *bf, size_t size_t syscall_arg__scnprintf_faccessat2_flags(char *bf, size_t size, stru= ct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; - int flags =3D arg->val; + int flags =3D (int)arg->val; =20 return faccessat2__scnprintf_flags(flags, bf, size, show_prefix); } diff --git a/tools/perf/trace/beauty/futex_op.c b/tools/perf/trace/beauty/f= utex_op.c index 00365156782b..8c1741aab9be 100644 --- a/tools/perf/trace/beauty/futex_op.c +++ b/tools/perf/trace/beauty/futex_op.c @@ -29,7 +29,7 @@ static size_t syscall_arg__scnprintf_futex_op(char *bf, s= ize_t size, struct sysc SCF_UADDR2 =3D (1 << 4), SCF_VAL3 =3D (1 << 5), }; - int op =3D arg->val; + int op =3D (int)arg->val; int cmd =3D op & FUTEX_CMD_MASK; size_t printed =3D 0; =20 diff --git a/tools/perf/trace/beauty/futex_val3.c b/tools/perf/trace/beauty= /futex_val3.c index 9114f7620571..6f02e8d5961d 100644 --- a/tools/perf/trace/beauty/futex_val3.c +++ b/tools/perf/trace/beauty/futex_val3.c @@ -8,7 +8,7 @@ static size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, str= uct syscall_arg *arg) { const char *prefix =3D "FUTEX_BITSET_"; - unsigned int bitset =3D arg->val; + unsigned int bitset =3D (unsigned int)arg->val; =20 if (bitset =3D=3D FUTEX_BITSET_MATCH_ANY) return scnprintf(bf, size, "%s%s", arg->show_string_prefix ? prefix : ""= , "MATCH_ANY"); diff --git a/tools/perf/trace/beauty/ioctl.c b/tools/perf/trace/beauty/ioct= l.c index e19eb6ea361d..abb959be372d 100644 --- a/tools/perf/trace/beauty/ioctl.c +++ b/tools/perf/trace/beauty/ioctl.c @@ -175,7 +175,7 @@ static size_t ioctl__scnprintf_cmd(unsigned long cmd, c= har *bf, size_t size, boo size_t syscall_arg__scnprintf_ioctl_cmd(char *bf, size_t size, struct sysc= all_arg *arg) { unsigned long cmd =3D arg->val; - int fd =3D syscall_arg__val(arg, 0); + int fd =3D (int)syscall_arg__val(arg, 0); struct file *file =3D thread__files_entry(arg->thread, fd); =20 if (file !=3D NULL) { diff --git a/tools/perf/trace/beauty/kcmp.c b/tools/perf/trace/beauty/kcmp.c index 9351f84390a1..bc81eaef4944 100644 --- a/tools/perf/trace/beauty/kcmp.c +++ b/tools/perf/trace/beauty/kcmp.c @@ -15,14 +15,14 @@ =20 size_t syscall_arg__scnprintf_kcmp_idx(char *bf, size_t size, struct sysca= ll_arg *arg) { - unsigned long fd =3D arg->val; - int type =3D syscall_arg__val(arg, 2); + int fd =3D (int)arg->val; + int type =3D (int)syscall_arg__val(arg, 2); pid_t pid; =20 if (type !=3D KCMP_FILE) return syscall_arg__scnprintf_long(bf, size, arg); =20 - pid =3D syscall_arg__val(arg, arg->idx =3D=3D 3 ? 0 : 1); /* idx1 -> pid1= , idx2 -> pid2 */ + pid =3D (pid_t)syscall_arg__val(arg, arg->idx =3D=3D 3 ? 0 : 1); /* idx1 = -> pid1, idx2 -> pid2 */ return pid__scnprintf_fd(arg->trace, pid, fd, bf, size); } =20 @@ -34,7 +34,7 @@ static size_t kcmp__scnprintf_type(int type, char *bf, si= ze_t size, bool show_pr =20 size_t syscall_arg__scnprintf_kcmp_type(char *bf, size_t size, struct sysc= all_arg *arg) { - unsigned long type =3D arg->val; + int type =3D (int)arg->val; =20 if (type !=3D KCMP_FILE) arg->mask |=3D (1 << 3) | (1 << 4); /* Ignore idx1 and idx2 */ diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index 3c5e97b93dd5..b3136b7b31ac 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c @@ -76,7 +76,7 @@ static size_t madvise__scnprintf_behavior(int behavior, c= har *bf, size_t size) static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t siz= e, struct syscall_arg *arg) { - return madvise__scnprintf_behavior(arg->val, bf, size); + return madvise__scnprintf_behavior((int)arg->val, bf, size); } =20 #define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior diff --git a/tools/perf/trace/beauty/mode_t.c b/tools/perf/trace/beauty/mod= e_t.c index 29a8fadfb7f9..802f856c7bd1 100644 --- a/tools/perf/trace/beauty/mode_t.c +++ b/tools/perf/trace/beauty/mode_t.c @@ -24,7 +24,7 @@ static size_t syscall_arg__scnprintf_mode_t(char *bf, siz= e_t size, struct syscal { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "S_"; - int printed =3D 0, mode =3D arg->val; + int printed =3D 0, mode =3D (int)arg->val; =20 #define P_MODE(n) \ if ((mode & S_##n) =3D=3D S_##n) { \ diff --git a/tools/perf/trace/beauty/msg_flags.c b/tools/perf/trace/beauty/= msg_flags.c index 2da581ff0c80..2fd0ddcd7f88 100644 --- a/tools/perf/trace/beauty/msg_flags.c +++ b/tools/perf/trace/beauty/msg_flags.c @@ -32,7 +32,7 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, = size_t size, { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "MSG_"; - int printed =3D 0, flags =3D arg->val; + int printed =3D 0, flags =3D (int)arg->val; =20 if (flags =3D=3D 0) return scnprintf(bf, size, "NONE"); diff --git a/tools/perf/trace/beauty/open_flags.c b/tools/perf/trace/beauty= /open_flags.c index 78f6566ef110..17ceb0f1b36a 100644 --- a/tools/perf/trace/beauty/open_flags.c +++ b/tools/perf/trace/beauty/open_flags.c @@ -79,7 +79,7 @@ size_t open__scnprintf_flags(unsigned long flags, char *b= f, size_t size, bool sh =20 size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size, struct sys= call_arg *arg) { - int flags =3D arg->val; + int flags =3D (int)arg->val; =20 if (!(flags & O_CREAT)) arg->mask |=3D 1 << (arg->idx + 1); /* Mask the mode parm */ diff --git a/tools/perf/trace/beauty/perf_event_open.c b/tools/perf/trace/b= eauty/perf_event_open.c index 9f1ed989c775..d62c9d0261ad 100644 --- a/tools/perf/trace/beauty/perf_event_open.c +++ b/tools/perf/trace/beauty/perf_event_open.c @@ -20,7 +20,7 @@ static size_t syscall_arg__scnprintf_perf_flags(char *bf,= size_t size, { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "PERF_"; - int printed =3D 0, flags =3D arg->val; + int printed =3D 0, flags =3D (int)arg->val; =20 if (flags =3D=3D 0) return 0; @@ -58,7 +58,7 @@ static int attr__fprintf(FILE *fp __maybe_unused, const c= har *name, const char * =20 args->first =3D false; args->printed +=3D printed; - return printed; + return (int)printed; } =20 static size_t perf_event_attr___scnprintf(struct perf_event_attr *attr, ch= ar *bf, size_t size, bool show_zeros __maybe_unused) diff --git a/tools/perf/trace/beauty/pid.c b/tools/perf/trace/beauty/pid.c index 8f9c9950f8ba..609a582e0221 100644 --- a/tools/perf/trace/beauty/pid.c +++ b/tools/perf/trace/beauty/pid.c @@ -2,7 +2,7 @@ =20 size_t syscall_arg__scnprintf_pid(char *bf, size_t size, struct syscall_ar= g *arg) { - int pid =3D arg->val; + int pid =3D (int)arg->val; struct trace *trace =3D arg->trace; size_t printed =3D scnprintf(bf, size, "%d", pid); struct thread *thread =3D machine__findnew_thread(trace->host, pid, pid); diff --git a/tools/perf/trace/beauty/pkey_alloc.c b/tools/perf/trace/beauty= /pkey_alloc.c index f9596ed02cc4..c597a0f26a3d 100644 --- a/tools/perf/trace/beauty/pkey_alloc.c +++ b/tools/perf/trace/beauty/pkey_alloc.c @@ -48,7 +48,7 @@ static size_t pkey_alloc__scnprintf_access_rights(int acc= ess_rights, char *bf, s =20 size_t syscall_arg__scnprintf_pkey_alloc_access_rights(char *bf, size_t si= ze, struct syscall_arg *arg) { - unsigned long cmd =3D arg->val; + int cmd =3D (int)arg->val; =20 return pkey_alloc__scnprintf_access_rights(cmd, bf, size, arg->show_strin= g_prefix); } diff --git a/tools/perf/trace/beauty/prctl.c b/tools/perf/trace/beauty/prct= l.c index 7d1aa9fd03da..7768a72134a3 100644 --- a/tools/perf/trace/beauty/prctl.c +++ b/tools/perf/trace/beauty/prctl.c @@ -26,10 +26,10 @@ static size_t prctl__scnprintf_set_mm(int option, char = *bf, size_t size, bool sh =20 size_t syscall_arg__scnprintf_prctl_arg2(char *bf, size_t size, struct sys= call_arg *arg) { - int option =3D syscall_arg__val(arg, 0); + int option =3D (int)syscall_arg__val(arg, 0); =20 if (option =3D=3D PR_SET_MM) - return prctl__scnprintf_set_mm(arg->val, bf, size, arg->show_string_pref= ix); + return prctl__scnprintf_set_mm((int)arg->val, bf, size, arg->show_string= _prefix); /* * We still don't grab the contents of pointers on entry or exit, * so just print them as hex numbers @@ -42,7 +42,7 @@ size_t syscall_arg__scnprintf_prctl_arg2(char *bf, size_t= size, struct syscall_a =20 size_t syscall_arg__scnprintf_prctl_arg3(char *bf, size_t size, struct sys= call_arg *arg) { - int option =3D syscall_arg__val(arg, 0); + int option =3D (int)syscall_arg__val(arg, 0); =20 if (option =3D=3D PR_SET_MM) return syscall_arg__scnprintf_hex(bf, size, arg); @@ -52,7 +52,7 @@ size_t syscall_arg__scnprintf_prctl_arg3(char *bf, size_t= size, struct syscall_a =20 size_t syscall_arg__scnprintf_prctl_option(char *bf, size_t size, struct s= yscall_arg *arg) { - unsigned long option =3D arg->val; + int option =3D (int)arg->val; enum { SPO_ARG2 =3D (1 << 1), SPO_ARG3 =3D (1 << 2), @@ -75,7 +75,7 @@ size_t syscall_arg__scnprintf_prctl_option(char *bf, size= _t size, struct syscall [PR_SET_PDEATHSIG] =3D all_but2, }; =20 - if (option < ARRAY_SIZE(masks)) + if (option < (int)ARRAY_SIZE(masks)) arg->mask |=3D masks[option]; =20 return prctl__scnprintf_option(option, bf, size, arg->show_string_prefix); diff --git a/tools/perf/trace/beauty/sched_policy.c b/tools/perf/trace/beau= ty/sched_policy.c index 68aa59eeed8d..69dad444fa41 100644 --- a/tools/perf/trace/beauty/sched_policy.c +++ b/tools/perf/trace/beauty/sched_policy.c @@ -23,7 +23,7 @@ static size_t syscall_arg__scnprintf_sched_policy(char *b= f, size_t size, "NORMAL", "FIFO", "RR", "BATCH", "ISO", "IDLE", "DEADLINE", }; size_t printed; - int policy =3D arg->val, + int policy =3D (int)arg->val, flags =3D policy & ~SCHED_POLICY_MASK; =20 policy &=3D SCHED_POLICY_MASK; diff --git a/tools/perf/trace/beauty/seccomp.c b/tools/perf/trace/beauty/se= ccomp.c index 637722e2796b..42c213a9eb88 100644 --- a/tools/perf/trace/beauty/seccomp.c +++ b/tools/perf/trace/beauty/seccomp.c @@ -10,7 +10,7 @@ static size_t syscall_arg__scnprintf_seccomp_op(char *bf,= size_t size, struct sy { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SECCOMP_SET_MODE_"; - int op =3D arg->val; + int op =3D (int)arg->val; size_t printed =3D 0; =20 switch (op) { @@ -35,7 +35,7 @@ static size_t syscall_arg__scnprintf_seccomp_flags(char *= bf, size_t size, { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SECCOMP_FILTER_FLAG_"; - int printed =3D 0, flags =3D arg->val; + int printed =3D 0, flags =3D (int)arg->val; =20 #define P_FLAG(n) \ if (flags & SECCOMP_FILTER_FLAG_##n) { \ diff --git a/tools/perf/trace/beauty/signum.c b/tools/perf/trace/beauty/sig= num.c index 21220c56500a..a78bceeaa23e 100644 --- a/tools/perf/trace/beauty/signum.c +++ b/tools/perf/trace/beauty/signum.c @@ -5,7 +5,7 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_= t size, struct syscal { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SIG"; - int sig =3D arg->val; + int sig =3D (int)arg->val; =20 switch (sig) { #define P_SIGNUM(n) case SIG##n: return scnprintf(bf, size, "%s%s", show_p= refix ? prefix : "", #n) diff --git a/tools/perf/trace/beauty/socket.c b/tools/perf/trace/beauty/soc= ket.c index b0870c7b48e5..07a0bfa164d1 100644 --- a/tools/perf/trace/beauty/socket.c +++ b/tools/perf/trace/beauty/socket.c @@ -20,10 +20,10 @@ static size_t socket__scnprintf_ipproto(int protocol, c= har *bf, size_t size, boo =20 size_t syscall_arg__scnprintf_socket_protocol(char *bf, size_t size, struc= t syscall_arg *arg) { - int domain =3D syscall_arg__val(arg, 0); + int domain =3D (int)syscall_arg__val(arg, 0); =20 if (domain =3D=3D AF_INET || domain =3D=3D AF_INET6) - return socket__scnprintf_ipproto(arg->val, bf, size, arg->show_string_pr= efix); + return socket__scnprintf_ipproto((int)arg->val, bf, size, arg->show_stri= ng_prefix); =20 return syscall_arg__scnprintf_int(bf, size, arg); } @@ -43,5 +43,5 @@ static size_t socket__scnprintf_level(int level, char *bf= , size_t size, bool sho =20 size_t syscall_arg__scnprintf_socket_level(char *bf, size_t size, struct s= yscall_arg *arg) { - return socket__scnprintf_level(arg->val, bf, size, arg->show_string_prefi= x); + return socket__scnprintf_level((int)arg->val, bf, size, arg->show_string_= prefix); } diff --git a/tools/perf/trace/beauty/socket_type.c b/tools/perf/trace/beaut= y/socket_type.c index bed8d5761ca8..2c7e3801ba34 100644 --- a/tools/perf/trace/beauty/socket_type.c +++ b/tools/perf/trace/beauty/socket_type.c @@ -23,7 +23,7 @@ static size_t syscall_arg__scnprintf_socket_type(char *bf= , size_t size, struct s bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SOCK_"; size_t printed; - int type =3D arg->val, + int type =3D (int)arg->val, flags =3D type & ~SOCK_TYPE_MASK; =20 type &=3D SOCK_TYPE_MASK; diff --git a/tools/perf/trace/beauty/statx.c b/tools/perf/trace/beauty/stat= x.c index 24843e614b93..de47bc0c03e5 100644 --- a/tools/perf/trace/beauty/statx.c +++ b/tools/perf/trace/beauty/statx.c @@ -19,7 +19,7 @@ static size_t statx__scnprintf_mask(unsigned long mask, c= har *bf, size_t size, b size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct sys= call_arg *arg) { bool show_prefix =3D arg->show_string_prefix; - int mask =3D arg->val; + int mask =3D (int)arg->val; =20 return statx__scnprintf_mask(mask, bf, size, show_prefix); } diff --git a/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c b/tools/= perf/trace/beauty/tracepoints/x86_irq_vectors.c index 8eb9bc8534ac..6430d1084dc1 100644 --- a/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c +++ b/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c @@ -13,7 +13,8 @@ static DEFINE_STRARRAY(x86_irq_vectors, "_VECTOR"); =20 static size_t x86_irq_vectors__scnprintf(unsigned long vector, char *bf, s= ize_t size, bool show_prefix) { - return strarray__scnprintf_suffix(&strarray__x86_irq_vectors, bf, size, "= %#x", show_prefix, vector); + return strarray__scnprintf_suffix(&strarray__x86_irq_vectors, bf, size, "= %#x", show_prefix, + (int)vector); } =20 size_t syscall_arg__scnprintf_x86_irq_vectors(char *bf, size_t size, struc= t syscall_arg *arg) diff --git a/tools/perf/trace/beauty/tracepoints/x86_msr.c b/tools/perf/tra= ce/beauty/tracepoints/x86_msr.c index 6b8f129579d6..2be91be1af05 100644 --- a/tools/perf/trace/beauty/tracepoints/x86_msr.c +++ b/tools/perf/trace/beauty/tracepoints/x86_msr.c @@ -23,7 +23,8 @@ static DEFINE_STRARRAYS(x86_MSRs_tables); =20 static size_t x86_MSR__scnprintf(unsigned long msr, char *bf, size_t size,= bool show_prefix) { - return strarrays__scnprintf(&strarrays__x86_MSRs_tables, bf, size, "%#x",= show_prefix, msr); + return strarrays__scnprintf(&strarrays__x86_MSRs_tables, bf, size, "%#x",= show_prefix, + (int)msr); } =20 size_t syscall_arg__scnprintf_x86_MSR(char *bf, size_t size, struct syscal= l_arg *arg) diff --git a/tools/perf/trace/beauty/waitid_options.c b/tools/perf/trace/be= auty/waitid_options.c index d4d10b33ba0e..2a920a0f41d0 100644 --- a/tools/perf/trace/beauty/waitid_options.c +++ b/tools/perf/trace/beauty/waitid_options.c @@ -7,7 +7,7 @@ static size_t syscall_arg__scnprintf_waitid_options(char *b= f, size_t size, { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "W"; - int printed =3D 0, options =3D arg->val; + int printed =3D 0, options =3D (int)arg->val; =20 #define P_OPTION(n) \ if (options & W##n) { \ --=20 2.49.0.906.g1f30a19c02-goog