File perf-6.0-lock_contention_fix_a_build_error_on_3... of Package perf

Overview Repositories Revisions Requests Users Attributes Meta

File perf-6.0-lock_contention_fix_a_build_error_on_32_bit.patch of Package perf (Revision 4379ed9b54d738a2636cc9915d75d0d4)

Currently displaying revision 4379ed9b54d738a2636cc9915d75d0d4 , Show latest

From MAILER-DAEMON Mon Oct  3 08:04:46 2022
Sender: Namhyung Kim <namhyung@gmail.com>
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>, Peter Zijlstra <peterz@infradead.org>, LKML <linux-kernel@vger.kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, linux-perf-users@vger.kernel.org, Song Liu <songliubraving@fb.com>, Jiri Slaby <jirislaby@kernel.org>
Subject: [PATCH] perf lock contention: Fix a build error on 32-bit
Date: Mon, 26 Sep 2022 14:56:38 -0700
Message-Id: <20220926215638.3931222-1-namhyung@kernel.org>
List-ID: <linux-perf-users.vger.kernel.org>
X-Mailing-List: linux-perf-users@vger.kernel.org
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

It was reported that it failed to build the BPF lock contention skeleton
on 32 bit arch due to the size of long.  The lost count is used only for
reporting errors due to lack of stackmap space through bad_hist which type
is 'int'.  Let's use int type then.

Reported-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 +-
 tools/perf/util/lock-contention.h              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/util/bpf_skel/lock_contention.bpf.c
index 9e8b94eb6320..6771aa28692c 100644
--- a/tools/perf/util/bpf_skel/lock_contention.bpf.c
+++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c
@@ -74,7 +74,7 @@ int has_cpu;
 int has_task;
 
 /* error stat */
-unsigned long lost;
+int lost;
 
 static inline int can_record(void)
 {
diff --git a/tools/perf/util/lock-contention.h b/tools/perf/util/lock-contention.h
index 2146efc33396..d50087aed906 100644
--- a/tools/perf/util/lock-contention.h
+++ b/tools/perf/util/lock-contention.h
@@ -113,7 +113,7 @@ struct lock_contention {
 	struct machine *machine;
 	struct hlist_head *result;
 	unsigned long map_nr_entries;
-	unsigned long lost;
+	int lost;
 };
 
 #ifdef HAVE_BPF_SKEL
-- 
2.37.3

Places

File perf-6.0-lock_contention_fix_a_build_error_on_32_bit.patch of Package perf (Revision 4379ed9b54d738a2636cc9915d75d0d4)

Places