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

nfp: move tx_ring->qcidx into cold data 



QCidx is not used on fast path, move it to the lower cacheline.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarFei Qin <fei.qin@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6488c49

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

+5 −2
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ struct nfp_nfd3_tx_buf; 
 * struct nfp_net_tx_ring - TX ring structure

 * @r_vec:      Back pointer to ring vector structure

 * @idx:        Ring index from Linux's perspective

 * @qcidx:      Queue Controller Peripheral (QCP) queue index for the TX queue

 * @qcp_q:      Pointer to base of the QCP TX queue

 * @cnt:        Size of the queue in number of descriptors

 * @wr_p:       TX ring write pointer (free running)
@@ -135,6 +134,8 @@ struct nfp_nfd3_tx_buf; 
 *		(used for .xmit_more delayed kick)

 * @txbufs:     Array of transmitted TX buffers, to free on transmit

 * @txds:       Virtual address of TX ring in host memory

 *

 * @qcidx:      Queue Controller Peripheral (QCP) queue index for the TX queue

 * @dma:        DMA address of the TX ring

 * @size:       Size, in bytes, of the TX ring (needed to free)

 * @is_xdp:	Is this a XDP TX ring?
@@ -143,7 +144,6 @@ struct nfp_net_tx_ring { 
	struct nfp_net_r_vector *r_vec;



	u32 idx;

	int qcidx;

	u8 __iomem *qcp_q;



	u32 cnt;
@@ -156,6 +156,9 @@ struct nfp_net_tx_ring { 
	struct nfp_nfd3_tx_buf *txbufs;

	struct nfp_nfd3_tx_desc *txds;



	/* Cold data follows */

	int qcidx;



	dma_addr_t dma;

	size_t size;

	bool is_xdp;