Commit 6547f424 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-offload-fixes' 



Jakub Kicinski says:

====================
This series addresses some late comments and moves checking if program
has been loaded for the correct device to the drivers.  There are also
some problems with net namespaces which I didn't take into consideration.
On the kernel side we will now simply ignore namespace moves.  Since the
user space API is not reporting any namespace identification we have to
remove the ifindex until a correct way of reporting is agreed upon.

v2:
 - fix ext ack reporting for XDP (David A);
 - add Jiri's Ack.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 32a72bbd 14380194

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

+8 −2
Original line number Diff line number Diff line
@@ -214,8 +214,14 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog, 
{

	int err;



	if (prog && !prog->aux->offload)

	if (prog) {

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



		if (!offload)

			return -EINVAL;

		if (offload->netdev != nn->dp.netdev)

			return -EINVAL;

	}



	if (prog && old_prog) {

		u8 cap;

include/linux/bpf.h

+8 −10
Original line number Diff line number Diff line
@@ -334,9 +334,8 @@ extern const struct bpf_verifier_ops tc_cls_act_analyzer_ops; 
extern const struct bpf_verifier_ops xdp_analyzer_ops;



struct bpf_prog *bpf_prog_get(u32 ufd);

struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type);

struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type,

				       struct net_device *netdev);

				       bool attach_drv);

struct bpf_prog * __must_check bpf_prog_add(struct bpf_prog *prog, int i);

void bpf_prog_sub(struct bpf_prog *prog, int i);

struct bpf_prog * __must_check bpf_prog_inc(struct bpf_prog *prog);
@@ -425,15 +424,9 @@ static inline struct bpf_prog *bpf_prog_get(u32 ufd) 
	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,

						 enum bpf_prog_type type)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct bpf_prog *bpf_prog_get_type_dev(u32 ufd,

						     enum bpf_prog_type type,

						     struct net_device *netdev)

						     bool attach_drv)

{

	return ERR_PTR(-EOPNOTSUPP);

}
@@ -514,9 +507,14 @@ static inline int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, 
}

#endif /* CONFIG_BPF_SYSCALL */



static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,

						 enum bpf_prog_type type)

{

	return bpf_prog_get_type_dev(ufd, type, false);

}



int bpf_prog_offload_compile(struct bpf_prog *prog);

void bpf_prog_offload_destroy(struct bpf_prog *prog);

u32 bpf_prog_offload_ifindex(struct bpf_prog *prog);



#if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)

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

include/linux/bpf_verifier.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static inline struct bpf_reg_state *cur_regs(struct bpf_verifier_env *env) 
#if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)

int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env);

#else

int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env)

static inline int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env)

{

	return -EOPNOTSUPP;

}

include/uapi/linux/bpf.h

+1 −7
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ union bpf_attr { 
		__u32		kern_version;	/* checked when prog_type=kprobe */

		__u32		prog_flags;

		char		prog_name[BPF_OBJ_NAME_LEN];

		__u32		prog_target_ifindex;	/* ifindex of netdev to prep for */

		__u32		prog_ifindex;	/* ifindex of netdev to prep for */

	};



	struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -897,10 +897,6 @@ enum sk_action { 


#define BPF_TAG_SIZE	8



enum bpf_prog_status {

	BPF_PROG_STATUS_DEV_BOUND	= (1 << 0),

};



struct bpf_prog_info {

	__u32 type;

	__u32 id;
@@ -914,8 +910,6 @@ struct bpf_prog_info { 
	__u32 nr_map_ids;

	__aligned_u64 map_ids;

	char name[BPF_OBJ_NAME_LEN];

	__u32 ifindex;

	__u32 status;

} __attribute__((aligned(8)));



struct bpf_map_info {

kernel/bpf/offload.c

+12 −15
Original line number Diff line number Diff line
@@ -14,8 +14,9 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) 
	struct net *net = current->nsproxy->net_ns;

	struct bpf_dev_offload *offload;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS &&

	    attr->prog_type != BPF_PROG_TYPE_XDP)

		return -EINVAL;



	if (attr->prog_flags)

		return -EINVAL;
@@ -28,7 +29,7 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) 
	init_waitqueue_head(&offload->verifier_done);



	rtnl_lock();

	offload->netdev = __dev_get_by_index(net, attr->prog_target_ifindex);

	offload->netdev = __dev_get_by_index(net, attr->prog_ifindex);

	if (!offload->netdev) {

		rtnl_unlock();

		kfree(offload);
@@ -85,6 +86,10 @@ static void __bpf_prog_offload_destroy(struct bpf_prog *prog) 
	struct bpf_dev_offload *offload = prog->aux->offload;

	struct netdev_bpf data = {};



	/* Caution - if netdev is destroyed before the program, this function

	 * will be called twice.

	 */



	data.offload.prog = prog;



	if (offload->verifier_running)
@@ -144,18 +149,6 @@ int bpf_prog_offload_compile(struct bpf_prog *prog) 
	return bpf_prog_offload_translate(prog);

}



u32 bpf_prog_offload_ifindex(struct bpf_prog *prog)

{

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

	u32 ifindex;



	rtnl_lock();

	ifindex = offload->netdev ? offload->netdev->ifindex : 0;

	rtnl_unlock();



	return ifindex;

}



const struct bpf_prog_ops bpf_offload_prog_ops = {

};
@@ -169,6 +162,10 @@ static int bpf_offload_notification(struct notifier_block *notifier, 


	switch (event) {

	case NETDEV_UNREGISTER:

		/* ignore namespace changes */

		if (netdev->reg_state != NETREG_UNREGISTERING)

			break;



		list_for_each_entry_safe(offload, tmp, &bpf_prog_offload_devs,

					 offloads) {

			if (offload->netdev == netdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE