From nobody Sat Oct 4 09:40:56 2025 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 CD99D33471A for ; Mon, 18 Aug 2025 14:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755526863; cv=none; b=WI+KONUO2TzSSjjv9je6/UL9FMNcZl6J27RbNK+XKpah/5B5+iF0Nz2YcbYhxgzxMXlqBp4Qf5HlzJ6WWE0kLytGpnL17JMH1TzdVq2goF5rJKZPHKeDj8iJA3EFxVW5tq7A8O1CFfOu/7d6ompRze5cXFgKoGumi1IQkgEbpBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755526863; c=relaxed/simple; bh=Xc9xkGxu6/MXs5kuRWogGo3LKjqI4peatrMsICOFTIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fn7ttgz5z5l2yqLeQNwUWVHU91k66Eg477yNVs75GueNxKr92W8cAlmNMNiKI4GfMbiQmqDvYsf7rdr4wY5WdJT6gdzLETWxh+lLHcEBsEA+3K9Ak/e5QHEqme1vgdWjy6IPBiAbFPx48cMVx83RdeqSAEjdyaSm28G/ez8KfAU= 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=HOenx3ik; arc=none smtp.client-ip=209.85.210.176 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="HOenx3ik" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-76e2ea79219so4774632b3a.2 for ; Mon, 18 Aug 2025 07:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1755526861; x=1756131661; 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=fypIz4PcE4KQzHCU1BKi2Cz0QHNMVqABeKpzUJfcv9E=; b=HOenx3ikxQxQ3m/koumqYc/lSHQ2RudU6X8WNb5UkJ8fdJGAh9hHRJBWrDKBDCzTzl QGDNlzIgRenyFKKZYLXvHcDO9EZq92eWCO6N/eZia+ITGIoArLse7n0GGVF+2r+b45zb QJdp92dDNUB+50cK64Cqyi5+oWt7SomOnBQM8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755526861; x=1756131661; 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=fypIz4PcE4KQzHCU1BKi2Cz0QHNMVqABeKpzUJfcv9E=; b=N4MB5xw5m950c9XMNvieDKCuSSrCfGEDC3sotxWNro2FzAkDV8cGObVScw4+TJss1g /rXUnxZChfGSzynuVwYQn4vT6S9pul/9HAyraKY4sY0n0ONTilsksN4wPDR3V559GJDk cqCopf9wIAVdHksnpEutrDOuQetqoTOag7+8/kn9t/WmUb7qDStAJ7Dy+0fHLXWCBxMV HRvi1GNFERlvcQhCJhKiWQ+wbHlN/91Mq+ywYTKvYrmBrj9uMcKhRs+l91zwdDTxRhIu SOlT84V7eHC342/vlylAKrwG+hGHlK3toJRS5+7K9IMB/EC+7d2eqtujQkekssiZIsbX IjqQ== X-Forwarded-Encrypted: i=1; AJvYcCXmrAmNC838utTVfMeDdm3IOTalh1MYMbXOIzOmG/Bw2n8NEcdXiCKJ7t452qiWDq1pXm13vr7kdFbTKjw=@vger.kernel.org X-Gm-Message-State: AOJu0YziFZECNqzGcZm8uspxkKer5yqRK7xPpCH3vkPzXXCLxyyVIOvl 8mk7Xgy3KCbSz4eTxes9eZ+1uHIN0fabmCnAOKPMv+RAojlByAYfK5dt0j7tE/qh3w== X-Gm-Gg: ASbGnctAUtTkENDKduA5TiAWnJ/7XbpCoUFKtNH47YT376LEgjI7ER/Krm8EF6HCslu KyGZ63YdbD9Ro2uk8DSho174LpHAOcEIYE7pNYSXb5US0UEBYiZ8q7ruYez1JdB8nwAyXplEp5X yHLH8ZM+9FluMU8MjJ+R/bt1VKHwtOkVskS4RSfXVMNpLm//HcW9O8kQN7wa+CqX+uX1vmWxsWF 37BCo9xyyqef3sSjz4jOhFQj1vqXK02z+yzks3ovi2TGZSl4m4ZnnMXiuuY4QljhExa5Mn2+saH Tbey4MfEw3H36Uzhpc5jjezlRAVvICTKWfv3y/5O5wgtXFpuB0Gc4nkKsghvmzgvY0lKjrdHSC2 TLHfDZQE17WnTF60+fVJtVQ420Mtsdv9TqBixmhtVkx0KjZWm1mdxJsWckVh4mx19yIj7c4OXNU 1vwMG6RZWgyiu2b/9wNTpyUGum3g== X-Google-Smtp-Source: AGHT+IE488IPMsDH9MZjmBYqDtL7fq0LD7LIfExEQEQmC/Z0PUg4FRrVA4ePnaQ5yF5xK3vVt8kuyw== X-Received: by 2002:a17:902:ce92:b0:240:96a:b81d with SMTP id d9443c01a7336-2446d5b7eeamr151202295ad.5.1755526860829; Mon, 18 Aug 2025 07:21:00 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d578aa4sm81947835ad.153.2025.08.18.07.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Aug 2025 07:21:00 -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: [v2, net-next 5/9] bng_en: Allocate packet buffers Date: Mon, 18 Aug 2025 19:47:12 +0000 Message-ID: <20250818194716.15229-6-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250818194716.15229-1-bhargava.marreddy@broadcom.com> References: <20250818194716.15229-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 | 218 +++++++++++++++++- 1 file changed, 217 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.c index a5724d389b0..d1674408d6a 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; @@ -721,6 +791,151 @@ 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 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; + 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; @@ -788,7 +1003,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) @@ -1141,6 +1356,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