Skip to contentSkip to conversation

skbuff: remove unused dma_head & dma_maps fields

PATCH In review Jeff Kirsher 3 participants 3 messages Mar 24, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 skbuff: remove unused dma_head & dma_maps fields

From: Alexander Duyck <[email protected]>

The dma map fields in the skb_shared_info structure no longer has any users and can be dropped since it is making the skb_shared_info unecessarily larger.

Running slabtop show that we were using 4K slabs for the skb->head on x86_64 w/ an allocation size of 1522. It turns out that the dma_head and dma_maps array made skb_shared large enough that we had crossed over the 2k boundary with standard frames and as such we were using 4k blocks of memory for all skbs.

---

 include/linux/skbuff.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
include/linux/skbuff.h +0 -6
index 03f816a..124f90c 100644
@@ -190,9 +190,6 @@ struct skb_shared_info {
 	atomic_t	dataref;
 	unsigned short	nr_frags;
 	unsigned short	gso_size;
-#ifdef CONFIG_HAS_DMA
-	dma_addr_t	dma_head;
-#endif
 	/* Warning: this field is not always filled in (UFO)! */
 	unsigned short	gso_segs;
 	unsigned short  gso_type;
@@ -201,9 +198,6 @@ struct skb_shared_info {
 	struct sk_buff	*frag_list;
 	struct skb_shared_hwtstamps hwtstamps;
 	skb_frag_t	frags[MAX_SKB_FRAGS];
-#ifdef CONFIG_HAS_DMA
-	dma_addr_t	dma_maps[MAX_SKB_FRAGS];
-#endif
 	/* Intermediate layers must ensure that destructor_arg
 	 * remains valid until skb destructor */
 	void *		destructor_arg;
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Jeff Kirsher

From: Alexander Duyck <[email protected]>

The dma map fields in the skb_shared_info structure no longer has any users and can be dropped since it is making the skb_shared_info unecessarily larger.

Quoted 9 lines

Running slabtop show that we were using 4K slabs for the skb->head on x86_64 w/ an allocation size of 1522. It turns out that the dma_head and dma_maps array made skb_shared large enough that we had crossed over the 2k boundary with standard frames and as such we were using 4k blocks of memory for all skbs.

---

Thanks a lot for doing this cleanup !

maintainer
#2 lore raw

From: Eric Dumazet <[email protected]>
Date: Wed, 24 Mar 2010 07:48:06 +0100

Quoted 11 lines · Jeff Kirsher
Quoted 10 lines

From: Alexander Duyck <[email protected]>

The dma map fields in the skb_shared_info structure no longer has any users and can be dropped since it is making the skb_shared_info unecessarily larger.

Running slabtop show that we were using 4K slabs for the skb->head on x86_64 w/ an allocation size of 1522. It turns out that the dma_head and dma_maps array made skb_shared large enough that we had crossed over the 2k boundary with standard frames and as such we were using 4k blocks of memory for all skbs.

Quoted 8 lines
Quoted 4 lines

---

Thanks a lot for doing this cleanup !

Yep, thanks indeed. Applied!