Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ratheesh Kannoth <rkannoth@marvell.com>
To:     <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC:     <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
        <pabeni@redhat.com>, <ast@kernel.org>, <daniel@iogearbox.net>,
        <hawk@kernel.org>, <john.fastabend@gmail.com>,
        <jiawenwu@trustnetic.com>, <mengyuanlou@net-swift.com>,
        <yang.lee@linux.alibaba.com>, <error27@gmail.com>,
        <linyunsheng@huawei.com>, <linux-hyperv@vger.kernel.org>,
        <kys@microsoft.com>, <haiyangz@microsoft.com>,
        <wei.liu@kernel.org>, <decui@microsoft.com>,
        <longli@microsoft.com>, <shradhagupta@linux.microsoft.com>,
        <linux-hwmon@vger.kernel.org>, <michael.chan@broadcom.com>,
        <richardcochran@gmail.com>, <jdelvare@suse.com>,
        <linux@roeck-us.net>, <yisen.zhuang@huawei.com>,
        <salil.mehta@huawei.com>, <linux-arm-kernel@lists.infradead.org>,
        <linux-mediatek@lists.infradead.org>, <nbd@nbd.name>,
        <john@phrozen.org>, <sean.wang@mediatek.com>,
        <Mark-MC.Lee@mediatek.com>, <lorenzo@kernel.org>,
        <matthias.bgg@gmail.com>,
        <angelogioacchino.delregno@collabora.com>, <linux@armlinux.org.uk>,
        <linux-rdma@vger.kernel.org>, <saeedm@nvidia.com>,
        <leon@kernel.org>, <gerhard@engleder-embedded.com>,
        <maciej.fijalkowski@intel.com>, <alexanderduyck@fb.com>,
        <wei.fang@nxp.com>, <shenwei.wang@nxp.com>,
        <xiaoning.wang@nxp.com>, <linux-imx@nxp.com>,
        <lgirdwood@gmail.com>, <broonie@kernel.org>,
        <jaswinder.singh@linaro.org>, <ilias.apalodimas@linaro.org>,
        <UNGLinuxDriver@microchip.com>, <horatiu.vultur@microchip.com>,
        <linux-omap@vger.kernel.org>, <grygorii.strashko@ti.com>,
        <simon.horman@corigine.com>, <vladimir.oltean@nxp.com>,
        <rkannoth@marvell.com>, <aleksander.lobakin@intel.com>,
        <linux-stm32@st-md-mailman.stormreply.com>,
        <alexandre.torgue@foss.st.com>, <joabreu@synopsys.com>,
        <mcoquelin.stm32@gmail.com>, <p.zabel@pengutronix.de>,
        <thomas.petazzoni@bootlin.com>, <mw@semihalf.com>,
        <sgoutham@marvell.com>, <gakula@marvell.com>,
        <sbhatta@marvell.com>, <hkelam@marvell.com>,
        <xen-devel@lists.xenproject.org>, <jgross@suse.com>,
        <sstabellini@kernel.org>, <oleksandr_tyshchenko@epam.com>,
        <linux-wireless@vger.kernel.org>, <ryder.lee@mediatek.com>,
        <shayne.chen@mediatek.com>, <kvalo@kernel.org>,
        <andrii@kernel.org>, <martin.lau@linux.dev>, <song@kernel.org>,
        <yonghong.song@linux.dev>, <kpsingh@kernel.org>, <sdf@google.com>,
        <haoluo@google.com>, <jolsa@kernel.org>
Subject: [PATCH v1 net] page_pool: Cap queue size to 32k.
Date:   Mon, 14 Aug 2023 11:34:11 +0530
Message-ID: <20230814060411.2401817-1-rkannoth@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk

Clamp to 32k instead of returning error.

Please find discussion at
https://lore.kernel.org/lkml/
CY4PR1801MB1911E15D518A77535F6E51E2D308A@CY4PR1801MB1911.
namprd18.prod.outlook.com/T/

Fixes: ff7d6b27f894 ("page_pool: refurbish version of page_pool code")
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>

---
ChangeLog:
v0 -> v1: Rebase && commit message changes
---
 net/core/page_pool.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index a3e12a61d456..e9dc8d8966ad 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -171,9 +171,10 @@ static int page_pool_init(struct page_pool *pool,
 	if (pool->p.pool_size)
 		ring_qsize = pool->p.pool_size;
 
-	/* Sanity limit mem that can be pinned down */
+	/* Cap queue size to 32k */
 	if (ring_qsize > 32768)
-		return -E2BIG;
+		ring_qsize = 32768;
+
 
 	/* DMA direction is either DMA_FROM_DEVICE or DMA_BIDIRECTIONAL.
 	 * DMA_BIDIRECTIONAL is for allowing page used for DMA sending,
-- 
2.25.1