From nobody Sat Oct 4 19:17:49 2025 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 DCBF229CB43 for ; Wed, 13 Aug 2025 16:29:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755102589; cv=none; b=uiS2vxEPd6K+woZlYAgJURHhojZW6K0KF6zx8JMGqFdWBO36yn9etwpqdmTffc7LTpfFEb9ltRmo9AZwgJM3VoZVOdSoJWt7D7ur+YBRjTUZoLk0l0skW5T2m4Q7YH6+7cvMTramUmZmirdZ8m56l//FREWu7LiAtxO4Z10q43I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755102589; c=relaxed/simple; bh=B20b8W20g2U1W1vzektlkUmqSbVPKiX0xrSWrZN9bJI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VeR03Yw6W/C8o1MdzjKNDSz7fyzBXtIXNcGULXMIfkrLKEYtyXz6hkYaDbLMdL6kCdNzWmuyngDTxVCcLAWRa3EpwbdVR3xGB+Mc/t0EURxQSY2ML7HXO0iHbIHE3wQY72m+HOwWB2hnGwn4K2dZr5iFekZ2YX/mvGsA6aiVfVg= 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=Iv5R7FEw; arc=none smtp.client-ip=209.85.215.179 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="Iv5R7FEw" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b2c4331c50eso5119880a12.3 for ; Wed, 13 Aug 2025 09:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1755102587; x=1755707387; 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=TIXVBY4FM/Lj8B9zMTi5FDGuZXo9lk35HJNBCgfOKs4=; b=Iv5R7FEwJp7hQNANdMIdMs7BEljacbcs00dAIGcIKDsYF0iahl95yk59M4txyYYpQe ugM92d2XYyhbn3cV+654G40srLwkRG3o88SPqzOfcnU8d6CxACXVOmbMiDZjhvhKrnlR VOJn+lTWu09OgSpR2OErg7hk5p5qyGzOF4Aew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755102587; x=1755707387; 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=TIXVBY4FM/Lj8B9zMTi5FDGuZXo9lk35HJNBCgfOKs4=; b=Fiy0FABMHFRaVm0AgfAft4eO8t2Y0JJ0ME5fEXRwghJN1LW6heia0K+niTI9s8WPdM x+ED+1LM37GYYULXQcDE0/uGdfjYAo2z8UmVyhFw3DzIhiM0riScU7pFi0vx1eDrxChW 2n1qnqNmtpKqpFSpBZfjpqlfi4N5mhcRm9V3ACJeZaF5i2i7PKrX1kWkKSCvTS97I0nZ xR7uyq3F1IZiWRIVSUT/Tu5aRPXvV4Vn4WLcy5bk8/8LIxoiq33W/oBnLZq5JzRUd2co jsE/RyZZwZGOw1b6ZAI98ejjua9q7KTFamdtAWociridzmA0ZHrKvNIhuIZRFVcPW/qY xU7A== X-Forwarded-Encrypted: i=1; AJvYcCViTm84Rw/qUsd+W+RTQ6KiTZQUqJbObIXf0rgPX+bwmIcVEBeWgcBARNFkasTSuOcsGwD6xiIt1xKC+SE=@vger.kernel.org X-Gm-Message-State: AOJu0YyXmgBfP6yF2zZArs9LCoRmJstcOV4rGJR8vkN1DAlizCWog966 8RCSv+0vdxnEMircJkGkMeQ1PBEJ+x+9Ju5862OB1YZvhBaU04Zjoj28G+WWqQD8qw== X-Gm-Gg: ASbGncuctN2DJQT64+oKkjJJE5Lta60KW4x5GJssh1gnBOjKiCd1ZTLgDS8RG9Ql5n8 TEmt2VH2D+1o4LOs1aYVp/ZJM/u8yu5hjljvn7NVt74YLgo3HuDR/Vp894VN3kUaRMxMujVh2p6 L+AAx2IqJxPdVmu+RdytE9yrvDshe+8ami9FPz2bXNXJaxgV3Dx5NUDLUPJCPieHftgTcMnKuyv LGu9VnOEw2Q08Yfj825Nem7v4q3jYsn/U6vItAv8NOV6L/b65Bzttm5JwkohsVpLcMYsBxHNyPo CTf0iYwq1P7mAkj4PGux6kPsfK45aiVXVUpibvn0z3U4sbyLJSRX7FKFiVksOvfl3TTBOn+12Nk HnaR5ffrVHYkSWpnreaBC2Xv2zoAKdlsukPisrf0Ju3BqE/jdCxw3OIHflR31UovY9dZzkQ/c5v Mqe605bUl5lHbWdTEGIgdYzQKtQw== X-Google-Smtp-Source: AGHT+IFiYgPmr7PD4AeC7IuUb59SwR5fEG1RZNJtJWepeies+yLDJx1fuDYKZ6eNxxGCqUqjvvwTyw== X-Received: by 2002:a17:902:d4c1:b0:243:11e3:a742 with SMTP id d9443c01a7336-24311e3ac04mr36704475ad.55.1755102587061; Wed, 13 Aug 2025 09:29:47 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f0f7bfsm329311915ad.41.2025.08.13.09.29.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 09:29:46 -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: [net-next 5/9] bng_en: Allocate packet buffers Date: Wed, 13 Aug 2025 21:55:59 +0000 Message-ID: <20250813215603.76526-6-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250813215603.76526-1-bhargava.marreddy@broadcom.com> References: <20250813215603.76526-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 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 | 213 +++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.c index effa389feaf..a998df4a4de 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -251,6 +251,74 @@ 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; @@ -719,6 +787,148 @@ 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, + gfp_t gfp) +{ + netmem_ref netmem; + + netmem =3D page_pool_alloc_netmems(rxr->page_pool, gfp); + if (!netmem) + return 0; + + *mapping =3D page_pool_get_dma_addr_netmem(netmem); + return netmem; +} + +static inline u8 *__bnge_alloc_rx_frag(struct bnge_net *bn, dma_addr_t *ma= pping, + 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_inf= o *rxr, + u16 prod, gfp_t gfp) +{ + struct rx_bd *rxbd =3D &rxr->rx_desc_ring[RX_RING(bn, prod)][RX_IDX(prod)= ]; + struct bnge_sw_rx_bd *rx_buf =3D &rxr->rx_buf_ring[RING_RX(bn, prod)]; + dma_addr_t mapping; + u8 *data; + + 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 inline u16 bnge_find_next_agg_idx(struct bnge_rx_ring_info *rxr, u1= 6 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; + 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, 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->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 ring %d with %d/%d pages only\n", + ring_nr, i, bn->rx_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; @@ -786,7 +996,7 @@ static int bnge_init_one_rx_ring(struct bnge_net *bn, i= nt 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) @@ -1139,6 +1349,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