Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perf for openSUSE:Factory checked in at 2022-10-03 13:46:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perf (Old) and /work/SRC/openSUSE:Factory/.perf.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perf" Mon Oct 3 13:46:59 2022 rev:69 rq:1007664 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/perf/perf.changes 2022-09-12 19:08:12.262528937 +0200 +++ /work/SRC/openSUSE:Factory/.perf.new.2275/perf.changes 2022-10-03 13:47:42.225737713 +0200 @@ -1,0 +2,6 @@ +Mon Oct 3 08:41:02 UTC 2022 - Jiri Slaby <jsl...@suse.cz> + +- add perf-6.0-lock_contention_fix_a_build_error_on_32_bit.patch + * needed still in 6.0 to fix build on 32bit. + +------------------------------------------------------------------- New: ---- perf-6.0-lock_contention_fix_a_build_error_on_32_bit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perf.spec ++++++ --- /var/tmp/diff_new_pack.xcPKvx/_old 2022-10-03 13:47:42.721738804 +0200 +++ /var/tmp/diff_new_pack.xcPKvx/_new 2022-10-03 13:47:42.725738812 +0200 @@ -35,6 +35,7 @@ URL: https://perf.wiki.kernel.org/ # remove once 6.0 reaches Tumbleweed (incl. the if below) Patch0: perf-5.15-don-t-install-headers-with-x-permissions.patch +Patch1: perf-6.0-lock_contention_fix_a_build_error_on_32_bit.patch BuildRequires: OpenCSD-devel BuildRequires: audit-devel %ifnarch %{arm} @@ -106,6 +107,9 @@ %if %{version_pure} == 519 %patch0 -p1 %endif +%if %{version_pure} == 60 +%patch1 -p1 +%endif %build cd tools/perf ++++++ perf-6.0-lock_contention_fix_a_build_error_on_32_bit.patch ++++++ >From MAILER-DAEMON Mon Oct 3 08:04:46 2022 Sender: Namhyung Kim <namhy...@gmail.com> From: Namhyung Kim <namhy...@kernel.org> To: Arnaldo Carvalho de Melo <a...@kernel.org>, Jiri Olsa <jo...@kernel.org> Cc: Ingo Molnar <mi...@kernel.org>, Peter Zijlstra <pet...@infradead.org>, LKML <linux-ker...@vger.kernel.org>, Ian Rogers <irog...@google.com>, Adrian Hunter <adrian.hun...@intel.com>, linux-perf-us...@vger.kernel.org, Song Liu <songliubrav...@fb.com>, Jiri Slaby <jirisl...@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-namhy...@kernel.org> List-ID: <linux-perf-users.vger.kernel.org> X-Mailing-List: linux-perf-us...@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 <jirisl...@kernel.org> Signed-off-by: Namhyung Kim <namhy...@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
