net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().

[ Upstream commit 7f04bd109d4c358a12b125bc79a6f0eac2e915ec ]

xdp_do_flush_map() is deprecated and new code should use xdp_do_flush()
instead.

Replace xdp_do_flush_map() with xdp_do_flush().

Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Cc: Clark Wang <xiaoning.wang@nxp.com>
Cc: Claudiu Manoil <claudiu.manoil@nxp.com>
Cc: David Arinzon <darinzon@amazon.com>
Cc: Edward Cree <ecree.xilinx@gmail.com>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: John Crispin <john@phrozen.org>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: Louis Peens <louis.peens@corigine.com>
Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Mark Lee <Mark-MC.Lee@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Noam Dagan <ndagan@amazon.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Saeed Bishara <saeedb@amazon.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: Shay Agroskin <shayagr@amazon.com>
Cc: Shenwei Wang <shenwei.wang@nxp.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Vladimir Oltean <vladimir.oltean@nxp.com>
Cc: Wei Fang <wei.fang@nxp.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Arthur Kiyanovski <akiyano@amazon.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>
Link: https://lore.kernel.org/r/20230908143215.869913-2-bigeasy@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 50bd33f6b392 ("net: enetc: fix the deadlock of enetc_mdio_lock")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 0d201a57d7e29e2175269f4c6818396b655697e1..dd9c50d3ec0f03cdc4aa6ec6dc0140d9e58db3a5 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -1310,7 +1310,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,
        }
 
        if (xdp_flags & ENA_XDP_REDIRECT)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        return work_done;
 

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 0c09d82dbf00d417939f7a48fb326c2561935eab..49c61aa920b021103ea27c78d9689304d944666d 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1713,7 +1713,7 @@ out:
        rx_ring->stats.bytes += rx_byte_cnt;
 
        if (xdp_redirect_frm_cnt)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (xdp_tx_frm_cnt)
                enetc_update_tx_ring_tail(tx_ring);

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 8352d9b6469f2a6bdf5ae16f36b87c6d5456120f..64cd72c1947837bbf797ce9d45905698427df054 100644 (file)
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1904,7 +1904,7 @@ rx_processing_done:
        rxq->bd.cur = bdp;
 
        if (xdp_result & FEC_ENET_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        return pkt_received;
 }

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 6a9b47b005d29b0735afafa1f48c56bb2e20b470..99604379c87b6ca700c746bc41a311c64f857547 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2398,7 +2398,7 @@ void i40e_update_rx_stats(struct i40e_ring *rx_ring,
 void i40e_finalize_xdp_rx(struct i40e_ring *rx_ring, unsigned int xdp_res)
 {
        if (xdp_res & I40E_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (xdp_res & I40E_XDP_TX) {
                struct i40e_ring *xdp_ring =

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
index c8322fb6f2b37f710e3da7119c70d60ef61365e1..7e06373e14d98e2002d4e366f3277501e3a2c74a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
@@ -450,7 +450,7 @@ void ice_finalize_xdp_rx(struct ice_tx_ring *xdp_ring, unsigned int xdp_res,
        struct ice_tx_buf *tx_buf = &xdp_ring->tx_buf[first_idx];
 
        if (xdp_res & ICE_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (xdp_res & ICE_XDP_TX) {
                if (static_branch_unlikely(&ice_xdp_locking_key))

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index f245f3df40fcacca3e63e24fcfc1738c0dda484c..99876b765b08bc94e9ba1673205f56e9d140a49d 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2421,7 +2421,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
        }
 
        if (xdp_xmit & IXGBE_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (xdp_xmit & IXGBE_XDP_TX) {
                struct ixgbe_ring *ring = ixgbe_determine_xdp_ring(adapter);

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
index 7ef82c30e8571276f11de436c822b37d21fe1207..9fdd19acf2242f2d78bc5783e391ddd60b465800 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@ -351,7 +351,7 @@ construct_skb:
        }
 
        if (xdp_xmit & IXGBE_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (xdp_xmit & IXGBE_XDP_TX) {
                struct ixgbe_ring *ring = ixgbe_determine_xdp_ring(adapter);

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 165f76d1231c1918f1d1743ce9d61a9b646911de..2941721b65152e8d6f5511f3e78a62802a438f72 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2520,7 +2520,7 @@ next:
                mvneta_xdp_put_buff(pp, rxq, &xdp_buf, -1);
 
        if (ps.xdp_redirect)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (ps.rx_packets)
                mvneta_update_stats(pp, &ps);

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index fce57faf345ce4c5664a14a67b29421c5bc950f2..aabc39f7690f8e290c680b8637e3b6846431543b 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4055,7 +4055,7 @@ err_drop_frame:
        }
 
        if (xdp_ret & MVPP2_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (ps.rx_packets) {
                struct mvpp2_pcpu_stats *stats = this_cpu_ptr(port->stats);

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index aefe2af6f01d41162e6eb50206b400e4c0a5f71a..c843e6531449ba96f754a4a3f5381a97757cf9ef 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2221,7 +2221,7 @@ rx_done:
        net_dim(&eth->rx_dim, dim_sample);
 
        if (xdp_flush)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        return done;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
index b723ff5e5249cfbcf1a1c4c4a6f6597360b9a1c5..13c7ed1bb37e9363721726f3881dfc96cbc9b9fc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
@@ -895,7 +895,7 @@ void mlx5e_xdp_rx_poll_complete(struct mlx5e_rq *rq)
        mlx5e_xmit_xdp_doorbell(xdpsq);
 
        if (test_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq->flags)) {
-               xdp_do_flush_map();
+               xdp_do_flush();
                __clear_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq->flags);
        }
 }

diff --git a/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c b/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c
index 5d9db8c2a5b437c5e2032e4a17d055bf620d9c82..45be6954d5aaea21406a3335354520946d0deafa 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c
+++ b/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c
@@ -256,7 +256,7 @@ nfp_nfd3_xsk_rx(struct nfp_net_rx_ring *rx_ring, int budget,
        nfp_net_xsk_rx_ring_fill_freelist(r_vec->rx_ring);
 
        if (xdp_redir)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (tx_ring->wr_ptr_add)
                nfp_net_tx_xmit_more_flush(tx_ring);

diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c
index 8d2d7ea2ebefc6606488d7b57b3b093000e6126a..c9e17a8208a90177c45a507ee433a050f606aecd 100644 (file)
--- a/drivers/net/ethernet/sfc/efx_channels.c
+++ b/drivers/net/ethernet/sfc/efx_channels.c
@@ -1260,7 +1260,7 @@ static int efx_poll(struct napi_struct *napi, int budget)
 
        spent = efx_process_channel(channel, budget);
 
-       xdp_do_flush_map();
+       xdp_do_flush();
 
        if (spent < budget) {
                if (efx_channel_has_rx_queue(channel) &&

diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.c b/drivers/net/ethernet/sfc/siena/efx_channels.c
index 1776f7f8a7a90ea4043086008847ab2a52c532d8..a7346e965bfe707813af40e35b67d69b64e82e5d 100644 (file)
--- a/drivers/net/ethernet/sfc/siena/efx_channels.c
+++ b/drivers/net/ethernet/sfc/siena/efx_channels.c
@@ -1285,7 +1285,7 @@ static int efx_poll(struct napi_struct *napi, int budget)
 
        spent = efx_process_channel(channel, budget);
 
-       xdp_do_flush_map();
+       xdp_do_flush();
 
        if (spent < budget) {
                if (efx_channel_has_rx_queue(channel) &&

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index f358ea003193698cb48ed0362be9e9f96e90d6db..b834b129639f0113c20428a00858c25350a8ec09 100644 (file)
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -780,7 +780,7 @@ static void netsec_finalize_xdp_rx(struct netsec_priv *priv, u32 xdp_res,
                                   u16 pkts)
 {
        if (xdp_res & NETSEC_XDP_REDIR)
-               xdp_do_flush_map();
+               xdp_do_flush();
 
        if (xdp_res & NETSEC_XDP_TX)
                netsec_xdp_ring_tx_db(priv, pkts);

diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c
index 0ec85635dfd60a2f169f2c6aab5222842f2d3ae5..764ed298b57081ae514ad6bb62323dbac7d598d3 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_priv.c
+++ b/drivers/net/ethernet/ti/cpsw_priv.c
@@ -1360,7 +1360,7 @@ int cpsw_run_xdp(struct cpsw_priv *priv, int ch, struct xdp_buff *xdp,
                 *  particular hardware is sharing a common queue, so the
                 *  incoming device might change per packet.
                 */
-               xdp_do_flush_map();
+               xdp_do_flush();
                break;
        default:
                bpf_warn_invalid_xdp_action(ndev, prog, act);