Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a9c1991 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

bpf: rename bpf_dev_offload -> bpf_prog_offload 



With map offload coming, we need to call program offload structure
something less ambiguous.  Pure rename, no functional changes.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent bd475643

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

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog, 
	int err;



	if (prog) {

		struct bpf_dev_offload *offload = prog->aux->offload;

		struct bpf_prog_offload *offload = prog->aux->offload;



		if (!offload)

			return -EINVAL;

include/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ struct bpf_prog_offload_ops { 
			 int insn_idx, int prev_insn_idx);

};



struct bpf_dev_offload {

struct bpf_prog_offload {

	struct bpf_prog		*prog;

	struct net_device	*netdev;

	void			*dev_priv;
@@ -230,7 +230,7 @@ struct bpf_prog_aux { 
#ifdef CONFIG_SECURITY

	void *security;

#endif

	struct bpf_dev_offload *offload;

	struct bpf_prog_offload *offload;

	union {

		struct work_struct work;

		struct rcu_head	rcu;

kernel/bpf/offload.c

+5 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static LIST_HEAD(bpf_prog_offload_devs); 


int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr)

{

	struct bpf_dev_offload *offload;

	struct bpf_prog_offload *offload;



	if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS &&

	    attr->prog_type != BPF_PROG_TYPE_XDP)
@@ -72,7 +72,7 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) 
static int __bpf_offload_ndo(struct bpf_prog *prog, enum bpf_netdev_command cmd,

			     struct netdev_bpf *data)

{

	struct bpf_dev_offload *offload = prog->aux->offload;

	struct bpf_prog_offload *offload = prog->aux->offload;

	struct net_device *netdev;



	ASSERT_RTNL();
@@ -110,7 +110,7 @@ int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env) 
int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env,

				 int insn_idx, int prev_insn_idx)

{

	struct bpf_dev_offload *offload;

	struct bpf_prog_offload *offload;

	int ret = -ENODEV;



	down_read(&bpf_devs_lock);
@@ -124,7 +124,7 @@ int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, 


static void __bpf_prog_offload_destroy(struct bpf_prog *prog)

{

	struct bpf_dev_offload *offload = prog->aux->offload;

	struct bpf_prog_offload *offload = prog->aux->offload;

	struct netdev_bpf data = {};



	data.offload.prog = prog;
@@ -242,7 +242,7 @@ static int bpf_offload_notification(struct notifier_block *notifier, 
				    ulong event, void *ptr)

{

	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);

	struct bpf_dev_offload *offload, *tmp;

	struct bpf_prog_offload *offload, *tmp;



	ASSERT_RTNL();