diff mbox series

[RFC,v2,2/6] ixgbe: use extack for xdp errors

Message ID 20190228215441.28275-3-stephen@networkplumber.org
State RFC
Delegated to: David Miller
Headers show
Series use extack when setting up XDP | expand

Commit Message

Stephen Hemminger Feb. 28, 2019, 9:54 p.m. UTC 
Give a reason for returning error for bpf setup.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a4e7584a50cb..d5bac44df793 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -10224,18 +10224,25 @@  ixgbe_features_check(struct sk_buff *skb, struct net_device *dev,
 	return features;
 }
 
-static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
+static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog,
+			   struct netlink_ext_ack *extack)
 {
 	int i, frame_size = dev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
 	struct ixgbe_adapter *adapter = netdev_priv(dev);
 	struct bpf_prog *old_prog;
 	bool need_reset;
 
-	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+		NL_SET_ERR_MSG_MOD(extack,
+				   "XDP not supported with SRIOV enabled");
 		return -EINVAL;
+	}
 
-	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
+	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+		NL_SET_ERR_MSG_MOD(extack,
+				   "XDP not supported with DCB enabled");
 		return -EINVAL;
+	}
 
 	/* verify ixgbe ring attributes are sufficient for XDP */
 	for (i = 0; i < adapter->num_rx_queues; i++) {
@@ -10244,12 +10251,17 @@  static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
 		if (ring_is_rsc_enabled(ring))
 			return -EINVAL;
 
-		if (frame_size > ixgbe_rx_bufsz(ring))
+		if (frame_size > ixgbe_rx_bufsz(ring)) {
+			NL_SET_ERR_MSG_MOD(extack,
+					   "XDP does not support multiple buffers");
 			return -EINVAL;
+		}
 	}
 
-	if (nr_cpu_ids > MAX_XDP_QUEUES)
+	if (nr_cpu_ids > MAX_XDP_QUEUES) {
+		NL_SET_ERR_MSG_MOD(extack, "number of cpus > MAX_XDP_QUEUES");
 		return -ENOMEM;
+	}
 
 	old_prog = xchg(&adapter->xdp_prog, prog);
 	need_reset = (!!prog != !!old_prog);
@@ -10260,7 +10272,7 @@  static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
 
 		if (err) {
 			rcu_assign_pointer(adapter->xdp_prog, old_prog);
-			return -EINVAL;
+			return err;
 		}
 	} else {
 		for (i = 0; i < adapter->num_rx_queues; i++)
@@ -10288,7 +10300,7 @@  static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp)
 
 	switch (xdp->command) {
 	case XDP_SETUP_PROG:
-		return ixgbe_xdp_setup(dev, xdp->prog);
+		return ixgbe_xdp_setup(dev, xdp->prog, xdp->extack);
 	case XDP_QUERY_PROG:
 		xdp->prog_id = adapter->xdp_prog ?
 			adapter->xdp_prog->aux->id : 0;
@@ -10298,6 +10310,7 @@  static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp)
 					    xdp->xsk.queue_id);
 
 	default:
+		NL_SET_ERR_MSG_MOD(xdp->extack, "Unknown XDP command");
 		return -EINVAL;
 	}
 }