From nobody Fri Oct 3 16:42:42 2025 Received: from mail-pg1-f228.google.com (mail-pg1-f228.google.com [209.85.215.228]) (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 430BF31196D for ; Thu, 28 Aug 2025 13:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756387161; cv=none; b=iRMW/6So9+h9bwTOVngeFh0D3GNHvoIqToX8XL+vY0UyDYGvP5hYHO00HA1j7/MLjMiccr74eU02V59ccgov0zuIPsWSgMEIfyOiyP6JRW+r8zu+JCyLJuccfwJH+LhdIoah5A4VonaN+fx0Pcxe1lz7SPorOwzi5nQ4zwgiN8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756387161; c=relaxed/simple; bh=54bqou4YjfblAvVbrPMbCIUxuvWl+YXO38AaB8aFbx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XPQ4X5bd9VTPU6bJqEib+McVB80/WYxASF3gF+k3fcM4KCIWt1lDGHXLayqk982CpyDi+JZ11vjh7cjT2fmORY8NzkYjZEFPml+gOorW9DFYNu6VFAWSvnPa4un2aVXBuG9HkkvRVBGL2qwPXGs+1N4kOeXrcuoJhpk/FxeXJyQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=EKfcC2pT; arc=none smtp.client-ip=209.85.215.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="EKfcC2pT" Received: by mail-pg1-f228.google.com with SMTP id 41be03b00d2f7-b49d6f8f347so876008a12.0 for ; Thu, 28 Aug 2025 06:19:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756387158; x=1756991958; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8PtpeW3HaTZ+8WHjiapTbySUQ7qWF0T9l6H0l3UPwm0=; b=lmgYCMKnoRgle4EkBNmenzv9DJDXo/0/YTsoNmUwOiR5nbM57RXSsISJHfSDee+w74 jvJ3IihmTmn2c1KueDZ+it+/dHhTdTp3ADRUDYMg+f1PHnZQTDSGrbxSUNh+l3bdfjd2 Krek9AmlArWM/l7kgv7eWpWbxvbA2XPjo+l270ZS3h3QvqSNlKayQrjC2xYWKVqBunxY U3koGS9/SU5xoHKKyu+MouvOvzyqEUNDbSCdOhU5G+B0xi8viVeCEM9gyy7cHC37wa1s MgFpEi9Y9CALyhigabnvgIfTJZIrSGKJRzfk7ooHdp96qopZoGvbCkUW93RsK3C1Gxkm oTwg== X-Forwarded-Encrypted: i=1; AJvYcCXJvO59hDzQKn7Wn5qyLZL7IP2VvPn0Z3NelHY0gBh/8yc92ZEHbJ++jxurPtemjOYFb4BB+Gkp6U3yqnI=@vger.kernel.org X-Gm-Message-State: AOJu0YxWnAKM7Hx3GGJa5ufaPBblkJVKx60eH4BfpIw0sDgwAqIpbh6E hGd/X+tPz7wb3r4pt6noBYCc7Lts1IRQRgPcboaydQe0bs3bNTbW954RMEmMQoT/qpTebJZbYCg hUE3VZy6ombLLwlz3E7T3fXuzClXcDb718tgY4T/OK+UEI2K7RmdwccfKS23+Inhx3tmVoxkB5d IPRcGHvfKVeRBG/iO2qLoFOLuqd3Su+3Yf8my6cj4bo9CYHmoFmhJ+sLnL8r77cUC5Kw02ctqlC 5RelRX2Al6ksYknY+jwRlAgIQMv X-Gm-Gg: ASbGncs9XPebamXZ5+mnRblLQLAqj/bZp+D2pB7LDCNkMwMjs5bYtoHy+fzIv+E0zvO Vxq8u9Fx8GlbxydhoPoSxkigUAvJUr7J35pdjNXAoVK1uycpLwT3ckKRnQFvQ27rfhWZJUfruVW FVY/Mj1axvA3d/GKCTjcTzwVsekxGQmlHBcYMysUNBBiVE3nbSncH9r07w4S31MCw1S6/TwWrGd MCFda+9T/peVU1ww86AIZIEBJNrpgutV36JvY70Wwto8IEkuR6nyr0X9QgfGlNztKKv3uI7l3KG 3n58Cs3xu8VVaGOkOpmm/Q4uqX0yge608Fg/7JKdn2p0U2iL2d26NrmZjsz3A3Ab1SHdTmqLi3x wnr/7+inUsRIf0n6soy1UA4RbUxeQAEP2Wm5fXek1FpH79u3crqdedDxySnGsSEUtkVS+NLO5kn oUOp18Vg== X-Google-Smtp-Source: AGHT+IFGeilpQNRFVVk8iCllDNDrnMtjx2O8a8vanyhlBCxGYpVdteNl2jiOi15Cjuqxt8x730WaldpieyDV X-Received: by 2002:a17:903:1585:b0:246:d3a1:c6c4 with SMTP id d9443c01a7336-246d3a1ccefmr215211875ad.16.1756387158051; Thu, 28 Aug 2025 06:19:18 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-11.dlp.protect.broadcom.com. [144.49.247.11]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2466886d9absm13469515ad.52.2025.08.28.06.19.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Aug 2025 06:19:18 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3259ff53c2eso1414056a91.1 for ; Thu, 28 Aug 2025 06:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1756387156; x=1756991956; 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=8PtpeW3HaTZ+8WHjiapTbySUQ7qWF0T9l6H0l3UPwm0=; b=EKfcC2pT8BmzgNfqE0zoqdYcaU5oDFWfjcPWwyEnkV7LomfUgrK1oNNNlS8U1Pz9Mh mr3/MmyTm8fyFlsDF+uWvr+1OwWk5z9uJtK/pUj7uIgwDDQj94FjNwUs/hf3z/L4ad8E DRcfDhqz8YtxXr2OE+N3+rEa5UPn0PzHHL0Hg= X-Forwarded-Encrypted: i=1; AJvYcCWyzYyibROiqarQxE/7mt2rdxzfbiAmp4n8eTIN+8H9X2ABf+lIeIFugZholN1FatRK5CkgmaJPoq9IEis=@vger.kernel.org X-Received: by 2002:a17:902:eb83:b0:248:f2f0:391c with SMTP id d9443c01a7336-248f2f04221mr10537885ad.23.1756387156242; Thu, 28 Aug 2025 06:19:16 -0700 (PDT) X-Received: by 2002:a17:902:eb83:b0:248:f2f0:391c with SMTP id d9443c01a7336-248f2f04221mr10537555ad.23.1756387155751; Thu, 28 Aug 2025 06:19:15 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-248b6a16ae3sm36468705ad.137.2025.08.28.06.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 06:19:15 -0700 (PDT) From: Bhargava Marreddy To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, vsrama-krishna.nemani@broadcom.com, Bhargava Marreddy , Vikas Gupta , Rajashekar Hudumula Subject: [v5, net-next 5/9] bng_en: Allocate packet buffers Date: Thu, 28 Aug 2025 18:45:43 +0000 Message-ID: <20250828184547.242496-6-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250828184547.242496-1-bhargava.marreddy@broadcom.com> References: <20250828184547.242496-1-bhargava.marreddy@broadcom.com> 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 X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Populate packet buffers into the RX and AGG rings while these rings are being initialized. Signed-off-by: Bhargava Marreddy Reviewed-by: Vikas Gupta Reviewed-by: Rajashekar Hudumula --- .../net/ethernet/broadcom/bnge/bnge_netdev.c | 227 +++++++++++++++++- 1 file changed, 226 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.c index 83419c986ebb..4305d02072c6 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -251,6 +251,76 @@ static bool bnge_separate_head_pool(struct bnge_rx_rin= g_info *rxr) return rxr->need_head_pool || PAGE_SIZE > BNGE_RX_PAGE_SIZE; } =20 +static void bnge_free_one_rx_ring(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr) +{ + int i, max_idx; + + if (!rxr->rx_buf_ring) + return; + + max_idx =3D bn->rx_nr_pages * RX_DESC_CNT; + + for (i =3D 0; i < max_idx; i++) { + struct bnge_sw_rx_bd *rx_buf =3D &rxr->rx_buf_ring[i]; + void *data =3D rx_buf->data; + + if (!data) + continue; + + rx_buf->data =3D NULL; + page_pool_free_va(rxr->head_pool, data, true); + } +} + +static void bnge_free_one_rx_agg_ring(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr) +{ + int i, max_idx; + + if (!rxr->rx_agg_buf_ring) + return; + + max_idx =3D bn->rx_agg_nr_pages * RX_DESC_CNT; + + for (i =3D 0; i < max_idx; i++) { + struct bnge_sw_rx_agg_bd *rx_agg_buf =3D &rxr->rx_agg_buf_ring[i]; + netmem_ref netmem =3D rx_agg_buf->netmem; + + if (!netmem) + continue; + + rx_agg_buf->netmem =3D 0; + __clear_bit(i, rxr->rx_agg_bmap); + + page_pool_recycle_direct_netmem(rxr->page_pool, netmem); + } +} + +static void bnge_free_one_rx_pkt_mem(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr) +{ + bnge_free_one_rx_ring(bn, rxr); + bnge_free_one_rx_agg_ring(bn, rxr); +} + +static void bnge_free_rx_pkt_bufs(struct bnge_net *bn) +{ + struct bnge_dev *bd =3D bn->bd; + int i; + + if (!bn->rx_ring) + return; + + for (i =3D 0; i < bd->rx_nr_rings; i++) + bnge_free_one_rx_pkt_mem(bn, &bn->rx_ring[i]); +} + +static void bnge_free_pkts_mem(struct bnge_net *bn) +{ + bnge_free_rx_pkt_bufs(bn); +} + static void bnge_free_rx_rings(struct bnge_net *bn) { struct bnge_dev *bd =3D bn->bd; @@ -727,6 +797,160 @@ static void bnge_init_nq_tree(struct bnge_net *bn) } } =20 +static netmem_ref __bnge_alloc_rx_netmem(struct bnge_net *bn, + dma_addr_t *mapping, + struct bnge_rx_ring_info *rxr, + unsigned int *offset, + gfp_t gfp) +{ + netmem_ref netmem; + + if (PAGE_SIZE > BNGE_RX_PAGE_SIZE) { + netmem =3D page_pool_alloc_frag_netmem(rxr->page_pool, offset, + BNGE_RX_PAGE_SIZE, gfp); + } else { + netmem =3D page_pool_alloc_netmems(rxr->page_pool, gfp); + *offset =3D 0; + } + if (!netmem) + return 0; + + *mapping =3D page_pool_get_dma_addr_netmem(netmem) + *offset; + return netmem; +} + +static u8 *__bnge_alloc_rx_frag(struct bnge_net *bn, dma_addr_t *mapping, + struct bnge_rx_ring_info *rxr, + gfp_t gfp) +{ + unsigned int offset; + struct page *page; + + page =3D page_pool_alloc_frag(rxr->head_pool, &offset, + bn->rx_buf_size, gfp); + if (!page) + return NULL; + + *mapping =3D page_pool_get_dma_addr(page) + bn->rx_dma_offset + offset; + return page_address(page) + offset; +} + +static int bnge_alloc_rx_data(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr, + u16 prod, gfp_t gfp) +{ + struct bnge_sw_rx_bd *rx_buf =3D &rxr->rx_buf_ring[RING_RX(bn, prod)]; + struct rx_bd *rxbd; + dma_addr_t mapping; + u8 *data; + + rxbd =3D &rxr->rx_desc_ring[RX_RING(bn, prod)][RX_IDX(prod)]; + data =3D __bnge_alloc_rx_frag(bn, &mapping, rxr, gfp); + if (!data) + return -ENOMEM; + + rx_buf->data =3D data; + rx_buf->data_ptr =3D data + bn->rx_offset; + rx_buf->mapping =3D mapping; + + rxbd->rx_bd_haddr =3D cpu_to_le64(mapping); + + return 0; +} + +static void bnge_alloc_one_rx_pkt_mem(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr, + int ring_nr) +{ + u32 prod; + int i; + + prod =3D rxr->rx_prod; + for (i =3D 0; i < bn->rx_ring_size; i++) { + if (bnge_alloc_rx_data(bn, rxr, prod, GFP_KERNEL)) { + netdev_warn(bn->netdev, "init'ed rx ring %d with %d/%d skbs only\n", + ring_nr, i, bn->rx_ring_size); + break; + } + prod =3D NEXT_RX(prod); + } + rxr->rx_prod =3D prod; +} + +static u16 bnge_find_next_agg_idx(struct bnge_rx_ring_info *rxr, u16 idx) +{ + u16 next, max =3D rxr->rx_agg_bmap_size; + + next =3D find_next_zero_bit(rxr->rx_agg_bmap, max, idx); + if (next >=3D max) + next =3D find_first_zero_bit(rxr->rx_agg_bmap, max); + return next; +} + +static int bnge_alloc_rx_netmem(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr, + u16 prod, gfp_t gfp) +{ + struct bnge_sw_rx_agg_bd *rx_agg_buf; + u16 sw_prod =3D rxr->rx_sw_agg_prod; + unsigned int offset =3D 0; + struct rx_bd *rxbd; + dma_addr_t mapping; + netmem_ref netmem; + + rxbd =3D &rxr->rx_agg_desc_ring[RX_AGG_RING(bn, prod)][RX_IDX(prod)]; + netmem =3D __bnge_alloc_rx_netmem(bn, &mapping, rxr, &offset, gfp); + if (!netmem) + return -ENOMEM; + + if (unlikely(test_bit(sw_prod, rxr->rx_agg_bmap))) + sw_prod =3D bnge_find_next_agg_idx(rxr, sw_prod); + + __set_bit(sw_prod, rxr->rx_agg_bmap); + rx_agg_buf =3D &rxr->rx_agg_buf_ring[sw_prod]; + rxr->rx_sw_agg_prod =3D RING_RX_AGG(bn, NEXT_RX_AGG(sw_prod)); + + rx_agg_buf->netmem =3D netmem; + rx_agg_buf->offset =3D offset; + rx_agg_buf->mapping =3D mapping; + rxbd->rx_bd_haddr =3D cpu_to_le64(mapping); + rxbd->rx_bd_opaque =3D sw_prod; + return 0; +} + +static void bnge_alloc_one_rx_ring_netmem(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr, + int ring_nr) +{ + u32 prod; + int i; + + prod =3D rxr->rx_agg_prod; + for (i =3D 0; i < bn->rx_agg_ring_size; i++) { + if (bnge_alloc_rx_netmem(bn, rxr, prod, GFP_KERNEL)) { + netdev_warn(bn->netdev, "init'ed rx agg ring %d with %d/%d pages only\n= ", + ring_nr, i, bn->rx_agg_ring_size); + break; + } + prod =3D NEXT_RX_AGG(prod); + } + rxr->rx_agg_prod =3D prod; +} + +static int bnge_alloc_one_rx_ring(struct bnge_net *bn, int ring_nr) +{ + struct bnge_rx_ring_info *rxr =3D &bn->rx_ring[ring_nr]; + + bnge_alloc_one_rx_pkt_mem(bn, rxr, ring_nr); + + if (!(bnge_is_agg_reqd(bn->bd))) + return 0; + + bnge_alloc_one_rx_ring_netmem(bn, rxr, ring_nr); + + return 0; +} + static void bnge_init_rxbd_pages(struct bnge_ring_struct *ring, u32 type) { struct rx_bd **rx_desc_ring; @@ -794,7 +1018,7 @@ static int bnge_init_one_rx_ring(struct bnge_net *bn, = int ring_nr) =20 bnge_init_one_rx_agg_ring_rxbd(bn, rxr); =20 - return 0; + return bnge_alloc_one_rx_ring(bn, ring_nr); } =20 static int bnge_init_rx_rings(struct bnge_net *bn) @@ -1147,6 +1371,7 @@ static void bnge_close_core(struct bnge_net *bn) struct bnge_dev *bd =3D bn->bd; =20 clear_bit(BNGE_STATE_OPEN, &bd->state); + bnge_free_pkts_mem(bn); bnge_free_irq(bn); bnge_del_napi(bn); =20 --=20 2.47.3