From patchwork Fri Sep 5 01:30:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 386070 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 E551D1400A3 for ; Fri, 5 Sep 2014 11:32:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755523AbaIEBbb (ORCPT ); Thu, 4 Sep 2014 21:31:31 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:54647 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755293AbaIEBb3 (ORCPT ); Thu, 4 Sep 2014 21:31:29 -0400 Received: by mail-pd0-f181.google.com with SMTP id fp1so14583362pdb.26 for ; Thu, 04 Sep 2014 18:31:28 -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=Ob6A5+HKGb1uwG6iI1unuQO8gwTas2ULxPAfNfb1c/w=; b=Tyec31iR0JoHfa1oVvqSpHfod1F+X9KMyKuT6xP4w+fm4AKTAWOBgzYORVuMtqbS3j PX2o2L6y/91x+Mvh9ynWSEqGtrqwFbzBTZZwzj/I8mALMYsAoQBRthQrjhVQPk8+4qVC fwASbGrIsOXLTI8eS5Xp7ggXGb7F9sgN0YPnlfpA5kA4+0RxfhQuS4vmo40cKYT8ROKO 7uoE7kuXjeSOssHPS3yotks3dLciQWT5qkcdnNO4fmXKHDSSnQP+K87JxAbqxCms0EqZ DnOpIJe2FpmtfG1nVTLXElf6qKfK6Vehqnca2vdP8HjYdYqBrT52pCeEfIXC/aiN0MWu kG3w== X-Received: by 10.66.168.204 with SMTP id zy12mr14836499pab.19.1409880688462; Thu, 04 Sep 2014 18:31:28 -0700 (PDT) Received: from f1.synalogic.ca ([108.203.77.233]) by mx.google.com with ESMTPSA id q1sm336548pdq.67.2014.09.04.18.31.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Sep 2014 18:31:27 -0700 (PDT) From: Benjamin Poirier To: Prashant Sreedharan , Michael Chan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v6 2/4] tg3: Fix tx_pending check for MAX_SKB_FRAGS Date: Thu, 4 Sep 2014 18:30:45 -0700 Message-Id: <1409880647-14887-3-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1409880647-14887-1-git-send-email-bpoirier@suse.de> References: <1409880647-14887-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 81b3a57..c5061c3 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -12331,7 +12331,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;