Skip to content

Commit 5e4d6d2

Browse files
Jiong Wangborkmann
authored andcommitted
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: Jiong Wang <[email protected]> Reviewed-by: Jakub Kicinski <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]>
1 parent 5468a8b commit 5e4d6d2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,16 @@ static inline u8 mbpf_mode(const struct nfp_insn_meta *meta)
144144
return BPF_MODE(meta->insn.code);
145145
}
146146

147+
static inline bool is_mbpf_load(const struct nfp_insn_meta *meta)
148+
{
149+
return (meta->insn.code & ~BPF_SIZE_MASK) == (BPF_LDX | BPF_MEM);
150+
}
151+
152+
static inline bool is_mbpf_store(const struct nfp_insn_meta *meta)
153+
{
154+
return (meta->insn.code & ~BPF_SIZE_MASK) == (BPF_STX | BPF_MEM);
155+
}
156+
147157
/**
148158
* struct nfp_prog - nfp BPF program
149159
* @prog: machine code

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn_idx)
180180
if (meta->insn.code == (BPF_JMP | BPF_EXIT))
181181
return nfp_bpf_check_exit(nfp_prog, env);
182182

183-
if ((meta->insn.code & ~BPF_SIZE_MASK) == (BPF_LDX | BPF_MEM))
183+
if (is_mbpf_load(meta))
184184
return nfp_bpf_check_ptr(nfp_prog, meta, env,
185185
meta->insn.src_reg);
186-
if ((meta->insn.code & ~BPF_SIZE_MASK) == (BPF_STX | BPF_MEM))
186+
if (is_mbpf_store(meta))
187187
return nfp_bpf_check_ptr(nfp_prog, meta, env,
188188
meta->insn.dst_reg);
189189

0 commit comments

Comments
 (0)