Unverified Commit 1d27d854 authored Mar 30, 2021 by Jisheng Zhang Committed by Palmer Dabbelt Apr 26, 2021

riscv: bpf: Move bpf_jit_alloc_exec() and bpf_jit_free_exec() to core



We will drop the executable permissions of the code pages from the
mapping at allocation time soon. Move bpf_jit_alloc_exec() and
bpf_jit_free_exec() to bpf_jit_core.c so that they can be shared by
both RV64I and RV32I.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Acked-by: Luke Nelson <luke.r.nels@gmail.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>

parent cdd1b2bd

arch/riscv/net/bpf_jit_comp64.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -1148,16 +1148,3 @@ void bpf_jit_build_epilogue(struct rv_jit_context *ctx)
		{
		__build_epilogue(false, ctx);
		}

		void *bpf_jit_alloc_exec(unsigned long size)
		{
		return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
		BPF_JIT_REGION_END, GFP_KERNEL,
		PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
		__builtin_return_address(0));
		}

		void bpf_jit_free_exec(void *addr)
		{
		return vfree(addr);
		}

arch/riscv/net/bpf_jit_core.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -164,3 +164,16 @@ struct bpf_prog bpf_int_jit_compile(struct bpf_prog prog)
		tmp : orig_prog);
		return prog;
		}

		void *bpf_jit_alloc_exec(unsigned long size)
		{
		return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
		BPF_JIT_REGION_END, GFP_KERNEL,
		PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
		__builtin_return_address(0));
		}

		void bpf_jit_free_exec(void *addr)
		{
		return vfree(addr);
		}