From patchwork Thu Oct 20 20:10:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 120870 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 588B3B70C5 for ; Fri, 21 Oct 2011 07:10:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751211Ab1JTUKK (ORCPT ); Thu, 20 Oct 2011 16:10:10 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:37869 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750727Ab1JTUKJ (ORCPT ); Thu, 20 Oct 2011 16:10:09 -0400 Received: by wyg36 with SMTP id 36so3282737wyg.19 for ; Thu, 20 Oct 2011 13:10:07 -0700 (PDT) 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=lpebfogcP5I9V4cFSFbd420giKK2o1yDEqNuvTo3lU8=; b=Iy+Qge21dEpxcJWRbiAaATbspW5VeKzb1H/60lZLVerc4md6NUcqKY7gtWvX1EGHHw 2uxJZdBR+WZ/MKqaPmEztwticZrtdnGfxTnRaFwXGAHgdxVv7si1XxAFyho5JuZ6cwRF yYHKxxBuCqtmY50HzbDPV5X0kycBB5NIN0dTo= Received: by 10.216.160.83 with SMTP id t61mr395140wek.62.1319141407478; Thu, 20 Oct 2011 13:10:07 -0700 (PDT) Received: from [10.170.237.4] ([87.255.129.107]) by mx.google.com with ESMTPS id q30sm17555350wbn.17.2011.10.20.13.10.05 (version=SSLv3 cipher=OTHER); Thu, 20 Oct 2011 13:10:06 -0700 (PDT) Message-ID: <1319141403.2854.17.camel@edumazet-laptop> Subject: [PATCH net-next] myri10ge: fix truesize underestimation From: Eric Dumazet To: David Miller Cc: netdev , Jon Mason Date: Thu, 20 Oct 2011 22:10:03 +0200 X-Mailer: Evolution 3.2.0- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb->truesize must account for allocated memory, not the used part of it. Doing this work is important to avoid unexpected OOM situations. Signed-off-by: Eric Dumazet CC: Jon Mason Acked-by: Jon Mason Acked-by: Andrew Gallatin --- drivers/net/ethernet/myricom/myri10ge/myri10ge.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/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index c970a48..0778edc 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -1210,7 +1210,6 @@ myri10ge_rx_skb_build(struct sk_buff *skb, u8 * va, struct skb_frag_struct *skb_frags; skb->len = skb->data_len = len; - skb->truesize = len + sizeof(struct sk_buff); /* attach the page(s) */ skb_frags = skb_shinfo(skb)->frags; @@ -1385,6 +1384,8 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum, if (skb_frag_size(&skb_shinfo(skb)->frags[0]) <= 0) { skb_frag_unref(skb, 0); skb_shinfo(skb)->nr_frags = 0; + } else { + skb->truesize += bytes * skb_shinfo(skb)->nr_frags; } skb->protocol = eth_type_trans(skb, dev); skb_record_rx_queue(skb, ss - &mgp->ss[0]);