From nobody Sun Feb 8 04:34:00 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C77E13C1962 for ; Thu, 15 Jan 2026 17:12:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768497158; cv=none; b=p7nLtflPdqF68K+virAfYG5kUuZVxoCJ74RSGLupTSwpWqxCEbDSCnGMCzQ1McsLcRzYIE4ScdOMMvCXf/ZjdyHQSUUDnVMYjUuqb+QQn0E/n93b0ArUmT4ZZIx3suaG/+kpLINz10OSjNbY5qO5Q0fPKGbyflYUgccsOlO3L8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768497158; c=relaxed/simple; bh=m8NMYH4g6lQKcDnWsulwGjwfrhYH+1zKunQ0vgAfNRI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hhSmsQZ0DFP1sZpbZ+rcojbffsNBnnV1DCnJBcr16v2g2DeDFnckTjfryMA8eKbp9UimaqaGMutqft8JHsXWwJdN6exX3On5HuFqrS1Z8yE/X/6Q8VPEZ6iWZuGa7HPZZY61/aWDf9V77Nr5W5T8Jjc1bxxAOk2iEowXxEXFtY8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Uh9CH+0P; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Uh9CH+0P" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47ee974e230so10869725e9.2 for ; Thu, 15 Jan 2026 09:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768497155; x=1769101955; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wz1yS4KnsLbiuKsdPkEkvSuKGyQ7NQwQMS3x7qa8DNs=; b=Uh9CH+0PtQFoy2xX4gBfxnddb1lL+DfYCnOwBWThGJGyKEhSKwlEOJD4+E9X0CnwSz pkLyHv82T0T+DMKi3nhFSclTexl9/CncwFV87UxsnoBcDzarZCMsreQzhQBEvZ3yJYXj LdZyv8Swohkgt1nr+PEYKOAut1ysA/XlKHcBC/nDWWksu+2qptZ+Ujf/6av7aIyJNtIK bw/doxp+F8kFjkCsakvon4Dut0+ACoS/Ca3/fBJsHyiWHvjIOmUSLQCHJqy/I/SEPL7b PFyb7EVK7oB5ApOBjDwZy/tsyfi2CJYhXUQaEeyIWCLt4vrZGrfZyqiA3G0a21Hj9TgT el3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768497155; x=1769101955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wz1yS4KnsLbiuKsdPkEkvSuKGyQ7NQwQMS3x7qa8DNs=; b=K3FR0zS9linX+L0759K2m4ZTEghbmfKNK8wfmxtekhHa2oJH/NPhTpc+OWcIpM4Fjo IT3fp5tP2fKQZHXYgWgfmF8HUwL4tjYvotHkmSHnGyxrOfg6DJ1sH/gkxulS7tk088O2 R8cHQoc+nGyEItk2lb5Clz/hgnbHFbhS7PXDqo+4PIxRzNP0PzZmvzenuUlOjPC2OTZo QZ6Zk+SSnErJ1ykAwVKJN5T/Oy8Pizo8Ca1jj7MQbOf22NdY5+E1DvPlkJjiTA+pXkI6 LjzdBCFp+05oG3/RTEjfG6IOnQ6nqeAs5EB6PNcWBHThSWghnEOfs8O2HIdSFVfYeQcc oPCg== X-Forwarded-Encrypted: i=1; AJvYcCWo1ioMzIxACmz2ecX4EI0duTfqpU13XtBiPi/TeQKxrRvD5kZrawH48tbzFgmk+Tjg/MzlJJbr3tksQpw=@vger.kernel.org X-Gm-Message-State: AOJu0YxzVfzN58974rFQbR69whpomVgT93eA+Q6VNGvsNzqT5K77aA4c 1+A6M21tFp0vf/nrDTBvfJMGTiFSqka/P1CBDs/SCfXsjYIvXD8x5fwq X-Gm-Gg: AY/fxX5G2icgiCi9eiNHf8NdYo7bDGfCmGTnfbX5yzblaayC6YQu7kcgwiVJs6Wmu2W O7NspExw15mTpHtZdyXgtE5oLQSBzkeSFL/r33l0+XPaRtjGssVt0CDM5OkvAc11djfKeNO1IkP PU9DmgtYDucazPCnHSdoy6Q2ztDQJ7Xh1ch8RtLd0v391nKESjWQLBupTJ9Dl/+L5F9mJ1+KRwC oNML+8wyaqMMO3/RwckafP4cJIg6BlsUzqMQa3wDQ76FpQBSz4N+5sB7FLfp+4BaRlwHCe5T9R3 0JBP25lgdaflowVhHnKNMHQVMolIBxFTWwU0u5IynU88tvTxiY5Lsq19ik+IDGfWDqQfXot/KLP 1pmNXh+B3vF4iytYrlj+P6JP7UjVY9BVzJVvfKdMr+ghb8YJ6vIgjkzog2NekID8hZGeW4Qdtv3 A2eZ13zXX1phnbFhoilC6wjP69NDxChzz5s9i4CqU54q4blTwVB15/Y5SfrGRF+6jObxU3uIxE0 5eQernX57r1uJu5zA== X-Received: by 2002:a05:600c:1c05:b0:47e:e952:86ca with SMTP id 5b1f17b1804b1-4801e2f28edmr6191145e9.2.1768497155155; Thu, 15 Jan 2026 09:12:35 -0800 (PST) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47f429071a2sm54741645e9.11.2026.01.15.09.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 09:12:34 -0800 (PST) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan Corbet , Michael Chan , Pavan Chebbi , Andrew Lunn , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Joshua Washington , Harshitha Ramamurthy , Saeed Mahameed , Tariq Toukan , Mark Bloch , Leon Romanovsky , Alexander Duyck , Ilias Apalodimas , Shuah Khan , Willem de Bruijn , Ankit Garg , Tim Hostetler , Alok Tiwari , Ziwei Xiao , John Fraker , Praveen Kaligineedi , Mohsin Bashir , Joe Damato , Mina Almasry , Dimitri Daskalakis , Stanislav Fomichev , Kuniyuki Iwashima , Samiullah Khawaja , Alexander Lobakin , Pavel Begunkov , David Wei , Yue Haibing , Haiyue Wang , Jens Axboe , Simon Horman , Vishwanath Seshagiri , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kselftest@vger.kernel.org, dtatulea@nvidia.com, kernel-team@meta.com, io-uring@vger.kernel.org Subject: [PATCH net-next v9 6/9] eth: bnxt: adjust the fill level of agg queues with larger buffers Date: Thu, 15 Jan 2026 17:11:59 +0000 Message-ID: X-Mailer: git-send-email 2.52.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jakub Kicinski The driver tries to provision more agg buffers than header buffers since multiple agg segments can reuse the same header. The calculation / heuristic tries to provide enough pages for 65k of data for each header (or 4 frags per header if the result is too big). This calculation is currently global to the adapter. If we increase the buffer sizes 8x we don't want 8x the amount of memory sitting on the rings. Luckily we don't have to fill the rings completely, adjust the fill level dynamically in case particular queue has buffers larger than the global size. Signed-off-by: Jakub Kicinski [pavel: rebase on top of agg_size_fac] Signed-off-by: Pavel Begunkov --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 +++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 196b972263bd..f011cf792abe 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -3825,16 +3825,31 @@ static void bnxt_free_rx_rings(struct bnxt *bp) } } =20 +static int bnxt_rx_agg_ring_fill_level(struct bnxt *bp, + struct bnxt_rx_ring_info *rxr) +{ + /* User may have chosen larger than default rx_page_size, + * we keep the ring sizes uniform and also want uniform amount + * of bytes consumed per ring, so cap how much of the rings we fill. + */ + int fill_level =3D bp->rx_agg_ring_size; + + if (rxr->rx_page_size > BNXT_RX_PAGE_SIZE) + fill_level /=3D rxr->rx_page_size / BNXT_RX_PAGE_SIZE; + + return fill_level; +} + static int bnxt_alloc_rx_page_pool(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, int numa_node) { - const unsigned int agg_size_fac =3D PAGE_SIZE / BNXT_RX_PAGE_SIZE; + unsigned int agg_size_fac =3D rxr->rx_page_size / BNXT_RX_PAGE_SIZE; const unsigned int rx_size_fac =3D PAGE_SIZE / SZ_4K; struct page_pool_params pp =3D { 0 }; struct page_pool *pool; =20 - pp.pool_size =3D bp->rx_agg_ring_size / agg_size_fac; + pp.pool_size =3D bnxt_rx_agg_ring_fill_level(bp, rxr) / agg_size_fac; if (BNXT_RX_PAGE_MODE(bp)) pp.pool_size +=3D bp->rx_ring_size / rx_size_fac; =20 @@ -4412,11 +4427,13 @@ static void bnxt_alloc_one_rx_ring_netmem(struct bn= xt *bp, struct bnxt_rx_ring_info *rxr, int ring_nr) { + int fill_level, i; u32 prod; - int i; + + fill_level =3D bnxt_rx_agg_ring_fill_level(bp, rxr); =20 prod =3D rxr->rx_agg_prod; - for (i =3D 0; i < bp->rx_agg_ring_size; i++) { + for (i =3D 0; i < fill_level; i++) { if (bnxt_alloc_rx_netmem(bp, rxr, prod, GFP_KERNEL)) { netdev_warn(bp->dev, "init'ed rx ring %d with %d/%d pages only\n", ring_nr, i, bp->rx_agg_ring_size); --=20 2.52.0