From patchwork Thu Aug 21 21:57:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 382050 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 E3C281400D6 for ; Fri, 22 Aug 2014 07:58:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755510AbaHUV6U (ORCPT ); Thu, 21 Aug 2014 17:58:20 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:56525 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755340AbaHUV5f (ORCPT ); Thu, 21 Aug 2014 17:57:35 -0400 Received: by mail-pd0-f180.google.com with SMTP id v10so14490711pde.25 for ; Thu, 21 Aug 2014 14:57:35 -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=zGywjEovDL/mGiksHpBRNvJV8znOtLCr+Ci2Rcd/xGo=; b=LX/LfltiXQm8RkBo06QfgE1ehDNpFJzZjoTnzV/P2nmaMSkFGaRGXlEHnZGNpnXy6n pwu7jAD/mD416opY7jm17lRgmMsBXegE4vIqbNKoRpBwYdmiGhpYJna+Um609b5z3+w/ hfeeoXrqqwDFBs6CzzSe4rC1rVsLS5hQinRxcFM1U363ZUQ4Pw79AKLV1ZQAMnOYpIvR jcth4vUm0aaIoffm7LRSRuiNmFHQwe3LyA1UMNwpiL4qaTwxYnfNUO40pNgsecH6ozCL XNiK5YiqJRP/VSk9DKMj2RFs9pK0glCUk79F2TGIbjLQnJ6D5Gmtk12iNmyunD7YbWCC L91w== X-Received: by 10.68.65.69 with SMTP id v5mr1437469pbs.156.1408658255374; Thu, 21 Aug 2014 14:57:35 -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 qk9sm94933762pac.16.2014.08.21.14.57.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Aug 2014 14:57:34 -0700 (PDT) From: Benjamin Poirier To: Prashant Sreedharan , Michael Chan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] tg3: Fix tx_pending check for MAX_SKB_FRAGS Date: Thu, 21 Aug 2014 14:57:19 -0700 Message-Id: <1408658240-6811-2-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1408658240-6811-1-git-send-email-bpoirier@suse.de> References: <1408658240-6811-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;