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

Commit ecd63a02 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: add XDP support in the driver 



Add XDP support.  Separate stack's and XDP's TX rings logically.
Add functions for handling XDP_TX and cleanup of XDP's TX rings.
For XDP allocate all RX buffers as separate pages and map them
with DMA_BIDIRECTIONAL.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68f929ff

drivers/net/ethernet/netronome/nfp/nfp_net.h

+14 −3
Original line number Diff line number Diff line
@@ -171,7 +171,10 @@ struct nfp_net_tx_desc { 
 *		on the head's buffer). Equal to skb->len for non-TSO packets.

 */

struct nfp_net_tx_buf {

	union {

		struct sk_buff *skb;

		void *frag;

	};

	dma_addr_t dma_addr;

	short int fidx;

	u16 pkt_cnt;
@@ -341,6 +344,7 @@ struct nfp_net_rx_ring { 
 * @napi:           NAPI structure for this ring vec

 * @tx_ring:        Pointer to TX ring

 * @rx_ring:        Pointer to RX ring

 * @xdp_ring:	    Pointer to an extra TX ring for XDP

 * @irq_idx:        Index into MSI-X table

 * @rx_sync:	    Seqlock for atomic updates of RX stats

 * @rx_pkts:        Number of received packets
@@ -384,6 +388,8 @@ struct nfp_net_r_vector { 
	u64 hw_csum_rx_inner_ok;

	u64 hw_csum_rx_error;



	struct nfp_net_tx_ring *xdp_ring;



	struct u64_stats_sync tx_sync;

	u64 tx_pkts;

	u64 tx_bytes;
@@ -432,6 +438,7 @@ struct nfp_stat_pair { 
 * @ctrl:               Local copy of the control register/word.

 * @fl_bufsz:           Currently configured size of the freelist buffers

 * @rx_offset:		Offset in the RX buffers where packet data starts

 * @xdp_prog:		Installed XDP program

 * @cpp:                Pointer to the CPP handle

 * @nfp_dev_cpp:        Pointer to the NFP Device handle

 * @ctrl_area:          Pointer to the CPP area for the control BAR
@@ -451,6 +458,7 @@ struct nfp_stat_pair { 
 * @max_tx_rings:       Maximum number of TX rings supported by the Firmware

 * @max_rx_rings:       Maximum number of RX rings supported by the Firmware

 * @num_tx_rings:       Currently configured number of TX rings

 * @num_stack_tx_rings:	Number of TX rings used by the stack (not XDP)

 * @num_rx_rings:       Currently configured number of RX rings

 * @txd_cnt:            Size of the TX ring in number of descriptors

 * @rxd_cnt:            Size of the RX ring in number of descriptors
@@ -500,6 +508,8 @@ struct nfp_net { 


	u32 rx_offset;



	struct bpf_prog *xdp_prog;



	struct nfp_net_tx_ring *tx_rings;

	struct nfp_net_rx_ring *rx_rings;
@@ -532,6 +542,7 @@ struct nfp_net { 
	unsigned int max_rx_rings;



	unsigned int num_tx_rings;

	unsigned int num_stack_tx_rings;

	unsigned int num_rx_rings;



	int stride_tx;
@@ -779,8 +790,8 @@ void nfp_net_coalesce_write_cfg(struct nfp_net *nn); 
int nfp_net_irqs_alloc(struct nfp_net *nn);

void nfp_net_irqs_disable(struct nfp_net *nn);

int

nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_ring_set *rx,

		      struct nfp_net_ring_set *tx);

nfp_net_ring_reconfig(struct nfp_net *nn, struct bpf_prog **xdp_prog,

		      struct nfp_net_ring_set *rx, struct nfp_net_ring_set *tx);



#ifdef CONFIG_NFP_NET_DEBUG

void nfp_net_debugfs_create(void);