From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCF438831; Tue, 26 Nov 2024 20:43:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732653801; cv=none; b=fABbry36qR65nQCcxBRZZo5Dsk6XCcd9IC6a3WFsVGzmcz6obBCl/zG+jmJKoCz3AT+KwdQ21zdO4siPGRWA0JDYmqwHS2fqkVTBN6llUA8GsI1dTJn9GXHSglypFyk1TrbX6aH/DdtxKG0YVlUrBA8GJuS9fcE8BI1UI5ENdqc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732653801; c=relaxed/simple; bh=/M6nrZ8/zOV0HJkhNSsy+3xCar9R3UKeeL0bjP0pyQI=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=HELuYiz+Dq/gFJ6JOYoYZ5P8UwkbmIO4J2q+LKH31CMTldkHraUcZAU7laW1pckT4vhrS2vxwQCsLy+kSvM2XR7BJ0KzsYgdYykTzwao8uIXBbAy5CktG49ndJerZRr93fb8LNiUS2DfwavrFssAXusnoWiN7mFVuy4eSLUTJ+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=doXOCRiu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="doXOCRiu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C280AC4CECF; Tue, 26 Nov 2024 20:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732653801; bh=/M6nrZ8/zOV0HJkhNSsy+3xCar9R3UKeeL0bjP0pyQI=; h=Date:From:To:Cc:Subject:From; b=doXOCRiu/Zjf30f5FKqcQba6vTE1T8OradgNvFa48alLNp1h4wzMOYV/5j3+8yPm9 NcTBALs1ozS3SW4lm5HCGDtWLhxTaB9y4wLXz6IRbc9BaZlqMhRRvuTwsUGlbAdi2c Hrcr3LIuwsnnguj0aUsoGyyZHi07QQ6d+nUiVjhMhN4PLesr3Uyp1jlBAt/Ol6kg+K gjrnEgMusW5WvXH1y4evhozML33+owJsW9AGkW06PblNeUsOOPJy/6ebkl/6KLg1/y YxPQfVZUpI1MfWTWEIJq/UBXeJXNJHyV/vQiCheF8psmKJM4hWYQZl0qZ0ggqDm5iT VVRiWGpz5qXHw== Date: Tue, 26 Nov 2024 17:43:18 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Michel Lind , Andrii Nakryiko , Alexei Starovoitov , Adrian Hunter , Ian Rogers , James Clark , Jiri Olsa , Kan Liang , Linux Kernel Mailing List , linux-perf-users@vger.kernel.org Subject: [PATCH 1/1 perf-tools] perf MANIFEST: Add arch/*/include/uapi/asm/bpf_perf_event.h to the perf tarball Message-ID: Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Needed to build tools/lib/bpf/ on various arches other than x86_64, notably arm64 when using the perf tarballs generated by: $ make help | grep perf- perf-tar-src-pkg - Build the perf source tarball with no compression perf-targz-src-pkg - Build the perf source tarball with gzip compression perf-tarbz2-src-pkg - Build the perf source tarball with bz2 compression perf-tarxz-src-pkg - Build the perf source tarball with xz compression perf-tarzst-src-pkg - Build the perf source tarball with zst compression $ Building with BPF support was opt-in in perf for a long time, and testing it via the tarball main kernel Makefile targets in an architecture other than x86_64 was an odd case. I had noticed this at some point earlier this year while cross building perf to some arches, including arm64, but it fell thru the cracks, see the Link tag below. Fix it now by adding those arch/*/include/uapi/asm/bpf_perf_event.h files to the MANIFEST file used in building the perf source tarball. Tested with: perfbuilder@number:~$ time dm debian:experimental-x-arm64 1 21.60 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 14.1.0-5) 14.1.0 flex 2.6.4 BUILD_TARBALL_HEAD=d31a974f6edc576f84c35be9526fec549a3b3520 $ $ git log --oneline -1 d31a974f6edc576f84c35be9526fec549a3b3520 d31a974f6edc576f (HEAD -> perf-tools-next) perf MANIFEST: Add arch/*/include/uapi/asm/bpf_perf_event.h to the perf tarball $ That was previously failing: perfbuilder@number:~$ grep debian:experimental-x-arm64 dm.log.old/summary 19 4.80 debian:experimental-x-arm64 : FAIL gcc version 14.1.0 (Debian 14.1.0-5) $ perfbuilder@number:~$ grep -B6 'Error 1' dm.log.old/debian:experimental-x-arm64 In file included from /git/perf-6.12.0-rc6/tools/include/uapi/linux/bpf_perf_event.h:11, from libbpf.c:36: /git/perf-6.12.0-rc6/tools/include/uapi/asm/bpf_perf_event.h:2:10: fatal error: ../../arch/arm64/include/uapi/asm/bpf_perf_event.h: No such file or directory 2 | #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[4]: *** [/git/perf-6.12.0-rc6/tools/build/Makefile.build:105: /tmp/build/perf/libbpf/staticobjs/libbpf.o] Error 1 perfbuilder@number:~$ Fixes: 9eea8fafe33eb708 ("libbpf: fix __arg_ctx type enforcement for perf_event programs") Closes: https://lore.kernel.org/all/Z0UNRCRYKunbDYxP@hyperscale.parallels Reported-by: Michel Lind Cc: Alexei Starovoitov Cc: Andrii Nakryiko Link: https://lore.kernel.org/bpf/ZfyEgoG3JFiOs2Fs@x1/ Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/MANIFEST | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index dc42de1785cee715..908165fcec7de3c4 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -1,5 +1,6 @@ arch/arm64/tools/gen-sysreg.awk arch/arm64/tools/sysreg +arch/*/include/uapi/asm/bpf_perf_event.h tools/perf tools/arch tools/scripts -- 2.47.0