From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Hutchings Subject: Re: [PATCH 3/3 v2] net/macb: Try to optimize struct macb layout Date: Mon, 17 Dec 2012 13:52:25 +0000 Message-ID: <1355752345.2676.2.camel@bwh-desktop.uk.solarflarecom.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: "David S. Miller" , , , , Joachim Eastwood , Jean-Christophe PLAGNIOL-VILLARD , Havard Skinnemoen To: Nicolas Ferre Return-path: Received: from webmail.solarflare.com ([12.187.104.25]:50240 "EHLO webmail.solarflare.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752961Ab2LQNwc (ORCPT ); Mon, 17 Dec 2012 08:52:32 -0500 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: On Mon, 2012-12-17 at 14:01 +0100, Nicolas Ferre wrote: > From: Havard Skinnemoen > > Move TX-related fields to the top of the struct so that they end up on > the same cache line. Move the NAPI struct below that since it is used > from the interrupt handler. RX-related fields go below those. > Move the spinlock before regs since they are usually used together. > > Signed-off-by: Havard Skinnemoen > [nicolas.ferre@atmel.com: adapt to newer kernel] > Signed-off-by: Nicolas Ferre > --- > drivers/net/ethernet/cadence/macb.h | 25 +++++++++++++------------ > 1 file changed, 13 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > index cef146f..aeeb729 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -548,38 +548,39 @@ struct macb_or_gem_ops { > }; > > struct macb { > + spinlock_t lock; > void __iomem *regs; > > + unsigned int tx_head; > + unsigned int tx_tail; > + struct macb_dma_desc *tx_ring; > + struct macb_tx_skb *tx_skb; > + dma_addr_t tx_ring_dma; > + struct work_struct tx_error_task; > + > + struct napi_struct napi; [...] If this driver may be used on SMP systems them 'napi' should be declared with the suffix ___cacheline_aligned_in_smp. Ben. -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.