On Fri, Sep 08, 2023 at 04:32:14PM +0200, Sebastian Andrzej Siewior wrote:
> 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@xxxxxxxxxxxxx>
> Cc: Arthur Kiyanovski <akiyano@xxxxxxxxxx>
> Cc: Clark Wang <xiaoning.wang@xxxxxxx>
> Cc: Claudiu Manoil <claudiu.manoil@xxxxxxx>
> Cc: David Arinzon <darinzon@xxxxxxxxxx>
> Cc: Edward Cree <ecree.xilinx@xxxxxxxxx>
> Cc: Felix Fietkau <nbd@xxxxxxxx>
> Cc: Grygorii Strashko <grygorii.strashko@xxxxxx>
> Cc: Ilias Apalodimas <ilias.apalodimas@xxxxxxxxxx>
> Cc: Jassi Brar <jaswinder.singh@xxxxxxxxxx>
> Cc: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
> Cc: John Crispin <john@xxxxxxxxxxx>
> Cc: Leon Romanovsky <leon@xxxxxxxxxx>
> Cc: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
> Cc: Louis Peens <louis.peens@xxxxxxxxxxxx>
> Cc: Marcin Wojtas <mw@xxxxxxxxxxxx>
> Cc: Mark Lee <Mark-MC.Lee@xxxxxxxxxxxx>
> Cc: Martin Habets <habetsm.xilinx@xxxxxxxxx>
> Cc: Matthias Brugger <matthias.bgg@xxxxxxxxx>
> Cc: NXP Linux Team <linux-imx@xxxxxxx>
> Cc: Noam Dagan <ndagan@xxxxxxxxxx>
> Cc: Russell King <linux@xxxxxxxxxxxxxxx>
> Cc: Saeed Bishara <saeedb@xxxxxxxxxx>
> Cc: Saeed Mahameed <saeedm@xxxxxxxxxx>
> Cc: Sean Wang <sean.wang@xxxxxxxxxxxx>
> Cc: Shay Agroskin <shayagr@xxxxxxxxxx>
> Cc: Shenwei Wang <shenwei.wang@xxxxxxx>
> Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx>
> Cc: Tony Nguyen <anthony.l.nguyen@xxxxxxxxx>
> Cc: Vladimir Oltean <vladimir.oltean@xxxxxxx>
> Cc: Wei Fang <wei.fang@xxxxxxx>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
For sfc drivers:
Acked-by: Martin Habets <habetsm.xilinx@xxxxxxxxx>
> ---
> drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
> drivers/net/ethernet/freescale/enetc/enetc.c | 2 +-
> drivers/net/ethernet/freescale/fec_main.c | 2 +-
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
> drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +-
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
> drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +-
> drivers/net/ethernet/marvell/mvneta.c | 2 +-
> drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +-
> drivers/net/ethernet/netronome/nfp/nfd3/xsk.c | 2 +-
> drivers/net/ethernet/sfc/efx_channels.c | 2 +-
> drivers/net/ethernet/sfc/siena/efx_channels.c | 2 +-
> drivers/net/ethernet/socionext/netsec.c | 2 +-
> drivers/net/ethernet/ti/cpsw_priv.c | 2 +-
> 16 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> index ad32ca81f7ef4..69bc8dfa7d71b 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> @@ -1828,7 +1828,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 35461165de0d2..30bec47bc665b 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
> @@ -1655,7 +1655,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
> 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 77c8e9cfb4456..b833467088811 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1832,7 +1832,7 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id)
> 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 0b3a27f118fb9..d680df615ff95 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> @@ -2405,7 +2405,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 c8322fb6f2b37..7e06373e14d98 100644
> --- 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 dd03b017dfc51..94bde2cad0f47 100644
> --- 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 1703c640a434d..59798bc33298f 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
> @@ -351,7 +351,7 @@ int ixgbe_clean_rx_irq_zc(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/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
> index d483b8c00ec0e..7b2aa30de8222 100644
> --- a/drivers/net/ethernet/marvell/mvneta.c
> +++ b/drivers/net/ethernet/marvell/mvneta.c
> @@ -2520,7 +2520,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
> 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 eb74ccddb4409..60c53f66935a6 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> @@ -4027,7 +4027,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi,
> }
>
> 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 6ad42e3b488f7..0b8ee35d713d1 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> @@ -2209,7 +2209,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
> net_dim(ð->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 12f56d0db0af2..cc3fcd24b36d6 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
> @@ -893,7 +893,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 5d9db8c2a5b43..45be6954d5aae 100644
> --- 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 8d2d7ea2ebefc..c9e17a8208a90 100644
> --- 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 1776f7f8a7a90..a7346e965bfe7 100644
> --- 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 f358ea0031936..b834b129639f0 100644
> --- 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 0ec85635dfd60..764ed298b5708 100644
> --- 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);
> --
> 2.40.1
>
