From patchwork Mon Feb 13 14:09:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 140908 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B91BDB6FA9 for ; Tue, 14 Feb 2012 01:09:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751329Ab2BMOJY (ORCPT ); Mon, 13 Feb 2012 09:09:24 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:49469 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751106Ab2BMOJY (ORCPT ); Mon, 13 Feb 2012 09:09:24 -0500 Received: by wics10 with SMTP id s10so3483369wic.19 for ; Mon, 13 Feb 2012 06:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=y3LJ76P/dtjRGtJIp2O47LKDjUtqeL5EuWW+lYOPcYk=; b=g2PbdKh7Aj235b0U+mAixcrsoQjuqw4FGY7QCn9VfcYLhMeyRo9iJi0LZ9KfUTVeG9 GRLfcmgog4gMgxvteEMPfT0OfPsZCGso6/v1N2DudyUJCq5KHHVw5pIqQevl7Mgwd4DY MI9Th3hrN8GzwmiFlVqr3tZb2XlNMS9QBOZUk= Received: by 10.216.131.30 with SMTP id l30mr4731732wei.1.1329142162910; Mon, 13 Feb 2012 06:09:22 -0800 (PST) Received: from [10.150.51.210] (gw0.net.jmsp.net. [212.23.165.14]) by mx.google.com with ESMTPS id q7sm21805113wix.5.2012.02.13.06.09.21 (version=SSLv3 cipher=OTHER); Mon, 13 Feb 2012 06:09:21 -0800 (PST) Message-ID: <1329142160.2494.8.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> Subject: [PATCH net-next] gro: fix truesize underestimation From: Eric Dumazet To: David Miller Cc: netdev , Herbert Xu Date: Mon, 13 Feb 2012 15:09:20 +0100 X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb_gro_receive() doesnt update truesize properly when adding one skb to frag_list. Signed-off-by: Eric Dumazet Cc: Herbert Xu --- net/core/skbuff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/skbuff.c b/net/core/skbuff.c index da0c97f..f3a5307 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2906,7 +2906,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) nskb->prev = p; nskb->data_len += p->len; - nskb->truesize += p->len; + nskb->truesize += p->truesize; nskb->len += p->len; *head = nskb; @@ -2916,6 +2916,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) p = nskb; merge: + p->truesize += skb->truesize - len; if (offset > headlen) { unsigned int eat = offset - headlen;