Commit 5e4d6d20 authored by Jiong Wang's avatar Jiong Wang Committed by Daniel Borkmann
Browse files

nfp: bpf: factor out is_mbpf_load & is_mbpf_store 



It is usual that we need to check if one BPF insn is for loading/storeing
data from/to memory.

Therefore, it makes sense to factor out related code to become common
helper functions.

Signed-off-by: default avatarJiong Wang <jiong.wang@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 5468a8b9

drivers/net/ethernet/netronome/nfp/bpf/main.h

+10 −0
Original line number Diff line number Diff line
@@ -144,6 +144,16 @@ static inline u8 mbpf_mode(const struct nfp_insn_meta *meta) 
	return BPF_MODE(meta->insn.code);

}



static inline bool is_mbpf_load(const struct nfp_insn_meta *meta)

{

	return (meta->insn.code & ~BPF_SIZE_MASK) == (BPF_LDX | BPF_MEM);

}



static inline bool is_mbpf_store(const struct nfp_insn_meta *meta)

{

	return (meta->insn.code & ~BPF_SIZE_MASK) == (BPF_STX | BPF_MEM);

}



/**

 * struct nfp_prog - nfp BPF program

 * @prog: machine code

drivers/net/ethernet/netronome/nfp/bpf/verifier.c

+2 −2
Original line number Diff line number Diff line
@@ -180,10 +180,10 @@ nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn_idx) 
	if (meta->insn.code == (BPF_JMP | BPF_EXIT))

		return nfp_bpf_check_exit(nfp_prog, env);



	if ((meta->insn.code & ~BPF_SIZE_MASK) == (BPF_LDX | BPF_MEM))

	if (is_mbpf_load(meta))

		return nfp_bpf_check_ptr(nfp_prog, meta, env,

					 meta->insn.src_reg);

	if ((meta->insn.code & ~BPF_SIZE_MASK) == (BPF_STX | BPF_MEM))

	if (is_mbpf_store(meta))

		return nfp_bpf_check_ptr(nfp_prog, meta, env,

					 meta->insn.dst_reg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE