gianfar: reallocate skb when headroom is not enough for fcb
Subsystems (2)
Applied, thanks!
PATCH 1/1 gianfar: fix headroom expansion code
The code that was added to increase headroom was wrong. It doesn't handle the case where gfar_add_fcb() changes the skb. Better to do check at start of transmit (outside of lock), where error handling is better anyway.
drivers/net/gianfar.c +24 -22
@@ -1239,19 +1239,9 @@ static int gfar_enet_open(struct net_devreturn err; } -static inline struct txfcb *gfar_add_fcb (struct sk_buff **skbp) +static inline struct txfcb *gfar_add_fcb (struct sk_buff *skb) { -struct txfcb *fcb; -struct sk_buff *skb = *skbp; - -if (unlikely (skb_headroom (skb) <GMAC_FCB_LEN )) { -struct sk_buff *old_skb = skb; - skb =skb_realloc_headroom (old_skb,GMAC_FCB_LEN ); -if (!skb) -return NULL ; -dev_kfree_skb_any (old_skb); - } - fcb = (struct txfcb *)skb_push (skb,GMAC_FCB_LEN ); +struct txfcb *fcb = (struct txfcb *)skb_push (skb,GMAC_FCB_LEN );cacheable_memzero (fcb,GMAC_FCB_LEN );return fcb;
@@ -1320,6 +1310,20 @@ static int gfar_start_xmit(struct sk_buf base = priv->tx_bd_base; +/* make space for additional header */ +if (skb_headroom (skb) <GMAC_FCB_LEN ) { +struct sk_buff *skb_new; + + skb_new =skb_realloc_headroom (skb,GMAC_FCB_LEN ); +if (!skb_new) { + dev->stats.tx_errors++; +kfree (skb); +return NETDEV_TX_OK ; + } +kfree_skb (skb); + skb = skb_new; + } +/* total number of fragments in the SKB */ nr_frags =skb_shinfo (skb)->nr_frags;
@@ -1372,20 +1376,18 @@ static int gfar_start_xmit(struct sk_buf/* Set up checksumming */ if (CHECKSUM_PARTIAL == skb->ip_summed) { - fcb =gfar_add_fcb (&skb); -if (likely (fcb !=NULL )) { - lstatus |=BD_LFLAG (TXBD_TOE ); -gfar_tx_checksum (skb, fcb); - } + fcb =gfar_add_fcb (skb); + lstatus |=BD_LFLAG (TXBD_TOE ); +gfar_tx_checksum (skb, fcb); }if (priv->vlgrp &&vlan_tx_tag_present (skb)) { -if (unlikely (NULL == fcb)) - fcb =gfar_add_fcb (&skb); -if (likely (fcb !=NULL )) { +if (unlikely (NULL == fcb)) { + fcb =gfar_add_fcb (skb); lstatus |=BD_LFLAG (TXBD_TOE ); -gfar_tx_vlan (skb, fcb); } + +gfar_tx_vlan (skb, fcb); }/* setup the TxBD length and buffer pointer for the first BD */
@@ -1433,7 +1435,7 @@ static int gfar_start_xmit(struct sk_buf/* Unlock priv */ spin_unlock_irqrestore (&priv->txlock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* Stops the kernel queue, and halts the controller */
Re: [PATCH] gianfar: fix headroom expansion code
Quoted 2 lines · Stephen Hemminger
The code that was added to increase headroom was wrong. It doesn't handle the case where
gfar_add_fcb()changes the skb.
Oops. I messed up the pointer to pointer manipulating.
Quoted 38 lines
Better to do check at start of transmit (outside of lock), where error handling is better anyway.
Signed-off-by Stephen Hemminger <[email protected]>drivers/net/gianfar.c 2009-03-26 09:22:46.477545004 -0700 renamed from drivers/net/gianfar.c 2009-03-26 09:14:39.273669929 -0700 +6
-12@@ -1239,19 +1239,9 @@ static int gfar_enet_open(struct net_dev return err; } -static inline struct txfcb *gfar_add_fcb(struct sk_buff **skbp) +static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb) { - struct txfcb *fcb; - struct sk_buff *skb = *skbp; - - if (unlikely(skb_headroom(skb) < GMAC_FCB_LEN)) { - struct sk_buff *old_skb = skb; - skb = skb_realloc_headroom(old_skb, GMAC_FCB_LEN); - if (!skb) - return NULL; - dev_kfree_skb_any(old_skb); - } - fcb = (struct txfcb *)skb_push(skb, GMAC_FCB_LEN); + struct txfcb *fcb = (struct txfcb *)skb_push(skb, GMAC_FCB_LEN); cacheable_memzero(fcb, GMAC_FCB_LEN); return fcb;@@ -1320,6 +1310,20 @@ static int gfar_start_xmit(struct sk_buf base = priv->tx_bd_base; + /* make space for additional header */ + if (skb_headroom(skb) < GMAC_FCB_LEN) { + struct sk_buff *skb_new; +
drivers/net/gianfar.c 2009-03-26 09:22:46.477545004 -0700 static int gfar_start_xmit(struct sk_buf · line 1326
Quoted 10 lines
drivers/net/gianfar.c 2009-03-26 09:22:46.477545004 -0700 renamed from drivers/net/gianfar.c 2009-03-26 09:14:39.273669929 -0700 +10
-0+ skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN); + if (!skb_new) { + dev->stats.tx_errors++; + kfree(skb); + return NETDEV_TX_OK; + } + kfree_skb(skb); + skb = skb_new; + } +
We have legacy devices without the offloading feature. And we can even turn off the IP checksum offloading at runtime. Your code will cause unnecessary realloc for these cases.
I can propose a new patch to fix the pointer problem and add more error handling.
Quoted 40 lines
drivers/net/gianfar.c 2009-03-26 09:22:46.477545004 -0700 renamed from drivers/net/gianfar.c 2009-03-26 09:14:39.273669929 -0700 +8
-10/* total number of fragments in the SKB */ nr_frags = skb_shinfo(skb)->nr_frags;@@ -1372,20 +1376,18 @@ static int gfar_start_xmit(struct sk_buf /* Set up checksumming */ if (CHECKSUM_PARTIAL == skb->ip_summed) { - fcb = gfar_add_fcb(&skb); - if (likely(fcb != NULL)) { - lstatus |= BD_LFLAG(TXBD_TOE); - gfar_tx_checksum(skb, fcb); - } + fcb = gfar_add_fcb(skb); + lstatus |= BD_LFLAG(TXBD_TOE); + gfar_tx_checksum(skb, fcb); } if (priv->vlgrp && vlan_tx_tag_present(skb)) { - if (unlikely(NULL == fcb)) - fcb = gfar_add_fcb(&skb); - if (likely(fcb != NULL)) { + if (unlikely(NULL == fcb)) { + fcb = gfar_add_fcb(skb); lstatus |= BD_LFLAG(TXBD_TOE); - gfar_tx_vlan(skb, fcb); } + + gfar_tx_vlan(skb, fcb); } /* setup the TxBD length and buffer pointer for the first BD */@@ -1433,7 +1435,7 @@ static int gfar_start_xmit(struct sk_buf /* Unlock priv */ spin_unlock_irqrestore(&priv->txlock, flags); - return 0; + return NETDEV_TX_OK; } /* Stops the kernel queue, and halts the controller */
David Miller
maintainerRe: [PATCH] gianfar: fix headroom expansion code
From: Li Yang <[email protected]>
Date: Fri, 27 Mar 2009 12:26:33 +0800
Quoted 6 lines
We have legacy devices without the offloading feature. And we can even turn off the IP checksum offloading at runtime. Your code will cause unnecessary realloc for these cases.
I can propose a new patch to fix the pointer problem and add more error handling.
I'm applying Stephen's patch for now, please send any improvements relative to that.
Re: [PATCH] gianfar: fix headroom expansion code
Quoted 7 lines · David Miller
From: Li Yang <[email protected]>
Date: Fri, 27 Mar 2009 12:26:33 +0800Quoted 4 lines
We have legacy devices without the offloading feature. And we can even turn off the IP checksum offloading at runtime. Your code will cause unnecessary realloc for these cases.
Quoted 5 lines
Quoted 2 lines
I can propose a new patch to fix the pointer problem and add more error handling.
I'm applying Stephen's patch for now, please send any improvements relative to that.
Ok.
However is it ok to use kfree() instead of kfree_skb() in Stephen's patch?
+ skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN);
+ if (!skb_new) {
+ dev->stats.tx_errors++; + kfree(skb); + return NETDEV_TX_OK;
+ }
- Leo
David Miller
maintainerRe: [PATCH] gianfar: fix headroom expansion code
From: Li Yang <[email protected]>
Date: Fri, 27 Mar 2009 16:06:27 +0800
Quoted 18 lines · David Miller
Quoted 7 lines
From: Li Yang <[email protected]>
Date: Fri, 27 Mar 2009 12:26:33 +0800Quoted 4 lines
We have legacy devices without the offloading feature. And we can even turn off the IP checksum offloading at runtime. Your code will cause unnecessary realloc for these cases.
Quoted 5 lines
Quoted 2 lines
I can propose a new patch to fix the pointer problem and add more error handling.
I'm applying Stephen's patch for now, please send any improvements relative to that.
Ok.
However is it ok to use
kfree()instead ofkfree_skb()in Stephen's patch?
drivers/net/gianfar.c static int gfar_start_xmit(struct sk_buf · line 1322
Quoted 6 lines
drivers/net/gianfar.c +6
-0+ skb_new =skb_realloc_headroom (skb,GMAC_FCB_LEN ); +if (!skb_new) { + dev->stats.tx_errors++; +kfree (skb); +return NETDEV_TX_OK ; + }
I'll fix this, thanks for noticing.
PATCH 1/1 gianfar: only check headroom when FCB is needed
In reply to Li Yang--- drivers/net/gianfar.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/gianfar.c +4 -2
@@ -1277,8 +1277,10 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) base = priv->tx_bd_base; -/* make space for additional header */ -if (skb_headroom (skb) <GMAC_FCB_LEN ) { +/* make space for additional header when fcb is needed */ +if (((skb->ip_summed ==CHECKSUM_PARTIAL ) || + (priv->vlgrp &&vlan_tx_tag_present (skb))) && + (skb_headroom (skb) <GMAC_FCB_LEN )) {struct sk_buff *skb_new; skb_new =skb_realloc_headroom (skb,GMAC_FCB_LEN );
Signature · 1 line
1.5.4
Re: [PATCH] gianfar: only check headroom when FCB is needed
From: Li Yang <[email protected]>
Date: Fri, 27 Mar 2009 16:01:30 +0800
Quoted 1 line
Signed-off-by Li Yang <[email protected]>
Applied, thanks.
Re: [PATCH] gianfar: fix headroom expansion code
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
Date: Thu, 26 Mar 2009 10:08:56 -0700
Quoted 6 lines
The code that was added to increase headroom was wrong. It doesn't handle the case where
gfar_add_fcb()changes the skb. Better to do check at start of transmit (outside of lock), where error handling is better anyway.Signed-off-by Stephen Hemminger <[email protected]>
Applied, thanks Stephen.