UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: ef078600ee ("bpf: Select proper size for bpf_prog_pack")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220321180009.1944482-3-song@kernel.org
This commit is contained in:
Song Liu 2022-03-21 11:00:09 -07:00 committed by Alexei Starovoitov
parent 96805674e5
commit e581094167
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/bpf/core.c
View File

@ -840,12 +840,23 @@ static int bpf_prog_chunk_count(void)
static DEFINE_MUTEX(pack_mutex); static DEFINE_MUTEX(pack_mutex);
static LIST_HEAD(pack_list); 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) static size_t select_bpf_prog_pack_size(void)
{ {
size_t size; size_t size;
void *ptr; void *ptr;
size = PMD_SIZE * num_online_nodes(); size = BPF_HPAGE_SIZE * num_online_nodes();
ptr = module_alloc(size); ptr = module_alloc(size);
/* Test whether we can get huge pages. If not just use PAGE_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; size = PAGE_SIZE;
bpf_prog_pack_mask = PAGE_MASK; bpf_prog_pack_mask = PAGE_MASK;
} else { } else {
bpf_prog_pack_mask = PMD_MASK; bpf_prog_pack_mask = BPF_HPAGE_MASK;
} }
vfree(ptr); vfree(ptr);