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

Commit 99ffc5ad authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Alexei Starovoitov
Browse files

ixgbe: setup xdp_rxq_info 



Driver hook points for xdp_rxq_info:
 * reg  : ixgbe_setup_rx_resources()
 * unreg: ixgbe_free_rx_resources()

Tested on actual hardware.

V2: Fix ixgbe_set_ringparam, clear xdp_rxq_info in temp_ring

Cc: intel-wired-lan@lists.osuosl.org
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Alexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 87128824

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/dca.h>

#endif



#include <net/xdp.h>

#include <net/busy_poll.h>



/* common prefix used by pr_<> macros */
@@ -371,6 +372,7 @@ struct ixgbe_ring { 
		struct ixgbe_tx_queue_stats tx_stats;

		struct ixgbe_rx_queue_stats rx_stats;

	};

	struct xdp_rxq_info xdp_rxq;

} ____cacheline_internodealigned_in_smp;



enum ixgbe_ring_f_enum {

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

+4 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,10 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			memcpy(&temp_ring[i], adapter->rx_ring[i],

			       sizeof(struct ixgbe_ring));



			/* Clear copied XDP RX-queue info */

			memset(&temp_ring[i].xdp_rxq, 0,

			       sizeof(temp_ring[i].xdp_rxq));



			temp_ring[i].count = new_rx_count;

			err = ixgbe_setup_rx_resources(adapter, &temp_ring[i]);

			if (err) {

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

+9 −1
Original line number Diff line number Diff line
@@ -2318,12 +2318,14 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
#endif /* IXGBE_FCOE */

	u16 cleaned_count = ixgbe_desc_unused(rx_ring);

	bool xdp_xmit = false;

	struct xdp_buff xdp;



	xdp.rxq = &rx_ring->xdp_rxq;



	while (likely(total_rx_packets < budget)) {

		union ixgbe_adv_rx_desc *rx_desc;

		struct ixgbe_rx_buffer *rx_buffer;

		struct sk_buff *skb;

		struct xdp_buff xdp;

		unsigned int size;



		/* return some buffers to hardware, one at a time is too slow */
@@ -6444,6 +6446,11 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter, 
	rx_ring->next_to_clean = 0;

	rx_ring->next_to_use = 0;



	/* XDP RX-queue info */

	if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,

			     rx_ring->queue_index) < 0)

		goto err;



	rx_ring->xdp_prog = adapter->xdp_prog;



	return 0;
@@ -6541,6 +6548,7 @@ void ixgbe_free_rx_resources(struct ixgbe_ring *rx_ring) 
	ixgbe_clean_rx_ring(rx_ring);



	rx_ring->xdp_prog = NULL;

	xdp_rxq_info_unreg(&rx_ring->xdp_rxq);

	vfree(rx_ring->rx_buffer_info);

	rx_ring->rx_buffer_info = NULL;