diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 0539b3661793..3cbedb8bad53 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1037,7 +1037,7 @@ static int veth_create_page_pool(struct veth_rq *rq)
return 0;
}
-static int __veth_napi_enable_range(struct net_device *dev, int start, int end)
+static int veth_napi_enable_range(struct net_device *dev, int start, int end)
{
struct veth_priv *priv = netdev_priv(dev);
int err, i;@@ -1056,6 +1056,9 @@ static int __veth_napi_enable_range(struct net_device *dev, int start, int end)
goto err_xdp_ring;
}
+ for (i = start; i < end; i++)
+ netif_napi_add(dev, &priv->rq[i].xdp_napi, veth_poll);
+
for (i = start; i < end; i++) {
struct veth_rq *rq = &priv->rq[i];
@@ -1079,9 +1082,9 @@ static int __veth_napi_enable_range(struct net_device *dev, int start, int end)
return err;
}
-static int __veth_napi_enable(struct net_device *dev)
+static int veth_napi_enable(struct net_device *dev)
{
- return __veth_napi_enable_range(dev, 0, dev->real_num_rx_queues);
+ return veth_napi_enable_range(dev, 0, dev->real_num_rx_queues);
}
static void veth_napi_del_range(struct net_device *dev, int start, int end)@@ -1122,8 +1125,7 @@ static bool veth_gro_requested(const struct net_device *dev)
return !!(dev->wanted_features & NETIF_F_GRO);
}
-static int veth_enable_xdp_range(struct net_device *dev, int start, int end,
- bool napi_already_on)
+static int veth_enable_xdp_range(struct net_device *dev, int start, int end)
{
struct veth_priv *priv = netdev_priv(dev);
int err, i;@@ -1131,9 +1133,7 @@ static int veth_enable_xdp_range(struct net_device *dev, int start, int end,
for (i = start; i < end; i++) {
struct veth_rq *rq = &priv->rq[i];
- if (!napi_already_on)
- netif_napi_add(dev, &rq->xdp_napi, veth_poll);
- err = xdp_rxq_info_reg(&rq->xdp_rxq, dev, i, rq->xdp_napi.napi_id);
+ err = xdp_rxq_info_reg(&rq->xdp_rxq, dev, i, 0);
if (err < 0)
goto err_rxq_reg;
@@ -1151,21 +1151,13 @@ static int veth_enable_xdp_range(struct net_device *dev, int start, int end,
err_reg_mem:
xdp_rxq_info_unreg(&priv->rq[i].xdp_rxq);
err_rxq_reg:
- if (!napi_already_on)
- netif_napi_del(&priv->rq[i].xdp_napi);
- for (i--; i >= start; i--) {
- struct veth_rq *rq = &priv->rq[i];
-
- xdp_rxq_info_unreg(&rq->xdp_rxq);
- if (!napi_already_on)
- netif_napi_del(&rq->xdp_napi);
- }
+ for (i--; i >= start; i--)
+ xdp_rxq_info_unreg(&priv->rq[i].xdp_rxq);
return err;
}
-static void veth_disable_xdp_range(struct net_device *dev, int start, int end,
- bool delete_napi)
+static void veth_disable_xdp_range(struct net_device *dev, int start, int end)
{
struct veth_priv *priv = netdev_priv(dev);
int i;@@ -1175,9 +1167,6 @@ static void veth_disable_xdp_range(struct net_device *dev, int start, int end,
rq->xdp_rxq.mem = rq->xdp_mem;
xdp_rxq_info_unreg(&rq->xdp_rxq);
-
- if (delete_napi)
- netif_napi_del(&rq->xdp_napi);
}
}
@@ -1188,14 +1177,15 @@ static int veth_enable_xdp(struct net_device *dev)
int err, i;
if (!xdp_rxq_info_is_reg(&priv->rq[0].xdp_rxq)) {
- err = veth_enable_xdp_range(dev, 0, dev->real_num_rx_queues, napi_already_on);
+ err = veth_enable_xdp_range(dev, 0, dev->real_num_rx_queues);
if (err)
return err;
if (!napi_already_on) {
- err = __veth_napi_enable(dev);
+ err = veth_napi_enable(dev);
if (err) {
- veth_disable_xdp_range(dev, 0, dev->real_num_rx_queues, true);
+ veth_disable_xdp_range(dev, 0,
+ dev->real_num_rx_queues);
return err;
}
}@@ -1220,35 +1210,7 @@ static void veth_disable_xdp(struct net_device *dev)
if (!netif_running(dev) || !veth_gro_requested(dev))
veth_napi_del(dev);
- veth_disable_xdp_range(dev, 0, dev->real_num_rx_queues, false);
-}
-
-static int veth_napi_enable_range(struct net_device *dev, int start, int end)
-{
- struct veth_priv *priv = netdev_priv(dev);
- int err, i;
-
- for (i = start; i < end; i++) {
- struct veth_rq *rq = &priv->rq[i];
-
- netif_napi_add(dev, &rq->xdp_napi, veth_poll);
- }
-
- err = __veth_napi_enable_range(dev, start, end);
- if (err) {
- for (i = start; i < end; i++) {
- struct veth_rq *rq = &priv->rq[i];
-
- netif_napi_del(&rq->xdp_napi);
- }
- return err;
- }
- return err;
-}
-
-static int veth_napi_enable(struct net_device *dev)
-{
- return veth_napi_enable_range(dev, 0, dev->real_num_rx_queues);
+ veth_disable_xdp_range(dev, 0, dev->real_num_rx_queues);
}
static void veth_disable_range_safe(struct net_device *dev, int start, int end)@@ -1260,7 +1222,7 @@ static void veth_disable_range_safe(struct net_device *dev, int start, int end)
if (priv->_xdp_prog) {
veth_napi_del_range(dev, start, end);
- veth_disable_xdp_range(dev, start, end, false);
+ veth_disable_xdp_range(dev, start, end);
} else if (veth_gro_requested(dev)) {
veth_napi_del_range(dev, start, end);
}@@ -1275,17 +1237,13 @@ static int veth_enable_range_safe(struct net_device *dev, int start, int end)
return 0;
if (priv->_xdp_prog) {
- /* these channels are freshly initialized, napi is not on there even
- * when GRO is requeste
- */
- err = veth_enable_xdp_range(dev, start, end, false);
+ err = veth_enable_xdp_range(dev, start, end);
if (err)
return err;
- err = __veth_napi_enable_range(dev, start, end);
+ err = veth_napi_enable_range(dev, start, end);
if (err) {
- /* on error always delete the newly added napis */
- veth_disable_xdp_range(dev, start, end, true);
+ veth_disable_xdp_range(dev, start, end);
return err;
}
} else if (veth_gro_requested(dev)) {--
2.56.0