From nobody Mon Nov 25 02:44:31 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C54B13FEE; Wed, 30 Oct 2024 13:54:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730296445; cv=none; b=c0IIl1Z0MhmFDjNpDDPb5DrRnmahDHAszpJzyKW4fY+kMf/1UUjh8jkuugYfDX4rOi7+CVu93gnuenhqDHG6Ur0qePgKUFpZo1AUHmXpwYUpv7OmXNUuurJJtB6CkRw0VvDWpc1/3t+5LRgMAomMhBLWIhw2wQdj2ljdTC0M4WQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730296445; c=relaxed/simple; bh=4Mwwh4tsM3ztywr+zawTMklRK72LDgitnERM1pqIlwc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=Ri2zBQ5gg+LUiNtYwV8Y5NsFNp5OUa3uiv7+o1VprxZUXZnmctHnLyrOx6KEOANfaK3R37Ei3/iTAHVOgwRrJy+VklvCE1gP/PnB5XNFI+HkqIRpmI/4MsYd7ewSF25Bc2vK2pSSbS7wHAQs1E47Ug7HHKHf1/bj84GWRTYTTM8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CqWRpzQw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CqWRpzQw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33B04C4CECF; Wed, 30 Oct 2024 13:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730296445; bh=4Mwwh4tsM3ztywr+zawTMklRK72LDgitnERM1pqIlwc=; h=From:Date:Subject:To:Cc:From; b=CqWRpzQwYE0079V97Xhbm7zKQCqGQyZXBfJ028l050yB5aHNYpQ9ZWSrLvoGL9kry 6UUd0cTAye6d8Sc7kFpU9lf0VfJSSx7fmJh/CpMfklvpV06KEDcp05swanwRq7OyMW DG4L4qr3GL2UUCmMsuXL601XuMsO7vO8mI74S1N3FlDc9kh+Jwrnm+iSSR6ZecxBxJ Fx3PcuU6G3cGmgDlynD9cHGCxO/dAmSXAy3dbXHHnXhB+1x0rb94KUCeA7B1NV5cYn Yd4LftRBKqOcRz/WkoDEETvxPI2fplpvvap3uitw9js6CVKJo9a9OCLZX/810j8+Vr FjdR/9m9mcw/w== From: Roger Quadros Date: Wed, 30 Oct 2024 15:53:58 +0200 Subject: [PATCH net v2] net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241030-am65-cpsw-multi-rx-j7-fix-v2-1-bc54087b0856@kernel.org> X-B4-Tracking: v=1; b=H4sIAHY6ImcC/32NwQ6CMBBEf4Xs2TW0AlJP/ofhUMsCVWjJFhFD+ Hcb4tnjvMm8WSEQWwpwSVZgmm2w3sUgDwmYTruW0NYxg0xlJlJ5Qj0UOZoxvHF49ZNFXvBxxsY u2CgtRabuVNQ1xP3IFPHuvoGjCaoIOxsmz5/9bxZ79VOrP+pZoMBMFkaXaa5Eaa5PYkf90XML1 bZtX//xAXrIAAAA To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Simon Horman , Vignesh Raghavendra Cc: Siddharth Vadapalli , Md Danish Anwar , Govindarajan Sriramakrishnan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Roger Quadros X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=10982; i=rogerq@kernel.org; h=from:subject:message-id; bh=4Mwwh4tsM3ztywr+zawTMklRK72LDgitnERM1pqIlwc=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBnIjp4s2M8g0hNpaKn1oSOd5mimGa+pX65kPnXf BWSdbLYrx2JAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCZyI6eAAKCRDSWmvTvnYw k0qnEADQE3d+X0rUH9vESob2AlaGe3U0VkY3P6ogsjmPgNrQxl95EoWAN400zyG1IzKYu7DJdpF qVR45gtxK6iyFk5f2Gut5GZW8rxRdluNXqhwz/WbM6WP3AgCHQzHjw+3cxBdHFqSA6jQtS5mzhj eIKRhElLuNJpq5y5YL4PUeQLBpCcFY1wn2ic+qH8Ea45KaTVmzioY63XRjcekJOc8siYOqvE1gw jhbbOdqxQbnyH0dUWrpO7sW+O+INTm4RM6QYPEjXUoohiOyWmv1WpudLhNn0ybzd6ox4PX8+CzT LWj/WFS2GRNKLUi65ePM6YpM46xwKlhSQKu7nac4oOwoap73H75bD2vRPrQdBbIFSt1EUQTuWBg zrbsIrNHhd0zBSkRXqm3pEr1uRaf+FWAnt5e6PGTm6Lu/pnwROgWRVuAaSy5Exo1OFiI+2manQX jlez/N7Iv+jW6waD4MgPnHCv55arFJ+O91koUJiSkRECs/Vxps7x7AV6aXmqsDXDaKRGN/j76hV h1Usib+SS15GsFvz+l0s54vmzwoWlC0zKu+H6s4WAkMmDll0TTeE5zweV5xnN5sY/SyYUKp/xvd HeHCeiBWtrT2bsP+kN8KoP9IM1VzaqecqQzamVwW6lv7/TyGyf5q8xQDA59Q/8oe8YEbimnKH80 7JS3Lup07UIGJtQ== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 On J7 platforms, setting up multiple RX flows was failing as the RX free descriptor ring 0 is shared among all flows and we did not allocate enough elements in the RX free descriptor ring 0 to accommodate for all RX flows. This issue is not present on AM62 as separate pair of rings are used for free and completion rings for each flow. Fix this by allocating enough elements for RX free descriptor ring 0. However, we can no longer rely on desc_idx (descriptor based offsets) to identify the pages in the respective flows as free descriptor ring includes elements for all flows. To solve this, introduce a new swdata data structure to store flow_id and page. This can be used to identify which flow (page_pool) and page the descriptor belonged to when popped out of the RX rings. Fixes: da70d184a8c3 ("net: ethernet: ti: am65-cpsw: Introduce multi queue R= x") Signed-off-by: Roger Quadros --- Changes in v2: - Dropped unused variables desc-idx and flow - Link to v1: https://lore.kernel.org/r/20241029-am65-cpsw-multi-rx-j7-fix-= v1-1-426ca805918c@kernel.org --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 75 ++++++++++++++--------------= ---- drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 ++- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index 0520e9f4bea7..ca1b75511596 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -339,7 +339,7 @@ static int am65_cpsw_nuss_rx_push(struct am65_cpsw_comm= on *common, struct device *dev =3D common->dev; dma_addr_t desc_dma; dma_addr_t buf_dma; - void *swdata; + struct am65_cpsw_swdata *swdata; =20 desc_rx =3D k3_cppi_desc_pool_alloc(rx_chn->desc_pool); if (!desc_rx) { @@ -363,7 +363,8 @@ static int am65_cpsw_nuss_rx_push(struct am65_cpsw_comm= on *common, cppi5_hdesc_attach_buf(desc_rx, buf_dma, AM65_CPSW_MAX_PACKET_SIZE, buf_dma, AM65_CPSW_MAX_PACKET_SIZE); swdata =3D cppi5_hdesc_get_swdata(desc_rx); - *((void **)swdata) =3D page_address(page); + swdata->page =3D page; + swdata->flow_id =3D flow_idx; =20 return k3_udma_glue_push_rx_chn(rx_chn->rx_chn, flow_idx, desc_rx, desc_dma); @@ -519,36 +520,31 @@ static enum am65_cpsw_tx_buf_type am65_cpsw_nuss_buf_= type(struct am65_cpsw_tx_ch =20 static inline void am65_cpsw_put_page(struct am65_cpsw_rx_flow *flow, struct page *page, - bool allow_direct, - int desc_idx) + bool allow_direct) { page_pool_put_full_page(flow->page_pool, page, allow_direct); - flow->pages[desc_idx] =3D NULL; } =20 static void am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma) { - struct am65_cpsw_rx_flow *flow =3D data; + struct am65_cpsw_rx_chn *rx_chn =3D data; struct cppi5_host_desc_t *desc_rx; - struct am65_cpsw_rx_chn *rx_chn; + struct am65_cpsw_swdata *swdata; dma_addr_t buf_dma; u32 buf_dma_len; - void *page_addr; - void **swdata; - int desc_idx; + struct page *page; + u32 flow_id; =20 - rx_chn =3D &flow->common->rx_chns; desc_rx =3D k3_cppi_desc_pool_dma2virt(rx_chn->desc_pool, desc_dma); swdata =3D cppi5_hdesc_get_swdata(desc_rx); - page_addr =3D *swdata; + page =3D swdata->page; + flow_id =3D swdata->flow_id; cppi5_hdesc_get_obuf(desc_rx, &buf_dma, &buf_dma_len); k3_udma_glue_rx_cppi5_to_dma_addr(rx_chn->rx_chn, &buf_dma); dma_unmap_single(rx_chn->dma_dev, buf_dma, buf_dma_len, DMA_FROM_DEVICE); k3_cppi_desc_pool_free(rx_chn->desc_pool, desc_rx); =20 - desc_idx =3D am65_cpsw_nuss_desc_idx(rx_chn->desc_pool, desc_rx, - rx_chn->dsize_log2); - am65_cpsw_put_page(flow, virt_to_page(page_addr), false, desc_idx); + am65_cpsw_put_page(&rx_chn->flows[flow_id], page, false); } =20 static void am65_cpsw_nuss_xmit_free(struct am65_cpsw_tx_chn *tx_chn, @@ -703,14 +699,13 @@ static int am65_cpsw_nuss_common_open(struct am65_cps= w_common *common) ret =3D -ENOMEM; goto fail_rx; } - flow->pages[i] =3D page; =20 ret =3D am65_cpsw_nuss_rx_push(common, page, flow_idx); if (ret < 0) { dev_err(common->dev, "cannot submit page to rx channel flow %d, error %d\n", flow_idx, ret); - am65_cpsw_put_page(flow, page, false, i); + am65_cpsw_put_page(flow, page, false); goto fail_rx; } } @@ -764,8 +759,8 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_= common *common) =20 fail_rx: for (i =3D 0; i < common->rx_ch_num_flows; i++) - k3_udma_glue_reset_rx_chn(rx_chn->rx_chn, i, &rx_chn->flows[i], - am65_cpsw_nuss_rx_cleanup, 0); + k3_udma_glue_reset_rx_chn(rx_chn->rx_chn, i, rx_chn, + am65_cpsw_nuss_rx_cleanup, !!i); =20 am65_cpsw_destroy_xdp_rxqs(common); =20 @@ -817,11 +812,11 @@ static int am65_cpsw_nuss_common_stop(struct am65_cps= w_common *common) dev_err(common->dev, "rx teardown timeout\n"); } =20 - for (i =3D 0; i < common->rx_ch_num_flows; i++) { + for (i =3D common->rx_ch_num_flows - 1; i >=3D 0; i--) { napi_disable(&rx_chn->flows[i].napi_rx); hrtimer_cancel(&rx_chn->flows[i].rx_hrtimer); - k3_udma_glue_reset_rx_chn(rx_chn->rx_chn, i, &rx_chn->flows[i], - am65_cpsw_nuss_rx_cleanup, 0); + k3_udma_glue_reset_rx_chn(rx_chn->rx_chn, i, rx_chn, + am65_cpsw_nuss_rx_cleanup, !!i); } =20 k3_udma_glue_disable_rx_chn(rx_chn->rx_chn); @@ -1028,7 +1023,7 @@ static int am65_cpsw_xdp_tx_frame(struct net_device *= ndev, static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, struct am65_cpsw_port *port, struct xdp_buff *xdp, - int desc_idx, int cpu, int *len) + int cpu, int *len) { struct am65_cpsw_common *common =3D flow->common; struct am65_cpsw_ndev_priv *ndev_priv; @@ -1101,7 +1096,7 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow= *flow, } =20 page =3D virt_to_head_page(xdp->data); - am65_cpsw_put_page(flow, page, true, desc_idx); + am65_cpsw_put_page(flow, page, true); =20 out: return ret; @@ -1150,16 +1145,16 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cp= sw_rx_flow *flow, struct am65_cpsw_ndev_stats *stats; struct cppi5_host_desc_t *desc_rx; struct device *dev =3D common->dev; + struct am65_cpsw_swdata *swdata; struct page *page, *new_page; dma_addr_t desc_dma, buf_dma; struct am65_cpsw_port *port; - int headroom, desc_idx, ret; struct net_device *ndev; u32 flow_idx =3D flow->id; struct sk_buff *skb; struct xdp_buff xdp; + int headroom, ret; void *page_addr; - void **swdata; u32 *psdata; =20 *xdp_state =3D AM65_CPSW_XDP_PASS; @@ -1182,8 +1177,8 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw= _rx_flow *flow, __func__, flow_idx, &desc_dma); =20 swdata =3D cppi5_hdesc_get_swdata(desc_rx); - page_addr =3D *swdata; - page =3D virt_to_page(page_addr); + page =3D swdata->page; + page_addr =3D page_address(page); cppi5_hdesc_get_obuf(desc_rx, &buf_dma, &buf_dma_len); k3_udma_glue_rx_cppi5_to_dma_addr(rx_chn->rx_chn, &buf_dma); pkt_len =3D cppi5_hdesc_get_pktlen(desc_rx); @@ -1199,9 +1194,6 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw= _rx_flow *flow, =20 k3_cppi_desc_pool_free(rx_chn->desc_pool, desc_rx); =20 - desc_idx =3D am65_cpsw_nuss_desc_idx(rx_chn->desc_pool, desc_rx, - rx_chn->dsize_log2); - skb =3D am65_cpsw_build_skb(page_addr, ndev, AM65_CPSW_MAX_PACKET_SIZE); if (unlikely(!skb)) { @@ -1213,7 +1205,7 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw= _rx_flow *flow, xdp_init_buff(&xdp, PAGE_SIZE, &port->xdp_rxq[flow->id]); xdp_prepare_buff(&xdp, page_addr, AM65_CPSW_HEADROOM, pkt_len, false); - *xdp_state =3D am65_cpsw_run_xdp(flow, port, &xdp, desc_idx, + *xdp_state =3D am65_cpsw_run_xdp(flow, port, &xdp, cpu, &pkt_len); if (*xdp_state !=3D AM65_CPSW_XDP_PASS) goto allocate; @@ -1247,10 +1239,8 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cps= w_rx_flow *flow, return -ENOMEM; } =20 - flow->pages[desc_idx] =3D new_page; - if (netif_dormant(ndev)) { - am65_cpsw_put_page(flow, new_page, true, desc_idx); + am65_cpsw_put_page(flow, new_page, true); ndev->stats.rx_dropped++; return 0; } @@ -1258,7 +1248,7 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw= _rx_flow *flow, requeue: ret =3D am65_cpsw_nuss_rx_push(common, new_page, flow_idx); if (WARN_ON(ret < 0)) { - am65_cpsw_put_page(flow, new_page, true, desc_idx); + am65_cpsw_put_page(flow, new_page, true); ndev->stats.rx_errors++; ndev->stats.rx_dropped++; } @@ -2402,10 +2392,6 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_c= psw_common *common) for (i =3D 0; i < common->rx_ch_num_flows; i++) { flow =3D &rx_chn->flows[i]; flow->page_pool =3D NULL; - flow->pages =3D devm_kcalloc(dev, AM65_CPSW_MAX_RX_DESC, - sizeof(*flow->pages), GFP_KERNEL); - if (!flow->pages) - return -ENOMEM; } =20 rx_chn->rx_chn =3D k3_udma_glue_request_rx_chn(dev, "rx", &rx_cfg); @@ -2455,10 +2441,12 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_= cpsw_common *common) flow =3D &rx_chn->flows[i]; flow->id =3D i; flow->common =3D common; + flow->irq =3D -EINVAL; =20 rx_flow_cfg.ring_rxfdq0_id =3D fdqring_id; rx_flow_cfg.rx_cfg.size =3D max_desc_num; - rx_flow_cfg.rxfdq_cfg.size =3D max_desc_num; + /* share same FDQ for all flows */ + rx_flow_cfg.rxfdq_cfg.size =3D max_desc_num * rx_cfg.flow_id_num; rx_flow_cfg.rxfdq_cfg.mode =3D common->pdata.fdqring_mode; =20 ret =3D k3_udma_glue_rx_flow_init(rx_chn->rx_chn, @@ -2496,6 +2484,7 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cp= sw_common *common) if (ret) { dev_err(dev, "failure requesting rx %d irq %u, %d\n", i, flow->irq, ret); + flow->irq =3D -EINVAL; goto err; } } @@ -3349,8 +3338,8 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_= cpsw_common *common) =20 for (i =3D 0; i < common->rx_ch_num_flows; i++) k3_udma_glue_reset_rx_chn(rx_chan->rx_chn, i, - &rx_chan->flows[i], - am65_cpsw_nuss_rx_cleanup, 0); + rx_chan, + am65_cpsw_nuss_rx_cleanup, !!i); =20 k3_udma_glue_disable_rx_chn(rx_chan->rx_chn); =20 diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/etherne= t/ti/am65-cpsw-nuss.h index dc8d544230dc..92a27ba4c601 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h @@ -101,10 +101,14 @@ struct am65_cpsw_rx_flow { struct hrtimer rx_hrtimer; unsigned long rx_pace_timeout; struct page_pool *page_pool; - struct page **pages; char name[32]; }; =20 +struct am65_cpsw_swdata { + u32 flow_id; + struct page *page; +}; + struct am65_cpsw_rx_chn { struct device *dev; struct device *dma_dev; --- base-commit: 42f7652d3eb527d03665b09edac47f85fb600924 change-id: 20241023-am65-cpsw-multi-rx-j7-fix-f9a2149be6dd Best regards, --=20 Roger Quadros