From patchwork Thu Aug 28 01:04: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: 383630 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 90A231400B2 for ; Thu, 28 Aug 2014 11:06:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757178AbaH1BFg (ORCPT ); Wed, 27 Aug 2014 21:05:36 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:46606 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757122AbaH1BFe (ORCPT ); Wed, 27 Aug 2014 21:05:34 -0400 Received: by mail-pa0-f46.google.com with SMTP id eu11so275569pac.19 for ; Wed, 27 Aug 2014 18:05:34 -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=nMH4TbayOfaMPEQUMhe4a0XD5/85ZmuaYVVQ2KASLlV2vyRinXjTz27s4e3Dy3UbeA R8klmFKmFkntnP1IRUrk6ghIl+4bXa2CdoK8/lxOZNU6jbZ+d6B1aDX+8qUpDpTijkxJ 5hVuXFdrxTLzGq6kvkYtqz5MBVUprU+6OR7E/Uc0GarmG29nq58wGbhpPtkyB/c6p9bm F4762HMpAr44nDWru8qrSVk20DJO1m9vO07bS4AzWuZRX7Cm6yBcRhslE20ToVyJelVf 2ODpyvfcUjzBBLriZwwL6044320rn9XpwoAQP/ZcBDdwpdJc7elK5faas2gRgrbckPUp a9xA== X-Received: by 10.70.19.166 with SMTP id g6mr713824pde.99.1409187934125; Wed, 27 Aug 2014 18:05:34 -0700 (PDT) Received: from f1.synalogic.ca (adsl-108-203-76-248.dsl.scrm01.sbcglobal.net. [108.203.76.248]) by mx.google.com with ESMTPSA id df10sm2752229pdb.25.2014.08.27.18.05.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Aug 2014 18:05:33 -0700 (PDT) From: Benjamin Poirier To: Prashant Sreedharan , Michael Chan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v4 2/4] tg3: Fix tx_pending check for MAX_SKB_FRAGS Date: Wed, 27 Aug 2014 18:04:16 -0700 Message-Id: <1409187858-7698-2-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1409187858-7698-1-git-send-email-bpoirier@suse.de> References: <1409187858-7698-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;