Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad088ec4 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by David S. Miller
Browse files

ixgbe: split XDP_TX tail and XDP_REDIRECT map flushing 



The driver was combining the XDP_TX tail flush and XDP_REDIRECT
map flushing (xdp_do_flush_map).  This is suboptimal, these two
flush operations should be kept separate.

Fixes: 11393cc9 ("xdp: Add batching support to redirect map")
Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fec9d3b1

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+14 −10
Original line number Diff line number Diff line
@@ -2187,8 +2187,9 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring, 
}



#define IXGBE_XDP_PASS		0

#define IXGBE_XDP_CONSUMED 1

#define IXGBE_XDP_TX 2

#define IXGBE_XDP_CONSUMED	BIT(0)

#define IXGBE_XDP_TX		BIT(1)

#define IXGBE_XDP_REDIR		BIT(2)



static int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,

			       struct xdp_frame *xdpf);
@@ -2225,7 +2226,7 @@ static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter, 
	case XDP_REDIRECT:

		err = xdp_do_redirect(adapter->netdev, xdp, xdp_prog);

		if (!err)

			result = IXGBE_XDP_TX;

			result = IXGBE_XDP_REDIR;

		else

			result = IXGBE_XDP_CONSUMED;

		break;
@@ -2285,7 +2286,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
	unsigned int mss = 0;

#endif /* IXGBE_FCOE */

	u16 cleaned_count = ixgbe_desc_unused(rx_ring);

	bool xdp_xmit = false;

	unsigned int xdp_xmit = 0;

	struct xdp_buff xdp;



	xdp.rxq = &rx_ring->xdp_rxq;
@@ -2328,8 +2329,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
		}



		if (IS_ERR(skb)) {

			if (PTR_ERR(skb) == -IXGBE_XDP_TX) {

				xdp_xmit = true;

			unsigned int xdp_res = -PTR_ERR(skb);



			if (xdp_res & (IXGBE_XDP_TX | IXGBE_XDP_REDIR)) {

				xdp_xmit |= xdp_res;

				ixgbe_rx_buffer_flip(rx_ring, rx_buffer, size);

			} else {

				rx_buffer->pagecnt_bias++;
@@ -2401,7 +2404,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
		total_rx_packets++;

	}



	if (xdp_xmit) {

	if (xdp_xmit & IXGBE_XDP_REDIR)

		xdp_do_flush_map();



	if (xdp_xmit & IXGBE_XDP_TX) {

		struct ixgbe_ring *ring = adapter->xdp_ring[smp_processor_id()];



		/* Force memory writes to complete before letting h/w
@@ -2409,8 +2415,6 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
		 */

		wmb();

		writel(ring->next_to_use, ring->tail);



		xdp_do_flush_map();

	}



	u64_stats_update_begin(&rx_ring->syncp);