bpf: add __weak hook for allocating executable memory
By default, BPF uses module_alloc() to allocate executable memory, but this is not necessary on all arches and potentially undesirable on some of them. So break out the module_alloc() and module_memfree() calls into __weak functions to allow them to be overridden in arch code. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>
This commit is contained in:
parent
69b8fbef2c
commit
8229027985
@ -634,6 +634,16 @@ bool __weak arch_bpf_jit_check_func(const struct bpf_prog *prog)
|
|||||||
EXPORT_SYMBOL_GPL(arch_bpf_jit_check_func);
|
EXPORT_SYMBOL_GPL(arch_bpf_jit_check_func);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void *__weak bpf_jit_alloc_exec(unsigned long size)
|
||||||
|
{
|
||||||
|
return module_alloc(size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void __weak bpf_jit_free_exec(void *addr)
|
||||||
|
{
|
||||||
|
module_memfree(addr);
|
||||||
|
}
|
||||||
|
|
||||||
struct bpf_binary_header *
|
struct bpf_binary_header *
|
||||||
bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
|
bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
|
||||||
unsigned int alignment,
|
unsigned int alignment,
|
||||||
@ -651,7 +661,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
|
|||||||
|
|
||||||
if (bpf_jit_charge_modmem(pages))
|
if (bpf_jit_charge_modmem(pages))
|
||||||
return NULL;
|
return NULL;
|
||||||
hdr = module_alloc(size);
|
hdr = bpf_jit_alloc_exec(size);
|
||||||
if (!hdr) {
|
if (!hdr) {
|
||||||
bpf_jit_uncharge_modmem(pages);
|
bpf_jit_uncharge_modmem(pages);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -676,7 +686,7 @@ void bpf_jit_binary_free(struct bpf_binary_header *hdr)
|
|||||||
{
|
{
|
||||||
u32 pages = hdr->pages;
|
u32 pages = hdr->pages;
|
||||||
|
|
||||||
module_memfree(hdr);
|
bpf_jit_free_exec(hdr);
|
||||||
bpf_jit_uncharge_modmem(pages);
|
bpf_jit_uncharge_modmem(pages);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user