Skip to content

Commit d6170e4

Browse files
puranjaymohanAlexei Starovoitov
authored andcommitted
bpf: hardcode BPF_PROG_PACK_SIZE to 2MB * num_possible_nodes()
On some architectures like ARM64, PMD_SIZE can be really large in some configurations. Like with CONFIG_ARM64_64K_PAGES=y the PMD_SIZE is 512MB. Use 2MB * num_possible_nodes() as the size for allocations done through the prog pack allocator. On most architectures, PMD_SIZE will be equal to 2MB in case of 4KB pages and will be greater than 2MB for bigger page sizes. Fixes: ea2baba ("bpf: Simplify bpf_prog_pack_[size|mask]") Reported-by: "kernelci.org bot" <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Suggested-by: Song Liu <[email protected]> Signed-off-by: Puranjay Mohan <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 379b97b commit d6170e4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

kernel/bpf/core.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,12 @@ static LIST_HEAD(pack_list);
893893
* CONFIG_MMU=n. Use PAGE_SIZE in these cases.
894894
*/
895895
#ifdef PMD_SIZE
896-
#define BPF_PROG_PACK_SIZE (PMD_SIZE * num_possible_nodes())
896+
/* PMD_SIZE is really big for some archs. It doesn't make sense to
897+
* reserve too much memory in one allocation. Hardcode BPF_PROG_PACK_SIZE to
898+
* 2MiB * num_possible_nodes(). On most architectures PMD_SIZE will be
899+
* greater than or equal to 2MB.
900+
*/
901+
#define BPF_PROG_PACK_SIZE (SZ_2M * num_possible_nodes())
897902
#else
898903
#define BPF_PROG_PACK_SIZE PAGE_SIZE
899904
#endif

0 commit comments

Comments
 (0)