netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next 0/2] bpf: Remove xdp_do_flush_map().
@ 2023-09-08 14:32 Sebastian Andrzej Siewior
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Sebastian Andrzej Siewior @ 2023-09-08 14:32 UTC (permalink / raw)
  To: netdev, bpf
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner

Hi,

#1 is a s/xdp_do_flush_map/xdp_do_flush/ on all drivers.
#2 follows as the removal of xdp_do_flush_map from the API.

I had #1 split in several patches per vendor and then decided to merge
it. I can repost it with one patch per vendor if this preferred.

Sebastian



^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
  2023-09-08 14:32 [PATCH net-next 0/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
@ 2023-09-08 14:32 ` Sebastian Andrzej Siewior
  2023-09-10  7:43   ` Kiyanovski, Arthur
                     ` (4 more replies)
  2023-09-08 14:32 ` [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
  2023-10-03 14:40 ` [PATCH net-next 0/2] " patchwork-bot+netdevbpf
  2 siblings, 5 replies; 11+ messages in thread
From: Sebastian Andrzej Siewior @ 2023-09-08 14:32 UTC (permalink / raw)
  To: netdev, bpf
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	Sebastian Andrzej Siewior, AngeloGioacchino Del Regno,
	Arthur Kiyanovski, Clark Wang, Claudiu Manoil, David Arinzon,
	Edward Cree, Felix Fietkau, Grygorii Strashko, Ilias Apalodimas,
	Jassi Brar, Jesse Brandeburg, John Crispin, Leon Romanovsky,
	Lorenzo Bianconi, Louis Peens, Marcin Wojtas, Mark Lee,
	Martin Habets, Matthias Brugger, NXP Linux Team, Noam Dagan,
	Russell King, Saeed Bishara, Saeed Mahameed, Sean Wang,
	Shay Agroskin, Shenwei Wang, Thomas Petazzoni, Tony Nguyen,
	Vladimir Oltean, Wei Fang

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: Arthur Kiyanovski <akiyano@amazon.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: Ilias Apalodimas <ilias.apalodimas@linaro.org>
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: Martin Habets <habetsm.xilinx@gmail.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>
---
 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(&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 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


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map().
  2023-09-08 14:32 [PATCH net-next 0/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
@ 2023-09-08 14:32 ` Sebastian Andrzej Siewior
  2023-09-11  9:20   ` Toke Høiland-Jørgensen
  2023-09-12 10:23   ` Jesper Dangaard Brouer
  2023-10-03 14:40 ` [PATCH net-next 0/2] " patchwork-bot+netdevbpf
  2 siblings, 2 replies; 11+ messages in thread
From: Sebastian Andrzej Siewior @ 2023-09-08 14:32 UTC (permalink / raw)
  To: netdev, bpf
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	Sebastian Andrzej Siewior

xdp_do_flush_map() can be removed because there is no more user in tree.

Remove xdp_do_flush_map().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 include/linux/filter.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 761af6b3cf2bc..2befb522d8565 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -981,12 +981,6 @@ int xdp_do_redirect_frame(struct net_device *dev,
 			  struct bpf_prog *prog);
 void xdp_do_flush(void);
 
-/* The xdp_do_flush_map() helper has been renamed to drop the _map suffix, as
- * it is no longer only flushing maps. Keep this define for compatibility
- * until all drivers are updated - do not use xdp_do_flush_map() in new code!
- */
-#define xdp_do_flush_map xdp_do_flush
-
 void bpf_warn_invalid_xdp_action(struct net_device *dev, struct bpf_prog *prog, u32 act);
 
 #ifdef CONFIG_INET
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* RE: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
@ 2023-09-10  7:43   ` Kiyanovski, Arthur
  2023-09-11  9:20   ` Toke Høiland-Jørgensen
                     ` (3 subsequent siblings)
  4 siblings, 0 replies; 11+ messages in thread
From: Kiyanovski, Arthur @ 2023-09-10  7:43 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior, netdev@vger.kernel.org,
	bpf@vger.kernel.org
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	AngeloGioacchino Del Regno, Clark Wang, Claudiu Manoil,
	Arinzon, David, Edward Cree, Felix Fietkau, Grygorii Strashko,
	Ilias Apalodimas, Jassi Brar, Jesse Brandeburg, John Crispin,
	Leon Romanovsky, Lorenzo Bianconi, Louis Peens, Marcin Wojtas,
	Mark Lee, Martin Habets, Matthias Brugger, NXP Linux Team,
	Dagan, Noam, Russell King, Bshara, Saeed, Saeed Mahameed,
	Sean Wang, Agroskin, Shay, Shenwei Wang, Thomas Petazzoni,
	Tony Nguyen, Vladimir Oltean, Wei Fang



> -----Original Message-----
> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> Sent: Friday, September 8, 2023 5:32 PM
> To: netdev@vger.kernel.org; bpf@vger.kernel.org
> Cc: David S. Miller <davem@davemloft.net>; Alexei Starovoitov
> <ast@kernel.org>; Daniel Borkmann <daniel@iogearbox.net>; Eric Dumazet
> <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Jesper
> Dangaard Brouer <hawk@kernel.org>; John Fastabend
> <john.fastabend@gmail.com>; Paolo Abeni <pabeni@redhat.com>; Thomas
> Gleixner <tglx@linutronix.de>; Sebastian Andrzej Siewior
> <bigeasy@linutronix.de>; AngeloGioacchino Del Regno
> <angelogioacchino.delregno@collabora.com>; Kiyanovski, Arthur
> <akiyano@amazon.com>; Clark Wang <xiaoning.wang@nxp.com>; Claudiu
> Manoil <claudiu.manoil@nxp.com>; Arinzon, David
> <darinzon@amazon.com>; Edward Cree <ecree.xilinx@gmail.com>; Felix
> Fietkau <nbd@nbd.name>; Grygorii Strashko <grygorii.strashko@ti.com>;
> Ilias Apalodimas <ilias.apalodimas@linaro.org>; Jassi Brar
> <jaswinder.singh@linaro.org>; Jesse Brandeburg
> <jesse.brandeburg@intel.com>; John Crispin <john@phrozen.org>; Leon
> Romanovsky <leon@kernel.org>; Lorenzo Bianconi <lorenzo@kernel.org>;
> Louis Peens <louis.peens@corigine.com>; Marcin Wojtas
> <mw@semihalf.com>; Mark Lee <Mark-MC.Lee@mediatek.com>; Martin
> Habets <habetsm.xilinx@gmail.com>; Matthias Brugger
> <matthias.bgg@gmail.com>; NXP Linux Team <linux-imx@nxp.com>; Dagan,
> Noam <ndagan@amazon.com>; Russell King <linux@armlinux.org.uk>;
> Bshara, Saeed <saeedb@amazon.com>; Saeed Mahameed
> <saeedm@nvidia.com>; Sean Wang <sean.wang@mediatek.com>; Agroskin,
> Shay <shayagr@amazon.com>; Shenwei Wang <shenwei.wang@nxp.com>;
> Thomas Petazzoni <thomas.petazzoni@bootlin.com>; Tony Nguyen
> <anthony.l.nguyen@intel.com>; Vladimir Oltean
> <vladimir.oltean@nxp.com>; Wei Fang <wei.fang@nxp.com>
> Subject: [EXTERNAL] [PATCH net-next 1/2] net: Tree wide: Replace
> xdp_do_flush_map() with xdp_do_flush().
> 
> CAUTION: This email originated from outside of the organization. Do not click
> links or open attachments unless you can confirm the sender and know the
> content is safe.
> 
> 
> 
> 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: Arthur Kiyanovski <akiyano@amazon.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: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> 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: Martin Habets <habetsm.xilinx@gmail.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>
> ---
>  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(&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 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

Thanks for submitting this change.

Acked-by: Arthur Kiyanovski <akiyano@amazon.com>


^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
  2023-09-10  7:43   ` Kiyanovski, Arthur
@ 2023-09-11  9:20   ` Toke Høiland-Jørgensen
  2023-09-12  6:33   ` Ilias Apalodimas
                     ` (2 subsequent siblings)
  4 siblings, 0 replies; 11+ messages in thread
From: Toke Høiland-Jørgensen @ 2023-09-11  9:20 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior, netdev, bpf

Sebastian Andrzej Siewior <bigeasy@linutronix.de> writes:

> 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: Arthur Kiyanovski <akiyano@amazon.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: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> 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: Martin Habets <habetsm.xilinx@gmail.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>

Thank you for doing this cleanup!

Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>


^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map().
  2023-09-08 14:32 ` [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
@ 2023-09-11  9:20   ` Toke Høiland-Jørgensen
  2023-09-12 10:23   ` Jesper Dangaard Brouer
  1 sibling, 0 replies; 11+ messages in thread
From: Toke Høiland-Jørgensen @ 2023-09-11  9:20 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior, netdev, bpf
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	Sebastian Andrzej Siewior

Sebastian Andrzej Siewior <bigeasy@linutronix.de> writes:

> xdp_do_flush_map() can be removed because there is no more user in tree.
>
> Remove xdp_do_flush_map().
>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>


^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
  2023-09-10  7:43   ` Kiyanovski, Arthur
  2023-09-11  9:20   ` Toke Høiland-Jørgensen
@ 2023-09-12  6:33   ` Ilias Apalodimas
  2023-09-12  8:03   ` Martin Habets
  2023-09-12 10:25   ` Jesper Dangaard Brouer
  4 siblings, 0 replies; 11+ messages in thread
From: Ilias Apalodimas @ 2023-09-12  6:33 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior
  Cc: netdev, bpf, David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	AngeloGioacchino Del Regno, Arthur Kiyanovski, Clark Wang,
	Claudiu Manoil, David Arinzon, Edward Cree, Felix Fietkau,
	Grygorii Strashko, Jassi Brar, Jesse Brandeburg, John Crispin,
	Leon Romanovsky, Lorenzo Bianconi, Louis Peens, Marcin Wojtas,
	Mark Lee, Martin Habets, Matthias Brugger, NXP Linux Team,
	Noam Dagan, Russell King, Saeed Bishara, Saeed Mahameed,
	Sean Wang, Shay Agroskin, Shenwei Wang, Thomas Petazzoni,
	Tony Nguyen, Vladimir Oltean, Wei Fang

Thanks Sebastian

On Fri, 8 Sept 2023 at 17:32, Sebastian Andrzej Siewior
<bigeasy@linutronix.de> 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@collabora.com>
> Cc: Arthur Kiyanovski <akiyano@amazon.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: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> 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: Martin Habets <habetsm.xilinx@gmail.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>
> ---
>  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(&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 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
>

For the socionext netsec part
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
                     ` (2 preceding siblings ...)
  2023-09-12  6:33   ` Ilias Apalodimas
@ 2023-09-12  8:03   ` Martin Habets
  2023-09-12 10:25   ` Jesper Dangaard Brouer
  4 siblings, 0 replies; 11+ messages in thread
From: Martin Habets @ 2023-09-12  8:03 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior
  Cc: netdev, bpf, David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	AngeloGioacchino Del Regno, Arthur Kiyanovski, Clark Wang,
	Claudiu Manoil, David Arinzon, Edward Cree, Felix Fietkau,
	Grygorii Strashko, Ilias Apalodimas, Jassi Brar, Jesse Brandeburg,
	John Crispin, Leon Romanovsky, Lorenzo Bianconi, Louis Peens,
	Marcin Wojtas, Mark Lee, Matthias Brugger, NXP Linux Team,
	Noam Dagan, Russell King, Saeed Bishara, Saeed Mahameed,
	Sean Wang, Shay Agroskin, Shenwei Wang, Thomas Petazzoni,
	Tony Nguyen, Vladimir Oltean, Wei Fang

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@collabora.com>
> Cc: Arthur Kiyanovski <akiyano@amazon.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: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> 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: Martin Habets <habetsm.xilinx@gmail.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>

For sfc drivers:
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>

> ---
>  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(&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 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
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map().
  2023-09-08 14:32 ` [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
  2023-09-11  9:20   ` Toke Høiland-Jørgensen
@ 2023-09-12 10:23   ` Jesper Dangaard Brouer
  1 sibling, 0 replies; 11+ messages in thread
From: Jesper Dangaard Brouer @ 2023-09-12 10:23 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior, netdev, bpf
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner



On 08/09/2023 16.32, Sebastian Andrzej Siewior wrote:
> xdp_do_flush_map() can be removed because there is no more user in tree.
> 
> Remove xdp_do_flush_map().
> 
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---

Thanks for cleaning up :-)

Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
                     ` (3 preceding siblings ...)
  2023-09-12  8:03   ` Martin Habets
@ 2023-09-12 10:25   ` Jesper Dangaard Brouer
  4 siblings, 0 replies; 11+ messages in thread
From: Jesper Dangaard Brouer @ 2023-09-12 10:25 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior, netdev, bpf
  Cc: David S. Miller, Alexei Starovoitov, Daniel Borkmann,
	Eric Dumazet, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Paolo Abeni, Thomas Gleixner,
	AngeloGioacchino Del Regno, Arthur Kiyanovski, Clark Wang,
	Claudiu Manoil, David Arinzon, Edward Cree, Felix Fietkau,
	Grygorii Strashko, Ilias Apalodimas, Jassi Brar, Jesse Brandeburg,
	John Crispin, Leon Romanovsky, Lorenzo Bianconi, Louis Peens,
	Marcin Wojtas, Mark Lee, Martin Habets, Matthias Brugger,
	NXP Linux Team, Noam Dagan, Russell King, Saeed Bishara,
	Saeed Mahameed, Sean Wang, Shay Agroskin, Shenwei Wang,
	Thomas Petazzoni, Tony Nguyen, Vladimir Oltean, Wei Fang



On 08/09/2023 16.32, 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().
> 
[...]
> Signed-off-by: Sebastian Andrzej Siewior<bigeasy@linutronix.de>
> ---
>   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(-)

Happy to see this cleanup across all drivers.

Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/2] bpf: Remove xdp_do_flush_map().
  2023-09-08 14:32 [PATCH net-next 0/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
  2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
  2023-09-08 14:32 ` [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
@ 2023-10-03 14:40 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 11+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-03 14:40 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior
  Cc: netdev, bpf, davem, ast, daniel, edumazet, kuba, hawk,
	john.fastabend, pabeni, tglx

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Fri,  8 Sep 2023 16:32:13 +0200 you wrote:
> Hi,
> 
> #1 is a s/xdp_do_flush_map/xdp_do_flush/ on all drivers.
> #2 follows as the removal of xdp_do_flush_map from the API.
> 
> I had #1 split in several patches per vendor and then decided to merge
> it. I can repost it with one patch per vendor if this preferred.
> 
> [...]

Here is the summary with links:
  - [net-next,1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().
    https://git.kernel.org/netdev/net-next/c/7f04bd109d4c
  - [net-next,2/2] bpf: Remove xdp_do_flush_map().
    https://git.kernel.org/netdev/net-next/c/75cec20345fa

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-10-03 14:40 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-08 14:32 [PATCH net-next 0/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
2023-09-08 14:32 ` [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush() Sebastian Andrzej Siewior
2023-09-10  7:43   ` Kiyanovski, Arthur
2023-09-11  9:20   ` Toke Høiland-Jørgensen
2023-09-12  6:33   ` Ilias Apalodimas
2023-09-12  8:03   ` Martin Habets
2023-09-12 10:25   ` Jesper Dangaard Brouer
2023-09-08 14:32 ` [PATCH net-next 2/2] bpf: Remove xdp_do_flush_map() Sebastian Andrzej Siewior
2023-09-11  9:20   ` Toke Høiland-Jørgensen
2023-09-12 10:23   ` Jesper Dangaard Brouer
2023-10-03 14:40 ` [PATCH net-next 0/2] " patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).