From: Jakub Kicinski Date: Mon, 21 Mar 2022 10:42:04 +0000 (+0100) Subject: nfp: move tx_ring->qcidx into cold data X-Git-Tag: v6.1-rc5~1746^2~26^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07cd69c96bff4edf5edcd17b5a821f63343bf9cc;p=platform%2Fkernel%2Flinux-starfive.git nfp: move tx_ring->qcidx into cold data QCidx is not used on fast path, move it to the lower cacheline. Signed-off-by: Jakub Kicinski Signed-off-by: Fei Qin Signed-off-by: Simon Horman Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index d4b82c8..4e288b8 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -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;