Received-SPF: pass (google.com: domain of linux-kernel+bounces-84470-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.118.233 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C
From: John Hubbard <jhubbard@nvidia.com>
To: Arnaldo Carvalho de Melo <acme@redhat.com>
CC: Alexei Starovoitov <ast@kernel.org>, <bpf@vger.kernel.org>, LKML
	<linux-kernel@vger.kernel.org>, <dwarves@vger.kernel.org>, John Hubbard
	<jhubbard@nvidia.com>
Subject: [PATCH] fix linux kernel BTF builds: increase max percpu variables by 10x
Date: Tue, 27 Feb 2024 19:21:42 -0800
Message-ID: <20240228032142.396719-1-jhubbard@nvidia.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 03:21:58.3638
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 6fbafc3c-f241-4d51-e54e-08dc380c6c24
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource:
	SA2PEPF000015CC.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4407

When building the Linux kernel with a distro .config, most or even all
possible kernel modules are built. This adds up to 4500+ modules, and
based on my testing, this causes the pahole utility to run out of space,
which shows up like this (CONFIG_DEBUG_INFO_BTF=y is required in order
to reproduce this):

  LD      .tmp_vmlinux.btf
  BTF     .btf.vmlinux.bin.o
Reached the limit of per-CPU variables: 4096
..repeated many times...
Reached the limit of per-CPU variables: 4096
  LD      .tmp_vmlinux.kallsyms1
  NM      .tmp_vmlinux.kallsyms1.syms
  KSYMS   .tmp_vmlinux.kallsyms1.S
  AS      .tmp_vmlinux.kallsyms1.S
  LD      .tmp_vmlinux.kallsyms2
  NM      .tmp_vmlinux.kallsyms2.syms
  KSYMS   .tmp_vmlinux.kallsyms2.S
  AS      .tmp_vmlinux.kallsyms2.S
  LD      vmlinux
  BTFIDS  vmlinux
libbpf: failed to find '.BTF' ELF section in vmlinux
FAILED: load BTF from vmlinux: No data available
make[2]: *** [scripts/Makefile.vmlinux:37: vmlinux] Error 255
make[2]: *** Deleting file 'vmlinux'
make[1]: *** [/kernel_work/linux-people/Makefile:1162: vmlinux] Error 2
make: *** [Makefile:240: __sub-make] Error 2

Increasing MAX_PERCPU_VAR_CNT by 10x avoids running out of space, and
allows the build to succeed.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 btf_encoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/btf_encoder.c b/btf_encoder.c
index fd04008..d9f4e80 100644
--- a/btf_encoder.c
+++ b/btf_encoder.c
@@ -50,7 +50,7 @@ struct elf_function {
 	struct btf_encoder_state state;
 };
 
-#define MAX_PERCPU_VAR_CNT 4096
+#define MAX_PERCPU_VAR_CNT 40960
 
 struct var_info {
 	uint64_t    addr;
-- 
2.44.0