Commit e5810941 authored by Song Liu's avatar Song Liu Committed by Alexei Starovoitov
Browse files

bpf: Fix bpf_prog_pack when PMU_SIZE is not defined 



PMD_SIZE is not available in some special config, e.g. ARCH=arm with
CONFIG_MMU=n. Use bpf_prog_pack of PAGE_SIZE in these cases.

Fixes: ef078600 ("bpf: Select proper size for bpf_prog_pack")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220321180009.1944482-3-song@kernel.org
parent 96805674

kernel/bpf/core.c

+13 −2
Original line number Diff line number Diff line
@@ -840,12 +840,23 @@ static int bpf_prog_chunk_count(void) 
static DEFINE_MUTEX(pack_mutex);

static LIST_HEAD(pack_list);



/* PMD_SIZE is not available in some special config, e.g. ARCH=arm with

 * CONFIG_MMU=n. Use PAGE_SIZE in these cases.

 */

#ifdef PMD_SIZE

#define BPF_HPAGE_SIZE PMD_SIZE

#define BPF_HPAGE_MASK PMD_MASK

#else

#define BPF_HPAGE_SIZE PAGE_SIZE

#define BPF_HPAGE_MASK PAGE_MASK

#endif



static size_t select_bpf_prog_pack_size(void)

{

	size_t size;

	void *ptr;



	size = PMD_SIZE * num_online_nodes();

	size = BPF_HPAGE_SIZE * num_online_nodes();

	ptr = module_alloc(size);



	/* Test whether we can get huge pages. If not just use PAGE_SIZE
@@ -855,7 +866,7 @@ static size_t select_bpf_prog_pack_size(void) 
		size = PAGE_SIZE;

		bpf_prog_pack_mask = PAGE_MASK;

	} else {

		bpf_prog_pack_mask = PMD_MASK;

		bpf_prog_pack_mask = BPF_HPAGE_MASK;

	}



	vfree(ptr);