Skip to contentSkip to conversation

spidernet : fix memory leak in spider_net_stop

PATCH Applied Jens Osterkamp 4 participants 5 messages Feb 1, 2007 – Feb 8, 2007

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

PATCH 1/1 spidernet : fix memory leak in spider_net_stop

We forget to call spider_net_free_rx_chain_contents which does the actual dev_kfree_skb. New skbs are allocated from skbuff_head_cache on each "ifconfig up" letting the cache grow infinitely.

This patch fixes it.

drivers/net/spider_net.c +2 -0
Index: linux-2.6.20-rc6/drivers/net/spider_net.c
===================================================================
@@ -1925,6 +1925,8 @@ spider_net_stop(struct net_device *netde
 	/* release chains */
 	spider_net_release_tx_chain(card, 1);
 
+	spider_net_free_rx_chain_contents(card);
+
 	spider_net_free_chain(card, &card->tx_chain);
 	spider_net_free_chain(card, &card->rx_chain);
 
#1 lore raw

A variant of this patch is queued up for 2.6.21,
as a part of the patch
http://www.mail-archive.com/[email protected]/msg28213.html

I beleive its in the -mm tree, I have not checked.

--linas

Quoted 22 lines · Jens Osterkamp

We forget to call spider_net_free_rx_chain_contents which does the actual dev_kfree_skb. New skbs are allocated from skbuff_head_cache on each "ifconfig up" letting the cache grow infinitely.

This patch fixes it.

Index: linux-2.6.20-rc6/drivers/net/spider_net.c
===================================================================

drivers/net/spider_net.c +2 -0
@@ -1925,6 +1925,8 @@ spider_net_stop(struct net_device *netde
 	/* release chains */
 	spider_net_release_tx_chain(card, 1);
 
+	spider_net_free_rx_chain_contents(card);
+
 	spider_net_free_chain(card, &card->tx_chain);
 	spider_net_free_chain(card, &card->rx_chain);
 
#4 lore raw

Jeff-san,

Quoted 10 lines
Quoted 7 lines · Jens Osterkamp

We forget to call spider_net_free_rx_chain_contents which does the actual dev_kfree_skb. New skbs are allocated from skbuff_head_cache on each "ifconfig up" letting the cache grow infinitely.

This patch fixes it.

applied

This fix was applied twice to netdev-2.6.git#upstream. Because Linas-san's patch has been applied to netdev-2.6.git#upstream.

Best regards,
Kou Ishizaki