Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Antoine Tenart <antoine.tenart@free-electrons.com>
To:     davem@davemloft.net
Cc:     Antoine Tenart <antoine.tenart@free-electrons.com>,
        gregory.clement@free-electrons.com,
        thomas.petazzoni@free-electrons.com,
        miquel.raynal@free-electrons.com, nadavh@marvell.com,
        mw@semihalf.com, stefanc@marvell.com, ymarkman@marvell.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net 4/4] net: mvpp2: check ethtool sets the Tx ring size is to a valid min value
Date:   Tue, 28 Nov 2017 14:19:51 +0100
Message-Id: <20171128131951.25383-5-antoine.tenart@free-electrons.com>
In-Reply-To: <20171128131951.25383-1-antoine.tenart@free-electrons.com>
References: <20171128131951.25383-1-antoine.tenart@free-electrons.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

This patch fixes the Tx ring size checks when using ethtool, by adding
an extra check in the PPv2 check_ringparam_valid helper. The Tx ring
size cannot be set to a value smaller than the minimum number of
descriptors needed for TSO.

Fixes: 1d17db08c056 ("net: mvpp2: limit TSO segments and use stop/wake thresholds")
Suggested-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 drivers/net/ethernet/marvell/mvpp2.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index 5be58b04b95e..d83a78be98a2 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -6842,6 +6842,12 @@ static int mvpp2_check_ringparam_valid(struct net_device *dev,
 	else if (!IS_ALIGNED(ring->tx_pending, 32))
 		new_tx_pending = ALIGN(ring->tx_pending, 32);
 
+	/* The Tx ring size cannot be smaller than the minimum number of
+	 * descriptors needed for TSO.
+	 */
+	if (new_tx_pending < MVPP2_MAX_SKB_DESCS)
+		new_tx_pending = ALIGN(MVPP2_MAX_SKB_DESCS, 32);
+
 	if (ring->rx_pending != new_rx_pending) {
 		netdev_info(dev, "illegal Rx ring size value %d, round to %d\n",
 			    ring->rx_pending, new_rx_pending);
-- 
2.14.3


From 1586749634588749451@xxx Thu Dec 14 09:06:13 +0000 2017
X-GM-THRID: 1585217845072186791
X-Gmail-Labels: Inbox,Category Forums