From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 59D51314B69 for ; Tue, 14 Oct 2025 13:00:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760446842; cv=none; b=YXvWkGrrT6I6wKMvUtAucnJfvjRe3uVnDPMm99GYfP6wF60sKJ3EkjFRfZAnDQwVOGvpxf7lh/WCS8NQOnilQlrI9aP32AUeWxktQMy9aYuI0h/4KPe+c01mUmLO3PK75o+2Mlbkd7AjAwyhulCMgZiR8VQvWOtX9jkDtbIOT70= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760446842; c=relaxed/simple; bh=JM6u3rhenlQZWL+x7CQ4y9MfGHKPZFCJcJabv3mo818=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kd8nnhKuPYk+nVNiWBxyCSqMWnIef3WKrKEhbQhPHmfeem4C8FzlTMmBoW+Oy9j8y6GOEDELMUVirKr+E5tLwoSOZCiflszBZ5sVQzmS9grM6sgszA39FhzjfBIuETjKNnsKG39RNKqYWPtd9aoUkNRXUJDlHyAzVcD7YocBGzg= 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=jso8Odz1; arc=none smtp.client-ip=209.85.221.47 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="jso8Odz1" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so2413556f8f.1 for ; Tue, 14 Oct 2025 06:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760446838; x=1761051638; 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=bo/Hffm+GCU38S4s9L6o3lMbhm24x5k4XXoTTrdb28c=; b=jso8Odz1yFP3cru5SQvAzTlVeY1SzIsJPQ8CL7JoJKQRHFnLimrxUNtmu6VNhitd8o GCuDy+YaHfp9v2I2vlBdhwNRQZcVoqJF2q7BLe90chXwaDPLFkpRIBVEYK+9qhMM5BQL RoMpA8nd8FkFrSi9bbIZfTrbSX4Q3Vak0SeS5KMx8aZoNbVikx7eOhHQ9w2WR/biZpnK 9FkMIzaBwo/Jk8vNg54u0T7Au071mqsgeV2aNMNWMu0XJf8f2Tw7Zrx4mXoqnxYnaYfv eiwCkOTURKBRyKn0cbDWDW31dORZLKQnGyigivywUGF/spGxo1Q9ke0c/CX40SHjKwjW mFPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760446838; x=1761051638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bo/Hffm+GCU38S4s9L6o3lMbhm24x5k4XXoTTrdb28c=; b=SBgnXnaUWv6Z7ZYeQv1brd61XwklZnhYagn1BTuQT5beMLsU3EKMTvHfR5yC/gskKy fKw4g/blOzeIYEfy7u3pOBmPLa7/R+O4bGXhPHN1o3kClSK7dvp2JNXEJh3B9ZluZ7ac ZH/8+IRCfmAYsqO3TNsYsTrCfYDyd1uiB3XY5BT4dh19gzypX33PnabaFb7k3pnVmb/h W9nSpu0F3E/WZvB87J/IgUH+YnBynABpp4rX0Qwd4ZaGaJsAKlB027l6BxwgdhgWkA3p O0ERhTvM2RmQsw1x6daFsWrLWp7a2F7zXk/KSPhE3C2zm8JZxnjKuKAKNWEtYEb7p+6D jGqw== X-Forwarded-Encrypted: i=1; AJvYcCVAnWr7SkbXJCKRT8rQtJ2pZikQJB9b3WK7D8ss6ZFnQWeozAUIvezBowG6SUYiQ/ewkHI8Cz/SPA==@vger.kernel.org X-Gm-Message-State: AOJu0Yw1F0CQ/aV6Vnno9unlVjMcZK/zWXbHoH9LGXVKYWD1knr90Anu 0EK2Nr+9oJEtjyAqZfAxb5sRKgbPWTdNXpoayx30n89bkDmypfXebzh8 X-Gm-Gg: ASbGncvbga28oOfVOHiUFAREcX4nSo+QR8O/HMl4tcRkcPoyciwpF0x/QMKR9rW/yDF 3lyXC4bmMLtRC35p6F44Ovjdnr7rDaDdwCN2C5WEZ3MySSdy1Fn4/BNGQf3/i+lK4gyl57LxY1F RDOVV8fsF5kvvWUJ7Bvz7vIjY/O5St+R5pd2F4hXjEAYA0PSsf3IqFABSPv72LphF5hfsZQy7Fg 3aCfyI3YHOiqHEFjP/yXWfgcC/d3zYlnLymLE/nQiMo7PT47LW0diJBk58ye3AoiWatof+qykWt ewR/85XMVmn2nkWhosjlFn4dhxZnzGIaWnA7Y8wRKfBIl0Jz6/GNu0jSaMVTe3ZvSk8qmXbQHsc MKLchsW3bSQuZImCXDrJIJntu X-Google-Smtp-Source: AGHT+IGhSZFm38F8sVCM0Ux5ROYmcmMusBWqctwDSzojJka/K/RPf3AoV/TQmhhmAwvujH6biaI4iA== X-Received: by 2002:a05:6000:601:b0:3d7:2284:b20 with SMTP id ffacd0b85a97d-42666ab296fmr16323066f8f.3.1760446837436; Tue, 14 Oct 2025 06:00:37 -0700 (PDT) Received: from 127.com ([2620:10d:c092:600::1:7ec0]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce582b39sm23296494f8f.15.2025.10.14.06.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 06:00:36 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org, io-uring@vger.kernel.org Cc: Michael Chan , Pavan Chebbi , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Simon Horman , Ilias Apalodimas , Mina Almasry , Pavel Begunkov , Willem de Bruijn , Dragos Tatulea , Saeed Mahameed , Tariq Toukan , Mark Bloch , David Wei , linux-kernel@vger.kernel.org Subject: [PATCH net-next v5 5/6] eth: bnxt: adjust the fill level of agg queues with larger buffers Date: Tue, 14 Oct 2025 14:01:25 +0100 Message-ID: <1a9ae7fc9d06111b14f29d0b81ceae9841056bf9.1760440268.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, assert agg_size_fac] Signed-off-by: Pavel Begunkov --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 28 +++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 61943de13774..950e60d204cb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -3816,16 +3816,34 @@ static void bnxt_free_rx_rings(struct bnxt *bp) } } +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 = bp->rx_agg_ring_size; + + if (rxr->rx_page_size > BNXT_RX_PAGE_SIZE) + fill_level /= 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 = PAGE_SIZE / BNXT_RX_PAGE_SIZE; + unsigned int agg_size_fac = rxr->rx_page_size / BNXT_RX_PAGE_SIZE; const unsigned int rx_size_fac = PAGE_SIZE / SZ_4K; struct page_pool_params pp = { 0 }; struct page_pool *pool; - pp.pool_size = bp->rx_agg_ring_size / agg_size_fac; + if (WARN_ON_ONCE(agg_size_fac == 0)) + agg_size_fac = 1; + + pp.pool_size = bnxt_rx_agg_ring_fill_level(bp, rxr) / agg_size_fac; if (BNXT_RX_PAGE_MODE(bp)) pp.pool_size += bp->rx_ring_size / rx_size_fac; @@ -4403,11 +4421,13 @@ static void bnxt_alloc_one_rx_ring_netmem(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, int ring_nr) { + int fill_level, i; u32 prod; - int i; + + fill_level = bnxt_rx_agg_ring_fill_level(bp, rxr); prod = rxr->rx_agg_prod; - for (i = 0; i < bp->rx_agg_ring_size; i++) { + for (i = 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); -- 2.49.0