Commit 1da6f573 authored by Quentin Monnet's avatar Quentin Monnet Committed by Alexei Starovoitov
Browse files

nfp: bpf: move nfp_bpf_analyzer_ops from verifier.c to offload.c 



We are about to add several new callbacks to the struct, all of them
defined in offload.c. Move the struct bpf_prog_offload_ops object in
that file. As a consequence, nfp_verify_insn() and nfp_finalize() can no
longer be static.

Signed-off-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c8123ead

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

+4 −0
Original line number Diff line number Diff line
@@ -509,6 +509,10 @@ void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt); 
int nfp_bpf_jit(struct nfp_prog *prog);

bool nfp_bpf_supported_opcode(u8 code);



int nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx,

		    int prev_insn_idx);

int nfp_bpf_finalize(struct bpf_verifier_env *env);



extern const struct bpf_prog_offload_ops nfp_bpf_analyzer_ops;



struct netdev_bpf;

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

+5 −0
Original line number Diff line number Diff line
@@ -601,3 +601,8 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog, 


	return 0;

}



const struct bpf_prog_offload_ops nfp_bpf_analyzer_ops = {

	.insn_hook	= nfp_verify_insn,

	.finalize	= nfp_bpf_finalize,

};

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

+3 −8
Original line number Diff line number Diff line
@@ -623,8 +623,8 @@ nfp_bpf_check_alu(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, 
	return 0;

}



static int

nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn_idx)

int nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx,

		    int prev_insn_idx)

{

	struct nfp_prog *nfp_prog = env->prog->aux->offload->dev_priv;

	struct nfp_insn_meta *meta = nfp_prog->verifier_meta;
@@ -745,7 +745,7 @@ continue_subprog: 
	goto continue_subprog;

}



static int nfp_bpf_finalize(struct bpf_verifier_env *env)

int nfp_bpf_finalize(struct bpf_verifier_env *env)

{

	struct bpf_subprog_info *info;

	struct nfp_prog *nfp_prog;
@@ -788,8 +788,3 @@ static int nfp_bpf_finalize(struct bpf_verifier_env *env) 


	return 0;

}
 


const struct bpf_prog_offload_ops nfp_bpf_analyzer_ops = {

	.insn_hook	= nfp_verify_insn,

	.finalize	= nfp_bpf_finalize,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE