Commit d74a32ac authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'xdp-netlink-ext-ack' 



Jakub Kicinski says:

====================
xdp: use netlink extended ACK reporting

This series is an attempt to make XDP more user friendly by
enabling exploiting the recently added netlink extended ACK
reporting to carry messages to user space.

David Ahern's iproute2 ext ack patches for ip link are sufficient
to show the errors like this:

Error: nfp: MTU too large w/ XDP enabled

Where the message is coming directly from the driver.  There could
still be a bit of a leap for a complete novice from the message
above to the right settings, but it's a big improvement over the
standard "Invalid argument" message.

v1/non-rfc:
 - add a separate macro in patch 1;
 - add KBUILD_MODNAME as part of the message (Daniel);
 - don't print the error to logs in patch 1.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 73333626 9861ce03

drivers/net/ethernet/netronome/nfp/nfp_net.h

+2 −1
Original line number Diff line number Diff line
@@ -818,7 +818,8 @@ nfp_net_irqs_assign(struct nfp_net *nn, struct msix_entry *irq_entries, 
		    unsigned int n);



struct nfp_net_dp *nfp_net_clone_dp(struct nfp_net *nn);

int nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_dp *new);

int nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_dp *new,

			  struct netlink_ext_ack *extack);



bool nfp_net_link_changed_read_clear(struct nfp_net *nn);

int nfp_net_refresh_eth_port(struct nfp_net *nn);

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+13 −9
Original line number Diff line number Diff line
@@ -2524,24 +2524,27 @@ struct nfp_net_dp *nfp_net_clone_dp(struct nfp_net *nn) 
	return new;

}



static int nfp_net_check_config(struct nfp_net *nn, struct nfp_net_dp *dp)

static int

nfp_net_check_config(struct nfp_net *nn, struct nfp_net_dp *dp,

		     struct netlink_ext_ack *extack)

{

	/* XDP-enabled tests */

	if (!dp->xdp_prog)

		return 0;

	if (dp->fl_bufsz > PAGE_SIZE) {

		nn_warn(nn, "MTU too large w/ XDP enabled\n");

		NL_MOD_TRY_SET_ERR_MSG(extack, "MTU too large w/ XDP enabled");

		return -EINVAL;

	}

	if (dp->num_tx_rings > nn->max_tx_rings) {

		nn_warn(nn, "Insufficient number of TX rings w/ XDP enabled\n");

		NL_MOD_TRY_SET_ERR_MSG(extack, "Insufficient number of TX rings w/ XDP enabled");

		return -EINVAL;

	}



	return 0;

}



int nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_dp *dp)

int nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_dp *dp,

			  struct netlink_ext_ack *extack)

{

	int r, err;
@@ -2553,7 +2556,7 @@ int nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_dp *dp) 


	dp->num_r_vecs = max(dp->num_rx_rings, dp->num_stack_tx_rings);



	err = nfp_net_check_config(nn, dp);

	err = nfp_net_check_config(nn, dp, extack);

	if (err)

		goto exit_free_dp;
@@ -2628,7 +2631,7 @@ static int nfp_net_change_mtu(struct net_device *netdev, int new_mtu) 


	dp->mtu = new_mtu;



	return nfp_net_ring_reconfig(nn, dp);

	return nfp_net_ring_reconfig(nn, dp, NULL);

}



static void nfp_net_stat64(struct net_device *netdev,
@@ -2944,9 +2947,10 @@ static int nfp_net_xdp_offload(struct nfp_net *nn, struct bpf_prog *prog) 
	return ret;

}



static int nfp_net_xdp_setup(struct nfp_net *nn, struct bpf_prog *prog)

static int nfp_net_xdp_setup(struct nfp_net *nn, struct netdev_xdp *xdp)

{

	struct bpf_prog *old_prog = nn->dp.xdp_prog;

	struct bpf_prog *prog = xdp->prog;

	struct nfp_net_dp *dp;

	int err;
@@ -2969,7 +2973,7 @@ static int nfp_net_xdp_setup(struct nfp_net *nn, struct bpf_prog *prog) 
	dp->rx_dma_off = prog ? XDP_PACKET_HEADROOM - nn->dp.rx_offset : 0;



	/* We need RX reconfig to remap the buffers (BIDIR vs FROM_DEV) */

	err = nfp_net_ring_reconfig(nn, dp);

	err = nfp_net_ring_reconfig(nn, dp, xdp->extack);

	if (err)

		return err;
@@ -2987,7 +2991,7 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_xdp *xdp) 


	switch (xdp->command) {

	case XDP_SETUP_PROG:

		return nfp_net_xdp_setup(nn, xdp->prog);

		return nfp_net_xdp_setup(nn, xdp);

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!nn->dp.xdp_prog;

		return 0;

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int nfp_net_set_ring_size(struct nfp_net *nn, u32 rxd_cnt, u32 txd_cnt) 
	dp->rxd_cnt = rxd_cnt;

	dp->txd_cnt = txd_cnt;



	return nfp_net_ring_reconfig(nn, dp);

	return nfp_net_ring_reconfig(nn, dp, NULL);

}



static int nfp_net_set_ringparam(struct net_device *netdev,
@@ -880,7 +880,7 @@ static int nfp_net_set_num_rings(struct nfp_net *nn, unsigned int total_rx, 
	if (dp->xdp_prog)

		dp->num_tx_rings += total_rx;



	return nfp_net_ring_reconfig(nn, dp);

	return nfp_net_ring_reconfig(nn, dp, NULL);

}



static int nfp_net_set_channels(struct net_device *netdev,

drivers/net/virtio_net.c

+7 −4
Original line number Diff line number Diff line
@@ -1878,7 +1878,8 @@ err: 
	return ret;

}



static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog)

static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,

			   struct netlink_ext_ack *extack)

{

	unsigned long int max_sz = PAGE_SIZE - sizeof(struct padded_vnet_hdr);

	struct virtnet_info *vi = netdev_priv(dev);
@@ -1890,16 +1891,17 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog) 
	    virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||

	    virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||

	    virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO)) {

		netdev_warn(dev, "can't set XDP while host is implementing LRO, disable LRO first\n");

		NL_SET_ERR_MSG(extack, "can't set XDP while host is implementing LRO, disable LRO first");

		return -EOPNOTSUPP;

	}



	if (vi->mergeable_rx_bufs && !vi->any_header_sg) {

		netdev_warn(dev, "XDP expects header/data in single page, any_header_sg required\n");

		NL_SET_ERR_MSG(extack, "XDP expects header/data in single page, any_header_sg required");

		return -EINVAL;

	}



	if (dev->mtu > max_sz) {

		NL_SET_ERR_MSG(extack, "MTU too large to enable XDP");

		netdev_warn(dev, "XDP requires MTU less than %lu\n", max_sz);

		return -EINVAL;

	}
@@ -1910,6 +1912,7 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog) 


	/* XDP requires extra queues for XDP_TX */

	if (curr_qp + xdp_qp > vi->max_queue_pairs) {

		NL_SET_ERR_MSG(extack, "Too few free TX rings available");

		netdev_warn(dev, "request %i queues but max is %i\n",

			    curr_qp + xdp_qp, vi->max_queue_pairs);

		return -ENOMEM;
@@ -1971,7 +1974,7 @@ static int virtnet_xdp(struct net_device *dev, struct netdev_xdp *xdp) 
{

	switch (xdp->command) {

	case XDP_SETUP_PROG:

		return virtnet_xdp_set(dev, xdp->prog);

		return virtnet_xdp_set(dev, xdp->prog, xdp->extack);

	case XDP_QUERY_PROG:

		xdp->prog_attached = virtnet_xdp_query(dev);

		return 0;

include/linux/netdevice.h

+8 −2
Original line number Diff line number Diff line
@@ -813,11 +813,16 @@ enum xdp_netdev_command { 
	XDP_QUERY_PROG,

};



struct netlink_ext_ack;



struct netdev_xdp {

	enum xdp_netdev_command command;

	union {

		/* XDP_SETUP_PROG */

		struct {

			struct bpf_prog *prog;

			struct netlink_ext_ack *extack;

		};

		/* XDP_QUERY_PROG */

		bool prog_attached;

	};
@@ -3291,7 +3296,8 @@ int dev_get_phys_port_id(struct net_device *dev, 
int dev_get_phys_port_name(struct net_device *dev,

			   char *name, size_t len);

int dev_change_proto_down(struct net_device *dev, bool proto_down);

int dev_change_xdp_fd(struct net_device *dev, int fd, u32 flags);

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

		      int fd, u32 flags);

struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev);

struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,

				    struct netdev_queue *txq, int *ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE