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

Commit 118b4aa2 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

net: xdp: avoid output parameters when querying XDP prog 



The output parameters will get unwieldy if we want to add more
information about the program.  Simply pass the entire
struct netdev_bpf in.

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

include/linux/netdevice.h

+2 −1
Original line number Diff line number Diff line
@@ -3330,7 +3330,8 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 
typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf);

int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,

		      int fd, u32 flags);

u8 __dev_xdp_attached(struct net_device *dev, bpf_op_t xdp_op, u32 *prog_id);

void __dev_xdp_query(struct net_device *dev, bpf_op_t xdp_op,

		     struct netdev_bpf *xdp);



int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb);

int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);

net/core/dev.c

+14 −10
Original line number Diff line number Diff line
@@ -7073,17 +7073,21 @@ int dev_change_proto_down(struct net_device *dev, bool proto_down) 
}

EXPORT_SYMBOL(dev_change_proto_down);



u8 __dev_xdp_attached(struct net_device *dev, bpf_op_t bpf_op, u32 *prog_id)

void __dev_xdp_query(struct net_device *dev, bpf_op_t bpf_op,

		     struct netdev_bpf *xdp)

{

	struct netdev_bpf xdp;



	memset(&xdp, 0, sizeof(xdp));

	xdp.command = XDP_QUERY_PROG;

	memset(xdp, 0, sizeof(*xdp));

	xdp->command = XDP_QUERY_PROG;



	/* Query must always succeed. */

	WARN_ON(bpf_op(dev, &xdp) < 0);

	if (prog_id)

		*prog_id = xdp.prog_id;

	WARN_ON(bpf_op(dev, xdp) < 0);

}



static u8 __dev_xdp_attached(struct net_device *dev, bpf_op_t bpf_op)

{

	struct netdev_bpf xdp;



	__dev_xdp_query(dev, bpf_op, &xdp);



	return xdp.prog_attached;

}
@@ -7134,10 +7138,10 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, 
		bpf_chk = generic_xdp_install;



	if (fd >= 0) {

		if (bpf_chk && __dev_xdp_attached(dev, bpf_chk, NULL))

		if (bpf_chk && __dev_xdp_attached(dev, bpf_chk))

			return -EEXIST;

		if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) &&

		    __dev_xdp_attached(dev, bpf_op, NULL))

		    __dev_xdp_attached(dev, bpf_op))

			return -EBUSY;



		prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,

net/core/rtnetlink.c

+5 −1
Original line number Diff line number Diff line
@@ -1261,6 +1261,7 @@ static u8 rtnl_xdp_attached_mode(struct net_device *dev, u32 *prog_id) 
{

	const struct net_device_ops *ops = dev->netdev_ops;

	const struct bpf_prog *generic_xdp_prog;

	struct netdev_bpf xdp;



	ASSERT_RTNL();
@@ -1273,7 +1274,10 @@ static u8 rtnl_xdp_attached_mode(struct net_device *dev, u32 *prog_id) 
	if (!ops->ndo_bpf)

		return XDP_ATTACHED_NONE;



	return __dev_xdp_attached(dev, ops->ndo_bpf, prog_id);

	__dev_xdp_query(dev, ops->ndo_bpf, &xdp);

	*prog_id = xdp.prog_id;



	return xdp.prog_attached;

}



static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev)