Unverified Commit c07935cb authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: bpf: move rv_bpf_fixup_exception signature to extable.h 



This is to group riscv related extable related functions signature
into one file.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent bb1f85d6

arch/riscv/include/asm/extable.h

+12 −0
Original line number Diff line number Diff line
@@ -22,4 +22,16 @@ struct exception_table_entry { 
#define ARCH_HAS_RELATIVE_EXTABLE



int fixup_exception(struct pt_regs *regs);



#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)

int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);

#else

static inline int

rv_bpf_fixup_exception(const struct exception_table_entry *ex,

		       struct pt_regs *regs)

{

	return 0;

}

#endif



#endif

arch/riscv/mm/extable.c

+0 −6
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
#include <linux/module.h>

#include <linux/uaccess.h>



#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)

int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);

#endif



int fixup_exception(struct pt_regs *regs)

{

	const struct exception_table_entry *fixup;
@@ -23,10 +19,8 @@ int fixup_exception(struct pt_regs *regs) 
	if (!fixup)

		return 0;



#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)

	if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)

		return rv_bpf_fixup_exception(fixup, regs);

#endif



	regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;

	return 1;

arch/riscv/net/bpf_jit_comp64.c

+0 −2
Original line number Diff line number Diff line
@@ -459,8 +459,6 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx) 
#define BPF_FIXUP_OFFSET_MASK   GENMASK(26, 0)

#define BPF_FIXUP_REG_MASK      GENMASK(31, 27)



int rv_bpf_fixup_exception(const struct exception_table_entry *ex,

				struct pt_regs *regs);

int rv_bpf_fixup_exception(const struct exception_table_entry *ex,

				struct pt_regs *regs)

{