From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f74.google.com (mail-ot1-f74.google.com [209.85.210.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 D0F5C224B1A for ; Tue, 1 Apr 2025 18:25:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531950; cv=none; b=ISuC73B8yJDN9Bf4XR2fPrsXPyTrIxGMA/Rr15q9ERLQJ+MosQ/DJrci+r4cYQ7Tq90tTz7/VH32XL8EVrp1qyaftYI4Gu+GoBeBL/YT3eF4EenQ348rdhNn9vjsvPk1imPH4aC11rGC1yyfyT20YEqfNO2uICzSVK7VEN4+CAU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531950; c=relaxed/simple; bh=MBDOAj0hPKHpQkoNjahydiN73L9NoaCbnaJXUshhGm0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=R8PNuUcuFTm2S6mj8VZCnR6zDdnG4Pxs3StdvfjbG/QXbB+qIGa+ru4p7kyOXuqznWunvxIF89IeciNiCelyPg/K7/TSp2BIj42OgbfJ1tavzKcRJx0OqxMGF9K9q2qEjjYEufwNCIhZ6jTMZl1QzsYnxyNpNlTsTOaGJx448PE= 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=VwMQQoLO; arc=none smtp.client-ip=209.85.210.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="VwMQQoLO" Received: by mail-ot1-f74.google.com with SMTP id 46e09a7af769-72a14efc924so4666260a34.2 for ; Tue, 01 Apr 2025 11:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531947; x=1744136747; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=3UTRp4Jp4MSvHARTmLwq2lUMY2ZfT8GOaVYNdpU6sCg=; b=VwMQQoLOCiK34fXTO48lRQp1juvyeRbOL6g3Y3c8gvO4pWgWf23MwRbMXtn8kmSafT dUIsYj97rpePpTKuP6RWRSTjcJ/MQb3kY0ChFrllqq04WzrHe4E54l7+LxZatHfAMgLs JxO1uWSFgv3MvjvNFNPXs9kT4HsS8mZAjpoFGaHjtJRTIjeYB6eCu1pSU92oyu5oZJnW XeJmR8KPruKHoldfVhKz/ZAz2BzSa19TLvQg7MioeG4OKe76p+z8TuTZlrTlIdHlXgkc rkL7s0cEq60gBv+mIvxLptCDQjbgNXxH3tjeELOkSk4LcN/Y2AcFE9B2nzuQhyrCv+gO VfDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531947; x=1744136747; 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=3UTRp4Jp4MSvHARTmLwq2lUMY2ZfT8GOaVYNdpU6sCg=; b=JdkIZMpIpwA26cBl1a0I3ezweGBN+K9gQ00Vo/8kS2QM2+vu1XUziyN5D1d4+hmrgS 7qHgiGlHMPF+dBX8kfV8auizeLBrNIqjFoJRnT2PvUK3jZ4LlTEhh0skjnldE9uvbTDG g/RAD5VxIyvLzOOiVJoWtWnN2M/bsU/rKZSsdH9QeDuy3IR7/nF7874AjDPAxeZyv7pg KRf54IVG1SL0bmHXlq95ha7Cmvp+PUayv8E31AXmo0EQq53NxwPKfVGNEKKp8WrFCmHp UxlWcPXidF4L2Tq5TWyuAbFDXm5ObZI0oBHF0EgLUqHWn0yAQpgzWbOfy7RR12Hfz7b+ +Nbw== X-Forwarded-Encrypted: i=1; AJvYcCULY/HWzJZ4HnvFVcXC2sgyz0pvFNGCf5Y5aVwHEYUNJfyNpDZis/TCFb+n2JNz29/XGE7H5yorKmfZGPrqea/v@vger.kernel.org X-Gm-Message-State: AOJu0YzNZ0Y20hK01PPGfYqGr6wFi9A4pQAz9A02P/a5kHvgCDRUG/cp Pj4GwA6nb4V9OaQKWJ0PCM50IaQBUjWewwVUMzQ9eZM7on4A4V5wgEAHrSknkvScArG7kkcVQwy 3a4/Z+A== X-Google-Smtp-Source: AGHT+IEsrz/KaBMv5972/PnVFS75LSjTuIhiZlIKgw8UI1qwxDb1rR4a1EvTReYHhxsnFHQO/ofbC87XKrhm X-Received: from oabfr13.prod.google.com ([2002:a05:6870:f80d:b0:2c2:5d77:108f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6830:698a:b0:72b:946e:ccc7 with SMTP id 46e09a7af769-72c6366fefdmr8680020a34.0.1743531946761; Tue, 01 Apr 2025 11:25:46 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:33 -0700 In-Reply-To: <20250401182347.3422199-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org 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-36-irogers@google.com> Subject: [PATCH v1 35/48] perf ftrace: 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-ftrace.c | 17 +++++++++++------ tools/perf/util/bpf_ftrace.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 7caa18d5ffc3..1484d798de40 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -182,7 +182,8 @@ static int read_tracing_file_to_stdout(const char *name) /* read contents to stdout */ while (true) { - int n = read(fd, buf, sizeof(buf)); + ssize_t n = read(fd, buf, sizeof(buf)); + if (n == 0) break; else if (n < 0) @@ -449,7 +450,7 @@ static int set_tracing_percpu_buffer_size(struct perf_ftrace *ftrace) return 0; ret = write_tracing_file_int("buffer_size_kb", - ftrace->percpu_buffer_size / 1024); + (int)(ftrace->percpu_buffer_size / 1024)); if (ret < 0) return ret; @@ -691,7 +692,8 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace) break; if (pollfd.revents & POLLIN) { - int n = read(trace_fd, buf, sizeof(buf)); + ssize_t n = read(trace_fd, buf, sizeof(buf)); + if (n < 0) break; if (fwrite(buf, n, 1, stdout) != 1) @@ -713,7 +715,8 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace) /* read remaining buffer contents */ while (true) { - int n = read(trace_fd, buf, sizeof(buf)); + ssize_t n = read(trace_fd, buf, sizeof(buf)); + if (n <= 0) break; if (fwrite(buf, n, 1, stdout) != 1) @@ -1031,7 +1034,8 @@ static int __cmd_latency(struct perf_ftrace *ftrace) break; if (pollfd.revents & POLLIN) { - int n = read(trace_fd, buf, sizeof(buf) - 1); + ssize_t n = read(trace_fd, buf, sizeof(buf) - 1); + if (n < 0) break; @@ -1049,7 +1053,8 @@ static int __cmd_latency(struct perf_ftrace *ftrace) /* read remaining buffer contents */ while (!ftrace->target.use_bpf) { - int n = read(trace_fd, buf, sizeof(buf) - 1); + ssize_t n = read(trace_fd, buf, sizeof(buf) - 1); + if (n <= 0) break; make_histogram(ftrace, buckets, buf, n, line); diff --git a/tools/perf/util/bpf_ftrace.c b/tools/perf/util/bpf_ftrace.c index 7324668cc83e..c4b3bb4e5922 100644 --- a/tools/perf/util/bpf_ftrace.c +++ b/tools/perf/util/bpf_ftrace.c @@ -97,7 +97,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) false, func->name); if (IS_ERR(skel->links.func_begin)) { pr_err("Failed to attach fentry program\n"); - err = PTR_ERR(skel->links.func_begin); + err = (int)PTR_ERR(skel->links.func_begin); goto out; } @@ -105,7 +105,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) true, func->name); if (IS_ERR(skel->links.func_end)) { pr_err("Failed to attach fexit program\n"); - err = PTR_ERR(skel->links.func_end); + err = (int)PTR_ERR(skel->links.func_end); goto out; } -- 2.49.0.504.g3bcea36a83-goog