Commit e6435973 authored Oct 03, 2023 by Jakub Kicinski

Merge branch 'bpf-remove-xdp_do_flush_map'

Sebastian Andrzej Siewior says:

====================
bpf: Remove xdp_do_flush_map().

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.
====================

Link: https://lore.kernel.org/r/20230908143215.869913-1-bigeasy@linutronix.de


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 788f63c4 75cec203

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/ethernet/freescale/enetc/enetc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/net/ethernet/freescale/fec_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 =

drivers/net/ethernet/intel/ice/ice_txrx_lib.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))