Re: [PATCH] ixgbe: fix truesize calculation when merging active tail into lro skb

[Jeff Kirsher <jeffrey.t.kirsher@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]

On Mon, 2012-02-13 at 15:12 +0100, Eric Dumazet wrote:
> Le lundi 13 février 2012 à 14:52 +0100, Christian Brunner a écrit :
> > I'm seeing some page allocation failures with the ixgbe driver under heavy
> > load. While looking after it, I came accoss the truesize handling. I suspect,
> > that there is a small misstake in ixgbe_merge_active_tail(). (But I'm not
> > really sure).
> > 
> > Truesize allocation of the skb may be larger than skb->len, because
> > ixgbe is allocating PAGE_SIZE/2 for received fragments. Hence we 
> > should use the truesize of the tail when merging.
> > 
> > Signed-off-by: Christian Brunner <chb@muc.de>
> > ---
> >  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> > index a42b0b2..c4d25af 100644
> > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> > @@ -1222,7 +1222,7 @@ static inline struct sk_buff *ixgbe_merge_active_tail(struct sk_buff *tail)
> >  
> >  	head->len += tail->len;
> >  	head->data_len += tail->len;
> > -	head->truesize += tail->len;
> > +	head->truesize += tail->truesize;
> >  
> >  	IXGBE_CB(tail)->head = NULL;
> >  
> 
> You forgot CC Intel guys, but they usually catch netdev traffic :)
> 
> Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
> 
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> 
> 

Thanks Eric for bringing this to my attention.

Thanks Christian for the patch, I have added it to my queue.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]