netdev: replace napi_reschedule with napi_schedule

Now that napi_schedule return a bool, we can drop napi_reschedule that
does the same exact function. The function comes from a very old commit
bfe13f54f502 ("ibm_emac: Convert to use napi_struct independent of struct
net_device") and the purpose is actually deprecated in favour of
different logic.

Convert every user of napi_reschedule to napi_schedule.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> # ath10k
Acked-by: Nick Child <nnac123@linux.ibm.com> # ibm
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for can/dev/rx-offload.c
Reviewed-by: Eric Dumazet <edumazet@google.com>
Acked-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20231009133754.9834-3-ansuelsmth@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index ed25061fac629ce13a3252192268fa6cff8676ce..7f84d9866ceffbf2c4a0ff454558a91b27bd9b29 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -488,7 +488,7 @@ poll_more:
                if (unlikely(ib_req_notify_cq(priv->recv_cq,
                                              IB_CQ_NEXT_COMP |
                                              IB_CQ_REPORT_MISSED_EVENTS)) &&
-                   napi_reschedule(napi))
+                   napi_schedule(napi))
                        goto poll_more;
        }
 
@@ -518,7 +518,7 @@ poll_more:
                napi_complete(napi);
                if (unlikely(ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP |
                                              IB_CQ_REPORT_MISSED_EVENTS)) &&
-                   napi_reschedule(napi))
+                   napi_schedule(napi))
                        goto poll_more;
        }
        return n < 0 ? 0 : n;

diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c
index 77091f7d1fa753c6668e334272baf544eae5a17f..46e7b6db4a1ef69aa26b445e057ac4bcab6f41ad 100644 (file)
--- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/dev/rx-offload.c
@@ -67,7 +67,7 @@ static int can_rx_offload_napi_poll(struct napi_struct *napi, int quota)
 
                /* Check if there was another interrupt */
                if (!skb_queue_empty(&offload->skb_queue))
-                       napi_reschedule(&offload->napi);
+                       napi_schedule(&offload->napi);
        }
 
        return work_done;

diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index 98dd78551d89a656544f2d6be753ef0ceb159232..b5ff2e1a9975f3828ec80975f6088b3b2a49bd76 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -4261,7 +4261,7 @@ static void sge_rx_timer_cb(struct timer_list *t)
 
                        if (fl_starving(adap, fl)) {
                                rxq = container_of(fl, struct sge_eth_rxq, fl);
-                               if (napi_reschedule(&rxq->rspq.napi))
+                               if (napi_schedule(&rxq->rspq.napi))
                                        fl->starving++;
                                else
                                        set_bit(id, s->starving_fl);

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index 2d0cf76fb3c5a8cef6294de9053a467d5ecebeaa..5b1d746e6563a205ae14c424d9e639fcc620c319 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -2094,7 +2094,7 @@ static void sge_rx_timer_cb(struct timer_list *t)
                                struct sge_eth_rxq *rxq;
 
                                rxq = container_of(fl, struct sge_eth_rxq, fl);
-                               if (napi_reschedule(&rxq->rspq.napi))
+                               if (napi_schedule(&rxq->rspq.napi))
                                        fl->starving++;
                                else
                                        set_bit(id, s->starving_fl);

diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index edf000e7bab452df501f0f6c60f734cea292f2a0..4d7184d46824b61c669fca4469a5539b1e5b9374 100644 (file)
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -198,7 +198,7 @@ static int nps_enet_poll(struct napi_struct *napi, int budget)
                 */
                if (nps_enet_is_tx_pending(priv)) {
                        nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE, 0);
-                       napi_reschedule(napi);
+                       napi_schedule(napi);
                }
        }
 

diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 83b09dcfafc4f906913dbc0d314d163c25a9d89e..276f996f95dcc8b6ab3c5eb51958b95c19e61dd2 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -281,7 +281,7 @@ static int gve_napi_poll(struct napi_struct *napi, int budget)
                if (block->rx)
                        reschedule |= gve_rx_work_pending(block->rx);
 
-               if (reschedule && napi_reschedule(napi))
+               if (reschedule && napi_schedule(napi))
                        iowrite32be(GVE_IRQ_MASK, irq_doorbell);
        }
        return work_done;

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 251dedd55cfb29b593786a0321ba7a7042b9d8ab..1e29e5c9a2dfbe7948885a2d64bfc8c687df9983 100644 (file)
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -900,7 +900,7 @@ static int ehea_poll(struct napi_struct *napi, int budget)
                if (!cqe && !cqe_skb)
                        return rx;
 
-               if (!napi_reschedule(napi))
+               if (!napi_schedule(napi))
                        return rx;
 
                cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);

diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 462646d1b817bf00aa44bc02989236242f7ea67c..2439f7e96e056ce187db09ded4a8e6db8a0d451a 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -442,7 +442,7 @@ static int mal_poll(struct napi_struct *napi, int budget)
                if (unlikely(mc->ops->peek_rx(mc->dev) ||
                             test_bit(MAL_COMMAC_RX_STOPPED, &mc->flags))) {
                        MAL_DBG2(mal, "rotting packet" NL);
-                       if (!napi_reschedule(napi))
+                       if (!napi_schedule(napi))
                                goto more_work;
 
                        spin_lock_irqsave(&mal->lock, flags);

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index a8d79ee350f8dacd623109eebdf5e1ccaea03c76..b5aef0b29efea9a76e0798520b1fa415c83fe0ab 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1432,7 +1432,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
                BUG_ON(lpar_rc != H_SUCCESS);
 
                if (ibmveth_rxq_pending_buffer(adapter) &&
-                   napi_reschedule(napi)) {
+                   napi_schedule(napi)) {
                        lpar_rc = h_vio_signal(adapter->vdev->unit_address,
                                               VIO_IRQ_DISABLE);
                }

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index cdf5251e567955f6755abbcf7d242fce59b01dd8..2094f413cbe4bd491bf3be6ef00a53b968ff0223 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3519,7 +3519,7 @@ restart_poll:
                if (napi_complete_done(napi, frames_processed)) {
                        enable_scrq_irq(adapter, rx_scrq);
                        if (pending_scrq(adapter, rx_scrq)) {
-                               if (napi_reschedule(napi)) {
+                               if (napi_schedule(napi)) {
                                        disable_scrq_irq(adapter, rx_scrq);
                                        goto restart_poll;
                                }

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 332472fe49902e3f5ee17faf8ca4b5bcd2ac4cf7..a09b6e05337d902c29da75df4d734435f1ae576d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -400,7 +400,7 @@ void mlx4_en_recover_from_oom(struct mlx4_en_priv *priv)
        for (ring = 0; ring < priv->rx_ring_num; ring++) {
                if (mlx4_en_is_ring_empty(priv->rx_ring[ring])) {
                        local_bh_disable();
-                       napi_reschedule(&priv->rx_cq[ring]->napi);
+                       napi_schedule(&priv->rx_cq[ring]->napi);
                        local_bh_enable();
                }
        }

diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index f71a4f8bbb89e6aafb8fd60c958322ba0a3c56fe..fa1f78b03cb2b94543cc34d96eb0ddf6a4b91a88 100644 (file)
--- a/drivers/net/ethernet/ni/nixge.c
+++ b/drivers/net/ethernet/ni/nixge.c
@@ -683,7 +683,7 @@ static int nixge_poll(struct napi_struct *napi, int budget)
                if (status & (XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK)) {
                        /* If there's more, reschedule, but clear */
                        nixge_dma_write_reg(priv, XAXIDMA_RX_SR_OFFSET, status);
-                       napi_reschedule(napi);
+                       napi_schedule(napi);
                } else {
                        /* if not, turn on RX IRQs again ... */
                        cr = nixge_dma_read_reg(priv, XAXIDMA_RX_CR_OFFSET);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
index f9e43fc32ee84f824afc4c6a5eeb4dc0b2039519..3ca1c2a816ff18e244990354b3a2f9ba5f37f4da 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
@@ -802,7 +802,7 @@ static int stmmac_test_flowctrl(struct stmmac_priv *priv)
                stmmac_start_rx(priv, priv->ioaddr, i);
 
                local_bh_disable();
-               napi_reschedule(&ch->rx_napi);
+               napi_schedule(&ch->rx_napi);
                local_bh_enable();
        }
 

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index c47108f2a0a01f903913f8e9f12a1e3e5ead657b..531bf919aef50943bb28b6e4e2c9cadff734305b 100644 (file)
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -723,9 +723,9 @@ static int eth_poll(struct napi_struct *napi, int budget)
                        napi_complete(napi);
                        qmgr_enable_irq(rxq);
                        if (!qmgr_stat_below_low_watermark(rxq) &&
-                           napi_reschedule(napi)) { /* not empty again */
+                           napi_schedule(napi)) { /* not empty again */
 #if DEBUG_RX
-                               netdev_debug(dev, "eth_poll napi_reschedule succeeded\n");
+                               netdev_debug(dev, "eth_poll napi_schedule succeeded\n");
 #endif
                                qmgr_disable_irq(rxq);
                                continue;

diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index 2513be6d4e11d19ca1c1975b7e529d9d8e7ebe6c..cd8cf08477ec8d474bf73b62b9a53f84f8bb9fe6 100644 (file)
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -1030,7 +1030,7 @@ static int fjes_poll(struct napi_struct *napi, int budget)
                }
 
                if (((long)jiffies - (long)adapter->rx_last_jiffies) < 3) {
-                       napi_reschedule(napi);
+                       napi_schedule(napi);
                } else {
                        spin_lock(&hw->rx_status_lock);
                        for (epidx = 0; epidx < hw->max_epid; epidx++) {

diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index e46b7f5ee49e2f0415233cdac96803f597a3bec0..b09f4c235142e0f6344b4781b06e994e2fcc89bf 100644 (file)
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -687,10 +687,10 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget)
                        napi_complete(napi);
                        qmgr_enable_irq(rxq);
                        if (!qmgr_stat_empty(rxq) &&
-                           napi_reschedule(napi)) {
+                           napi_schedule(napi)) {
 #if DEBUG_RX
                                printk(KERN_DEBUG "%s: hss_hdlc_poll"
-                                      " napi_reschedule succeeded\n",
+                                      " napi_schedule succeeded\n",
                                       dev->name);
 #endif
                                qmgr_disable_irq(rxq);

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 23f36622193908ef75d4368a96126db206100be0..2f8c785277af5e8e086cc1a353f9f8e2492034cd 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -3148,7 +3148,7 @@ static int ath10k_pci_napi_poll(struct napi_struct *ctx, int budget)
                 * immediate servicing.
                 */
                if (ath10k_ce_interrupt_summary(ar)) {
-                       napi_reschedule(ctx);
+                       napi_schedule(ctx);
                        goto out;
                }
                ath10k_pci_enable_legacy_irq(ar);

diff --git a/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c b/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c
index f4ff2198b5ef8153d341485f669585fb0fcffbf4..210d84c67ef9df78d8e53100b7c3052c0f8768f4 100644 (file)
--- a/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c
+++ b/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c
@@ -852,7 +852,7 @@ int t7xx_dpmaif_napi_rx_poll(struct napi_struct *napi, const int budget)
        if (!ret) {
                napi_complete_done(napi, work_done);
                rxq->sleep_lock_pending = true;
-               napi_reschedule(napi);
+               napi_schedule(napi);
                return work_done;
        }
 

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 2874770a0a74b976705ce2136dda641fd125ab59..ae553f8867967525c1290d42fc6fc3176c6150d4 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -516,16 +516,6 @@ static inline void napi_schedule_irqoff(struct napi_struct *n)
                __napi_schedule_irqoff(n);
 }
 
-/* Try to reschedule poll. Called by dev->poll() after napi_complete().  */
-static inline bool napi_reschedule(struct napi_struct *napi)
-{
-       if (napi_schedule_prep(napi)) {
-               __napi_schedule(napi);
-               return true;
-       }
-       return false;
-}
-
 /**
  * napi_complete_done - NAPI processing complete
  * @n: NAPI context