Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3685256pxb; Mon, 24 Jan 2022 15:18:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsNdRvyzDooX5aqz/cRRKJhTYYKT/1Y0MGv7jyWpAgvt1H4COosLCvVu4bBpEAij1HA1BE X-Received: by 2002:a63:a741:: with SMTP id w1mr13375604pgo.620.1643066329447; Mon, 24 Jan 2022 15:18:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643066329; cv=none; d=google.com; s=arc-20160816; b=tKUhFsTxk2ZPW/voa5T8Mjj/PgIwSTHzMoZ+VxxiOumtpIsEK844EqBm2R62k1TVgP tJqow/IqJyuZvaeYkMtRuAaCTg/tyJPDn/Ol+E6CHMrybCuhZpf9nHGG14HMz368vqwe O/+AgG+oer9UpCARDwHbFhWjIhKNCBa9DPSi3mlkZ2peb33hE8oJtxbjfSNBCvEY9gA2 xlnxooy3IhAxs7hEAtUPdWGlx3hoiVZ38QGIobElLmq+xByggH3R1dTgDV74V4emnKDO Iwl+f0KxfHcNKhFuJ4dhqycEgEsb4zMhyYDYxL4FXd9hiJLXfNKw/CbpbW3vZ4ld2Kje 2xNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qJRig6ITtFnVSUiElBlBBOq1q0TmtZCajoUSMLVlG/E=; b=QtS/17SukjmwX1sG8poor8Y4lVb8k8IYc8r95Ybrqm5CsjalTvvLSHFFowQvQe2Noq XCRwqIcBsgWH103jbDZCoAfw9gwuX7NEjxPol5CQIb40ou6Ry7qUjhsTxmW6B0LidW1J A1eZR/D33N4XkzIgS32FYcl8xYAmMZVdifM4vBioNH+I6Ii7wBc8H/YERxR4QgX2ctgo l+egvELPZD+bqq6yTmuYclTixu0vIJR8Qqx+OWPJ7DpvnlrQER3C31rqKD4hpmI3o8bj mgWmb04g41RUv3RlhTAWx+VjQSaAtrN4k74tF9TD7VSaNa2PaJMc+HbByE01Yaaochrq O4NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jSsJxzLf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i186si6777916pge.299.2022.01.24.15.18.37; Mon, 24 Jan 2022 15:18:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jSsJxzLf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1845481AbiAXXM2 (ORCPT + 99 others); Mon, 24 Jan 2022 18:12:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1584584AbiAXWV3 (ORCPT ); Mon, 24 Jan 2022 17:21:29 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B031C0424E0; Mon, 24 Jan 2022 12:51:28 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 06507B810A8; Mon, 24 Jan 2022 20:51:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C71EC340E5; Mon, 24 Jan 2022 20:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057485; bh=qEjckpQvRmxcTRNa+OgIplbRP5NSdJP2K0D8QWEZUBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jSsJxzLf8hFnNqYFF17Y1p3GLL+mSNpX5E3qRJt1QHntxTByb1hHrcGQErsdDshhw eQUFPImhb3MHdHvJI95rIC3miEq0F+Lt491gY91lcLCtxcoTu1xZhyjet1gNWpbn3Y 5MyJn5LM0fFGLHPLkbwyZ87go10uXGiskOCgsmWg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Hancock , "David S. Miller" Subject: [PATCH 5.15 795/846] net: axienet: limit minimum TX ring size Date: Mon, 24 Jan 2022 19:45:12 +0100 Message-Id: <20220124184128.378317235@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Hancock commit 70f5817deddbc6ef3faa35841cab83c280cc653a upstream. The driver will not work properly if the TX ring size is set to below MAX_SKB_FRAGS + 1 since it needs to hold at least one full maximally fragmented packet in the TX ring. Limit setting the ring size to below this value. Fixes: 8b09ca823ffb4 ("net: axienet: Make RX/TX ring sizes configurable") Signed-off-by: Robert Hancock Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -43,6 +43,7 @@ /* Descriptors defines for Tx and Rx DMA */ #define TX_BD_NUM_DEFAULT 64 #define RX_BD_NUM_DEFAULT 1024 +#define TX_BD_NUM_MIN (MAX_SKB_FRAGS + 1) #define TX_BD_NUM_MAX 4096 #define RX_BD_NUM_MAX 4096 @@ -1364,7 +1365,8 @@ static int axienet_ethtools_set_ringpara if (ering->rx_pending > RX_BD_NUM_MAX || ering->rx_mini_pending || ering->rx_jumbo_pending || - ering->rx_pending > TX_BD_NUM_MAX) + ering->tx_pending < TX_BD_NUM_MIN || + ering->tx_pending > TX_BD_NUM_MAX) return -EINVAL; if (netif_running(ndev))