From patchwork Tue Aug 26 19:26:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 383194 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 8993514003E for ; Wed, 27 Aug 2014 05:28:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753973AbaHZT1W (ORCPT ); Tue, 26 Aug 2014 15:27:22 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:60842 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753870AbaHZT1V (ORCPT ); Tue, 26 Aug 2014 15:27:21 -0400 Received: by mail-pa0-f47.google.com with SMTP id kx10so23944179pab.6 for ; Tue, 26 Aug 2014 12:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wn3dWCmFUxtx1Iz9LgqqqAQkBgx1bMZuKuBkp57eS44=; b=Ci91koX4mfbbND215lI5gIzhbrmB3eQqehgBOp2pCWLooNgU1yTwWge6mroeS2I+R9 5/IWOgcj9QKGM6R34Cuxk2hEVoOL2Y+eakC9D+WiHX0rpkjB/wzeTUPceFo4q0AONp31 dstcexdwQSkNjKuCfCjJcpaGGJsdo1zlFqGAbx81upGsl/q/GwuH5iWpc1EBSM6Efert OzTh1Fu0biBdXuBW5XUSSeWtHgK1V8oI+1thcGvPDDRodeC5PIDAlhqsMkpTkVBf7W7m DAoAD+kKxvghpCxzXvepReOhAD/WMJWLDL8TSkQKFSeyN9mDbD0g5Z3c2vaa4vhirvtS qdCA== X-Received: by 10.70.103.8 with SMTP id fs8mr29805600pdb.81.1409081240540; Tue, 26 Aug 2014 12:27:20 -0700 (PDT) Received: from f1.synalogic.ca ([108.203.76.248]) by mx.google.com with ESMTPSA id zf5sm4049240pbc.44.2014.08.26.12.27.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Aug 2014 12:27:19 -0700 (PDT) From: Benjamin Poirier To: Prashant Sreedharan , Michael Chan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v3 2/4] tg3: Fix tx_pending check for MAX_SKB_FRAGS Date: Tue, 26 Aug 2014 12:26:16 -0700 Message-Id: <1409081178-4877-2-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1409081178-4877-1-git-send-email-bpoirier@suse.de> References: <1409081178-4877-1-git-send-email-bpoirier@suse.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The rest of the driver assumes at least one free descriptor in the tx ring. Therefore, since an skb with max frags takes up (MAX_SKB_FRAGS + 1) descriptors, tx_pending must be > (MAX_SKB_FRAGS + 1). Signed-off-by: Benjamin Poirier --- Changes v1->v2 Moved ahead in the series from 3/3 to 2/3, no functionnal change I reproduced this bug using the same approach explained in patch 1. The bug reproduces with tx_pending = 18 --- drivers/net/ethernet/broadcom/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index b11c0fd..0cecd6d 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -12319,7 +12319,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e if ((ering->rx_pending > tp->rx_std_ring_mask) || (ering->rx_jumbo_pending > tp->rx_jmb_ring_mask) || (ering->tx_pending > TG3_TX_RING_SIZE - 1) || - (ering->tx_pending <= MAX_SKB_FRAGS) || + (ering->tx_pending <= MAX_SKB_FRAGS + 1) || (tg3_flag(tp, TSO_BUG) && (ering->tx_pending <= (MAX_SKB_FRAGS * 3)))) return -EINVAL;