From patchwork Mon Feb 17 07:31:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 13977224 X-Patchwork-Delegate: kuba@kernel.org 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 5C7A819CC05; Mon, 17 Feb 2025 07:31:58 +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=1739777518; cv=none; b=An91Jlb1Eg8JqmCZdKN5BtjG72Hii/XXLqBqnKJKjlvX/9QW3jeI+xXjm+RON1Tdy6lsrSyUvzUzDKvt+gW/OobPYK8twNEFxrzj2GWMnc5X/ZY274XbP8qB9omLCjKDyOCyIByhBbXGkan7d7Om3fHfkODrDaV0yf7M5CObPa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739777518; c=relaxed/simple; bh=cy12FEVXGEV4OubjLglharecSYtdE4eJP4FWZn1J20U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y+cry/BlfagKdWclpy+WX69sc7KBSE32+Ylgi5zlJtFOnphJRBpuNtR4ix36KajuF63PIYOqGD1Vzc+3rUCkVKjkfVCBoc7CHt1xli12BpUEcmsMKhCrN24MIgBvo0PySa0BKSnd2XO4vzbKGYpPcaPNaqsbKkfUxnEDBTFGMfk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uZ8dQFE4; 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="uZ8dQFE4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74FD1C4CEE9; Mon, 17 Feb 2025 07:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739777517; bh=cy12FEVXGEV4OubjLglharecSYtdE4eJP4FWZn1J20U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uZ8dQFE420+AaxXCt3E4MPMhx9qOMyJXeYN/gUMATow/4wGKxcJtr4+dHBEM17L5S CC9Kjp3FUD359/wcaVMzht9xTGVgsv6Qf25Nlu+wd29rf/yGSUdsZ0P0tg9H0Vy7bx h7mc1mi5T7WHyoW08kTnltliKag9wWBRSDgXfeKwsMIJt+QVtHtlESTRQwil/jzbaU BNRtjQ6zz0/UZM+2OVgoRylZM/gKbrExzyoE0oPtMxqaNMH68aWMlK+KN5qgDxS2No 3B5TcrAJpd/amM1DRzl3EX2q2oatam5lffNXbrLrzM2sBMwtPLOy1ec4yhaMXa5ZXZ UqJJ5eEzisDVA== From: Roger Quadros Date: Mon, 17 Feb 2025 09:31:46 +0200 Subject: [PATCH net-next 1/5] net: ethernet: ti: am65-cpsw: remove am65_cpsw_nuss_tx_compl_packets_2g() Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-am65-cpsw-zc-prep-v1-1-ce450a62d64f@kernel.org> References: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> In-Reply-To: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Siddharth Vadapalli , Md Danish Anwar Cc: srk@ti.com, 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=5645; i=rogerq@kernel.org; h=from:subject:message-id; bh=cy12FEVXGEV4OubjLglharecSYtdE4eJP4FWZn1J20U=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBnsuXlt1wKi4z4dCGjceGBFQ2jGiMGSMv03HMJU Zw9WuGtMT+JAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCZ7Ll5QAKCRDSWmvTvnYw kxOID/44ZZl0LfSjQAalIegP/gE/FlZM3uqmQtByJgzhzK8102iuJEYP60ygBKi/ji8DG/NriEc nMgzkgW7AKKaT5ZGLvwCwcOFEWcdp0LtJpAHqB5IE3r3sb30/HigGsXocJ+qhPxjCCyyc+YTnZi Pk6Q7u/8mWShM2ZnKieJwW3RU2VIGvwkfYPs5kLqemDw6IQTlml6bS2ZGcYTCqZgKR/4Ony3P3Y h+aMo5mklY80t2irlDW/mtJC6ZCS0Ol7d7pnBolCPBa81D5pGaqXfxWRYRsC4Cr/+HhGZxjxWhH mfIpn7AOjLZzfnZD1Bk+4vmCbdwJHtHYhsUP2Ch27xHrHmFPhbQvTgNgm3J1ndayO3E2zkwwAU2 8LKV8gfy9HtZWPVm64j3Oa5yWU8upWUBC1yQbagrOVZjP5tII9IvqWeDv51yIRFhzHm9d1VN5bc CacNL53C1cHFmKy46kT+qJk9x+gAOprpr6YvXu5oQlzQLEPJe7Uoc4N5E+5CM++9iBYG2K1qYgW qrMh5PMY9D1qqLj/re4omttvqGz8pVCJcuZPVZBCQOl3h1SPWLOm2cHKtd7CR21meYbE7OJ8FHL iwdoOTBQnfu5E3NuZP84XnYnpmNApo5NoCDCQdVr7b07LBnx60vvGg6MDprAT4iVk9wPY/IAs6T 0z5g+10Dt+1JzxQ== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 X-Patchwork-Delegate: kuba@kernel.org The only difference between am65_cpsw_nuss_tx_compl_packets_2g() and am65_cpsw_nuss_tx_compl_packets() is the usage of spin_lock() and netdev_tx_completed_queue() + am65_cpsw_nuss_tx_wake at every packet in the latter. Insted of having 2 separate functions for TX completion, merge them into one. This will reduce code duplication and make maintenance easier. Signed-off-by: Roger Quadros Reviewed-by: Simon Horman --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 98 ++++++++------------------------ 1 file changed, 25 insertions(+), 73 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index a2b6a30918f6..75b402132e3f 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -1502,6 +1502,7 @@ static void am65_cpsw_nuss_tx_wake(struct am65_cpsw_tx_chn *tx_chn, struct net_d static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, int chn, unsigned int budget, bool *tdown) { + bool single_port = AM65_CPSW_IS_CPSW2G(common); enum am65_cpsw_tx_buf_type buf_type; struct device *dev = common->dev; struct am65_cpsw_tx_chn *tx_chn; @@ -1509,6 +1510,7 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, unsigned int total_bytes = 0; struct net_device *ndev; struct xdp_frame *xdpf; + unsigned int pkt_len; struct sk_buff *skb; dma_addr_t desc_dma; int res, num_tx = 0; @@ -1516,9 +1518,12 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, tx_chn = &common->tx_chns[chn]; while (true) { - spin_lock(&tx_chn->lock); + if (!single_port) + spin_lock(&tx_chn->lock); res = k3_udma_glue_pop_tx_chn(tx_chn->tx_chn, &desc_dma); - spin_unlock(&tx_chn->lock); + if (!single_port) + spin_unlock(&tx_chn->lock); + if (res == -ENODATA) break; @@ -1533,23 +1538,35 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, if (buf_type == AM65_CPSW_TX_BUF_TYPE_SKB) { skb = am65_cpsw_nuss_tx_compl_packet_skb(tx_chn, desc_dma); ndev = skb->dev; - total_bytes = skb->len; + pkt_len = skb->len; napi_consume_skb(skb, budget); } else { xdpf = am65_cpsw_nuss_tx_compl_packet_xdp(common, tx_chn, desc_dma, &ndev); - total_bytes = xdpf->len; + pkt_len = xdpf->len; if (buf_type == AM65_CPSW_TX_BUF_TYPE_XDP_TX) xdp_return_frame_rx_napi(xdpf); else xdp_return_frame(xdpf); } + + total_bytes += pkt_len; num_tx++; - netif_txq = netdev_get_tx_queue(ndev, chn); + if (!single_port) { + /* as packets from multi ports can be interleaved + * on the same channel, we have to figure out the + * port/queue at every packet and report it/wake queue. + */ + netif_txq = netdev_get_tx_queue(ndev, chn); + netdev_tx_completed_queue(netif_txq, 1, pkt_len); + am65_cpsw_nuss_tx_wake(tx_chn, ndev, netif_txq); + } + } + if (single_port) { + netif_txq = netdev_get_tx_queue(ndev, chn); netdev_tx_completed_queue(netif_txq, num_tx, total_bytes); - am65_cpsw_nuss_tx_wake(tx_chn, ndev, netif_txq); } @@ -1558,66 +1575,6 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, return num_tx; } -static int am65_cpsw_nuss_tx_compl_packets_2g(struct am65_cpsw_common *common, - int chn, unsigned int budget, bool *tdown) -{ - enum am65_cpsw_tx_buf_type buf_type; - struct device *dev = common->dev; - struct am65_cpsw_tx_chn *tx_chn; - struct netdev_queue *netif_txq; - unsigned int total_bytes = 0; - struct net_device *ndev; - struct xdp_frame *xdpf; - struct sk_buff *skb; - dma_addr_t desc_dma; - int res, num_tx = 0; - - tx_chn = &common->tx_chns[chn]; - - while (true) { - res = k3_udma_glue_pop_tx_chn(tx_chn->tx_chn, &desc_dma); - if (res == -ENODATA) - break; - - if (cppi5_desc_is_tdcm(desc_dma)) { - if (atomic_dec_and_test(&common->tdown_cnt)) - complete(&common->tdown_complete); - *tdown = true; - break; - } - - buf_type = am65_cpsw_nuss_buf_type(tx_chn, desc_dma); - if (buf_type == AM65_CPSW_TX_BUF_TYPE_SKB) { - skb = am65_cpsw_nuss_tx_compl_packet_skb(tx_chn, desc_dma); - ndev = skb->dev; - total_bytes += skb->len; - napi_consume_skb(skb, budget); - } else { - xdpf = am65_cpsw_nuss_tx_compl_packet_xdp(common, tx_chn, - desc_dma, &ndev); - total_bytes += xdpf->len; - if (buf_type == AM65_CPSW_TX_BUF_TYPE_XDP_TX) - xdp_return_frame_rx_napi(xdpf); - else - xdp_return_frame(xdpf); - } - num_tx++; - } - - if (!num_tx) - return 0; - - netif_txq = netdev_get_tx_queue(ndev, chn); - - netdev_tx_completed_queue(netif_txq, num_tx, total_bytes); - - am65_cpsw_nuss_tx_wake(tx_chn, ndev, netif_txq); - - dev_dbg(dev, "%s:%u pkt:%d\n", __func__, chn, num_tx); - - return num_tx; -} - static enum hrtimer_restart am65_cpsw_nuss_tx_timer_callback(struct hrtimer *timer) { struct am65_cpsw_tx_chn *tx_chns = @@ -1633,13 +1590,8 @@ static int am65_cpsw_nuss_tx_poll(struct napi_struct *napi_tx, int budget) bool tdown = false; int num_tx; - if (AM65_CPSW_IS_CPSW2G(tx_chn->common)) - num_tx = am65_cpsw_nuss_tx_compl_packets_2g(tx_chn->common, tx_chn->id, - budget, &tdown); - else - num_tx = am65_cpsw_nuss_tx_compl_packets(tx_chn->common, - tx_chn->id, budget, &tdown); - + num_tx = am65_cpsw_nuss_tx_compl_packets(tx_chn->common, + tx_chn->id, budget, &tdown); if (num_tx >= budget) return budget; From patchwork Mon Feb 17 07:31:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 13977225 X-Patchwork-Delegate: kuba@kernel.org 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 4C2461990D8; Mon, 17 Feb 2025 07:32:01 +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=1739777522; cv=none; b=e19UBJeW24Tl1Et8TyppqAKlF5IIl022yH5njVYMaf63/bCmvURD1lplJUvTVlSfLcKedWLxaN+Rn43n2EwmOM90ZtAZ8pwVwc8slQBnBd5C7Au6ydyFtBpALlg0QXhUjjwXXQOjS0dx2KIAH19ULlKS5MR7rEiWROp1Co9g4mE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739777522; c=relaxed/simple; bh=3SDGakUGZ6fH02wYgLScNfAO5y9mbjIYzLs/10eaC6E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eBu6/J5SxqOVei5lwNRcrV8AGqeRflGqNvhqLC5iGXSo5oYeNajiYUlVNe0GzVyozdEoFPeFe2lRxVjkjLr5/J5w4MrljLdF21vez1H69iuSv0xzjG56DQsbPfw4qP5mLWUPKbjGaax378462BUZsP4ZucaPfSg+Ff8Iinm8YlE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=udgK2+ZW; 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="udgK2+ZW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C095C4CED1; Mon, 17 Feb 2025 07:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739777521; bh=3SDGakUGZ6fH02wYgLScNfAO5y9mbjIYzLs/10eaC6E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=udgK2+ZWS6iOGEXBVVYLoT4jAdlCKnUc5VTAnaC9G1b5hsodDSnEdi2HRY4zuEiEb DmwjGhezVBxoRZAw21v9XDRgh32oPm7nyHshUWCUTYvHmpXMF+W5+oaVFZGgQl8cDj eMAFEYDLhyAsydWyWgYCB2OSCcAgXjb+RxhColRgU33LOQ0mQIz3qw9zqhPmJx1OX/ EbhYRaiIoTC3jST9Awr9fnxDc21g1FTO5EII1H8aOchr8NfNckUwKwBen1wTx+Q+FU tHqYX5wiyHE/+E7Ukz1OEaeBhil+SMfNqLRMAOes52LKNZg4B0syA6UKFxMpNaGPv9 3jrVlrPOCYizQ== From: Roger Quadros Date: Mon, 17 Feb 2025 09:31:47 +0200 Subject: [PATCH net-next 2/5] net: ethernet: ti: am65_cpsw: remove cpu argument am65_cpsw_run_xdp Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-am65-cpsw-zc-prep-v1-2-ce450a62d64f@kernel.org> References: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> In-Reply-To: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Siddharth Vadapalli , Md Danish Anwar Cc: srk@ti.com, 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=2607; i=rogerq@kernel.org; h=from:subject:message-id; bh=3SDGakUGZ6fH02wYgLScNfAO5y9mbjIYzLs/10eaC6E=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBnsuXldsET5Jd3SJmS+a7TGtrClz8LhI4PB7dWG MI2llQDacGJAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCZ7Ll5QAKCRDSWmvTvnYw kyypD/4iJumquHdNsVPD4xEJh8CKpOT6jFq1hoFMol4qNGyJbLYT2cx6qyfYaRRp8R9h3CPLqPZ 3/3gt55HAxqFG/pioRg8Nqd89I4BC+1DdSqktYxp8Y1Wj0k3FCy0EaZJ89hW2aU2+0onI2ikSNQ KLAoFE7uiumB4WEtB+N94UO3HuFVDOiT4wH9uml9/gNY83gxrAe9FIJfbsPv7nyafbD76cc/vpf Er6hGcGoofov7A1/jO/lqniaNCkmRFA050XMTIfmfNW+vniOS68uebg/unysOQhIDFpLlN5ZgJn 06pc4oK61wIGYdOiGMI4zl8EtfzGiSDN8rzLIC3EVTkZHYgN120KgL/lMayfmEgBV3hWL93KC/X sKMEmA/iw0cUFVnsSLvvxiG3BgH0183MYmp1Z6fznk+vDLZQf9cWlwTDcIaPwM1DqNNiNQ9wqyn SISXx5Qy2YsVYY0lkOW1Erxd+ZiON0fcgE1hAci3pcH+fskon+sIFD3IeAltFX06lG3ys2m9Uas J3wSP8/YnFFyOxnEhduZW7lEVwLnlgHLybgI1uxTcJ0r6lZo++rebIyxkZAFThQDUoz50avIVMM c98eM6DjacRGDblST+oUOK/ITwnmu18pe+uwWRNT3Qrh6TU8n0HqyfFDzfpjOTQZ41aWjmDHuBI HosU/dmOHSahAYg== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 X-Patchwork-Delegate: kuba@kernel.org am65_cpsw_run_xdp() can figure out the cpu id itself. No need to pass it around 2 functions so drop it. Signed-off-by: Roger Quadros Reviewed-by: Simon Horman --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 75b402132e3f..6bd4f526cb8e 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -1167,14 +1167,14 @@ 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 cpu, int *len) + struct xdp_buff *xdp, int *len) { struct am65_cpsw_common *common = flow->common; struct net_device *ndev = port->ndev; int ret = AM65_CPSW_XDP_CONSUMED; struct am65_cpsw_tx_chn *tx_chn; struct netdev_queue *netif_txq; + int cpu = smp_processor_id(); struct xdp_frame *xdpf; struct bpf_prog *prog; struct page *page; @@ -1274,7 +1274,7 @@ static void am65_cpsw_nuss_rx_csum(struct sk_buff *skb, u32 csum_info) } static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_rx_flow *flow, - int cpu, int *xdp_state) + int *xdp_state) { struct am65_cpsw_rx_chn *rx_chn = &flow->common->rx_chns; u32 buf_dma_len, pkt_len, port_id = 0, csum_info; @@ -1334,8 +1334,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 = am65_cpsw_run_xdp(flow, port, &xdp, - cpu, &pkt_len); + *xdp_state = am65_cpsw_run_xdp(flow, port, &xdp, &pkt_len); if (*xdp_state != AM65_CPSW_XDP_PASS) goto allocate; @@ -1399,7 +1398,6 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget) { struct am65_cpsw_rx_flow *flow = am65_cpsw_napi_to_rx_flow(napi_rx); struct am65_cpsw_common *common = flow->common; - int cpu = smp_processor_id(); int xdp_state_or = 0; int cur_budget, ret; int xdp_state; @@ -1408,7 +1406,7 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget) /* process only this flow */ cur_budget = budget; while (cur_budget--) { - ret = am65_cpsw_nuss_rx_packets(flow, cpu, &xdp_state); + ret = am65_cpsw_nuss_rx_packets(flow, &xdp_state); xdp_state_or |= xdp_state; if (ret) break; From patchwork Mon Feb 17 07:31:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 13977226 X-Patchwork-Delegate: kuba@kernel.org 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 C30EB1990D8; Mon, 17 Feb 2025 07:32: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=1739777525; cv=none; b=usZBDGooMK8O56+CcDSFxFCESpcTnsQSd1CDJ/Vhzg+mo24eyB7e53zi/DNfMdb/i2162ufKhQmhbBBaU7gviZBbHx48XnaPOfvETYOlekPRQ1HdWP5euuXBBhR385XXyzQ3Co0XZnlru4HKBCwHlwHv8J1A/sh/wNGu3YMGAis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739777525; c=relaxed/simple; bh=19xJLjvkq62RYJ4N9p/9R4u1MMong2jAKqa9m+s/dsQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PJDcNODXJ/OvviaiBPB4uOTVDChQMD/OqE2lfPK9P2itPikrvNLv46du/+/PXm4OzMouOHrNcgIvLgdaarX9OIhDGLhnUTqYbfMy2CY1wJqNfXK6N1r+C2Hi/Rm4S1+P8yx0s5Kdzi/gLkPqfaK+SKRyFHZiCYbAZClSzprkRMg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RGOJHkdu; 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="RGOJHkdu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C1EDC4CEE2; Mon, 17 Feb 2025 07:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739777525; bh=19xJLjvkq62RYJ4N9p/9R4u1MMong2jAKqa9m+s/dsQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RGOJHkduEyk1GbjvEuUyb7HhKBErFCqi0R5pkYnsHgBu5pNxHVoCJbLsq6tGbjcS3 9+IhoE6bOpEYAgPJAmVw79DtwhUSJor+D5TdvWV+EQYLMS2Fov8mOA0M4Aw4fkzFGp yBYMVIqj6ktfSsQW28W8I+yQcGXdntaZWSOWMFyET0HUBHCh8v8I/J8XxYotdZcRyr 8PwvaD7gNhUimRipyTHAmAB0poF7rEAB+/R4nJ7QIHFKOa8zf4ca/Tcwf/TtIpzvLH 6p1mc37Uua7W1hPQLuE74f2dd1QnB3/6oX3kzM0Pe6SveKcBo9XVIcEWrnYBOyNYz5 LQWcib628Xngg== From: Roger Quadros Date: Mon, 17 Feb 2025 09:31:48 +0200 Subject: [PATCH net-next 3/5] net: ethernet: ti: am65-cpsw: use return instead of goto in am65_cpsw_run_xdp() Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-am65-cpsw-zc-prep-v1-3-ce450a62d64f@kernel.org> References: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> In-Reply-To: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Siddharth Vadapalli , Md Danish Anwar Cc: srk@ti.com, 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=1547; i=rogerq@kernel.org; h=from:subject:message-id; bh=19xJLjvkq62RYJ4N9p/9R4u1MMong2jAKqa9m+s/dsQ=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBnsuXlxkw4cQojYstASGutsETzAYig7hoQdZ4hf zrdzlioTC2JAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCZ7Ll5QAKCRDSWmvTvnYw kzP8D/wLweYTaize8cZmX+F/3+PrppDz5e2vmz4gd5nqlpp8eZ/YwJrv4W8Hy3UWggLBT5C8YhX i+YL/5C0/T7qghCq3pafZbr9MXmoyYpRzyam+qEuRSY4xwPC/xXW86jusgZ+Ehrh07b2XFqtI4/ pZfjEukDPBj3IrA6NVdWx8d7yT59UhWjICENMV8cGkThhata+z11Gv9124yxG7r5W9CvfzyQUwt 02A5M84vPRFGcUPg1Hrc1ulag0J2jNDm0672q+/IL7ppmJyQcsQ4xr/Eke7DPOXST1AoKxUZjDI COTc+hGnW7mNZYMGmONfID6ZH/1zhpxtoJvVRoNSXxIZuU9+ITfZD8yThhwtVCOQy/Y3/JIu737 sW9Gag0npXxvAbrego3qXG+kCvxAMrrYTJDB3iPbWHU89IonCekSOuwh3WillkMJCsCWI40ZqnI CPRewInysCPI77rZEuRt7sZQss2VEjY0bV09Yz2bnQksRoHp8QkjA2RQzuMD63YMK7JH4TApNut xmVRZ+yE0iONyYQX7tTInp2Ry8HX0SgbyXQxi4QwYmKtvgB5F+FlUS+QjFtuveM9wcYIIhxKg/d 0nTCO9f8FSrBUoKfQ/XMJrwQPGmxElaK/3LX8wzbOAp/04+I426F8U0/jANI7WLz7r/fPqO0oq2 QUeW4PID05+T2ZQ== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 X-Patchwork-Delegate: kuba@kernel.org In am65_cpsw_run_xdp() instead of goto followed by return, simply return. Signed-off-by: Roger Quadros Reviewed-by: Simon Horman --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 6bd4f526cb8e..468fddd0afd2 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -1193,8 +1193,7 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, switch (act) { case XDP_PASS: - ret = AM65_CPSW_XDP_PASS; - goto out; + return AM65_CPSW_XDP_PASS; case XDP_TX: tx_chn = &common->tx_chns[cpu % AM65_CPSW_MAX_QUEUES]; netif_txq = netdev_get_tx_queue(ndev, tx_chn->id); @@ -1213,15 +1212,13 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, goto drop; dev_sw_netstats_rx_add(ndev, pkt_len); - ret = AM65_CPSW_XDP_CONSUMED; - goto out; + return AM65_CPSW_XDP_CONSUMED; case XDP_REDIRECT: if (unlikely(xdp_do_redirect(ndev, xdp, prog))) goto drop; dev_sw_netstats_rx_add(ndev, pkt_len); - ret = AM65_CPSW_XDP_REDIRECT; - goto out; + return AM65_CPSW_XDP_REDIRECT; default: bpf_warn_invalid_xdp_action(ndev, prog, act); fallthrough; @@ -1236,7 +1233,6 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, page = virt_to_head_page(xdp->data); am65_cpsw_put_page(flow, page, true); -out: return ret; } From patchwork Mon Feb 17 07:31:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 13977227 X-Patchwork-Delegate: kuba@kernel.org 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 1792B1990D8; Mon, 17 Feb 2025 07:32:09 +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=1739777530; cv=none; b=AYn8Kycho5QOnrfF9bPIX32X+WcdvKBMjQz6KiuhvrO2TwWtaDNeGDQA43W4D+uS62kT+A6H0w7cKq93LTKE9ddXalzAPpUtbXhgq5Df6ymgqRI00fLVu/BV9Uh9WDM81aPZpkRbWbxzSm+pVXpuM6SbrzuNFM1HrLrrExq9ik4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739777530; c=relaxed/simple; bh=2MB2tf6LAMpLUYFWZxib5jvrRY4JsGRtJP82nuF5PYI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sgl+rmfsUvbVd78/N9xVcjwnpMIOWeZft42W78lkhRA9+XxcCAWqKIz4tiCUZuytTnWnBrlLwOWWoldjHf7iiN3p5jMgPWHuiw7BdK7Gw3CPKHT0vyEjYqJnwuvyd12+c8SaPH07YcRKlAr/12mny1+XayFwrgS3noXebZIx6wc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TbHN3CpX; 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="TbHN3CpX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2644BC4CED1; Mon, 17 Feb 2025 07:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739777529; bh=2MB2tf6LAMpLUYFWZxib5jvrRY4JsGRtJP82nuF5PYI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TbHN3CpXfDA+Jz8A5OGVqWLfJJJGqhkMQPSRyPigGEIeRxcoW5sgQvmig2AWyZWxr J7hy3uqtUfqs7LbowB/jLrQIp17W0YA2RtXKwhNnumB4MERkkWRJ5uyPSxPzIZmdmL Rj6Mfb9zE7/hAdtF7jxqQEEuKSJ2gIy0xt4PaXSYiGaDob2hc0OX7QiqRSPhovbAHY 5rER3240cEoXrxFVzS5dyzhQDALUDOMPS/q60zbBr63IgFDEjB7YzDykB4Ui2o0QMp NpkIL5ZtYblqW04yEcago8FWf4s8ogxMvgj0prhmTLrchq9q5ZtxMFV7j8YCTMKf8D YyhL7qQSpLdEQ== From: Roger Quadros Date: Mon, 17 Feb 2025 09:31:49 +0200 Subject: [PATCH net-next 4/5] net: ethernet: ti: am65_cpsw: move am65_cpsw_put_page() out of am65_cpsw_run_xdp() Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-am65-cpsw-zc-prep-v1-4-ce450a62d64f@kernel.org> References: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> In-Reply-To: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Siddharth Vadapalli , Md Danish Anwar Cc: srk@ti.com, 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=2037; i=rogerq@kernel.org; h=from:subject:message-id; bh=2MB2tf6LAMpLUYFWZxib5jvrRY4JsGRtJP82nuF5PYI=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBnsuXmHrW+DG1RvetzfBXl6OSJHembiNvtlgqey MGzxsfqnCuJAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCZ7Ll5gAKCRDSWmvTvnYw kw6CEACqExShtQdojmqEsvKNxfXXHo6SpMDrP2hhZSn4BiLJiz1EqSJqamL9t8AIuV3djZJJF6n v3y3dZ1DxD24+iwSyGbZgbbXl/xhCUvxfkVoSbfjZeLSJakfxjf9u305cS2Dj+F6zbVmsNsfn4y j3DF1GbujwC4jiHRe2EiRSXlJK3a2g4O8ya9G0PEUeeIF0UsIgNAJdTI6uDg3u4YMlTouMNwWna L0PLYNzkpwiGOIUZX1/T9n2+8A2OTpLFdu2EP7i6Jjz1FDmKMljFnEswakVZt8uhlLm/VvOYbwk YAvc8QZaauB54N3bEpIt1BwkOfmPKn65ymFa3S2pdwt8Cmt39hwbNqCB+e8sCCJqxJr7AU69Lfi WlmFZnrQNP1EfdemY65Dr6b911jMCARUNDKcaBMwXryg8RboQVb9orRka8u2E6Img4D41/tW38h gg/uvaP3NPG1wL5dfusjFWrkpPFk2zmJt9gmZ0ekU8kaMOUedXteXzmIVLlpgcxd+fyzecXbGME kHBnvH/nIaTzRPNEn7FNRsHB5gJtYn48cH8GI5AK3Lod3uWlm/f8f4//n0ENI+DIAzpjXdTKEWM DGLm/VJuEc+9l+EIjV1H2Tp2pykUvtnbBEuaZvXBBP1FrScHAcL7l0HV0OoFc/JoPlCeeriGPI1 2C8ZIvd1iExSxXQ== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 X-Patchwork-Delegate: kuba@kernel.org This allows us to re-use am65_cpsw_run_xdp() for zero copy case. Add AM65_CPSW_XDP_TX case for successful XDP_TX so we don't free the page while in flight. Signed-off-by: Roger Quadros Reviewed-by: Simon Horman --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 468fddd0afd2..32349cc58e2e 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -164,6 +164,7 @@ #define AM65_CPSW_CPPI_TX_PKT_TYPE 0x7 /* XDP */ +#define AM65_CPSW_XDP_TX BIT(2) #define AM65_CPSW_XDP_CONSUMED BIT(1) #define AM65_CPSW_XDP_REDIRECT BIT(0) #define AM65_CPSW_XDP_PASS 0 @@ -1177,7 +1178,6 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, int cpu = smp_processor_id(); struct xdp_frame *xdpf; struct bpf_prog *prog; - struct page *page; int pkt_len; u32 act; int err; @@ -1212,7 +1212,7 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, goto drop; dev_sw_netstats_rx_add(ndev, pkt_len); - return AM65_CPSW_XDP_CONSUMED; + return AM65_CPSW_XDP_TX; case XDP_REDIRECT: if (unlikely(xdp_do_redirect(ndev, xdp, prog))) goto drop; @@ -1230,9 +1230,6 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow, ndev->stats.rx_dropped++; } - page = virt_to_head_page(xdp->data); - am65_cpsw_put_page(flow, page, true); - return ret; } @@ -1331,6 +1328,12 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_rx_flow *flow, xdp_prepare_buff(&xdp, page_addr, AM65_CPSW_HEADROOM, pkt_len, false); *xdp_state = am65_cpsw_run_xdp(flow, port, &xdp, &pkt_len); + if (*xdp_state == AM65_CPSW_XDP_CONSUMED) { + page = virt_to_head_page(xdp.data); + am65_cpsw_put_page(flow, page, true); + goto allocate; + } + if (*xdp_state != AM65_CPSW_XDP_PASS) goto allocate; From patchwork Mon Feb 17 07:31:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 13977228 X-Patchwork-Delegate: kuba@kernel.org 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 062F31990D8; Mon, 17 Feb 2025 07:32:13 +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=1739777534; cv=none; b=ohoAR9M8YwIuVVd6BaxBpfh3ZW3pjHPluJeZBVWQgvh9HVj9SkoVM7WzWrYifetTAZwhhTXMyXAjphrEJHyNSaZujvrswTmVhim5clagLokwwYlu/N7mWTv+SbBFoOWK5soIWSB8qFQcWIzIwYSRWAwdrQQ3wc2agddntN3EDdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739777534; c=relaxed/simple; bh=9NR9uTpmBKM+b/8es4AdXLZK28bJM1hev9e485P/wLY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KJfs9wXgzG8DWJbZQGIqnA0GyCftyv12I5k31Xaj8iTCeN2K07yl07puselYaVF55vmt+0JIBRWgWrmlHWukwSbur4i50uOth6bevGbnanJVIaay+/Atj1V+P2S4FJaX9XccHHx0McYRZk6MA90kzqGYvAU6qPKMUVICKNqXWqE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eJUJP0XI; 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="eJUJP0XI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07B05C4CEE2; Mon, 17 Feb 2025 07:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739777533; bh=9NR9uTpmBKM+b/8es4AdXLZK28bJM1hev9e485P/wLY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eJUJP0XIwYSpXC/6dzPHdpZCjuomZu1kgWDecA4iagXwSCKSLQJE2xHebREWaDoKv +I9yx0/C0bOtFPlzdncsWSbsRegkFzvkAMcQ8SSXygIzEBoztf3yZAPYCNApcMNO0q 1laf6DJe5TOZ2ZLRMzgfdvcEtKrvi8r/xJSsr/yeOQMllHNpcnIa8sjqgVuTCw2M7s AtmWM54pJnd+CXvfWyzygq5X4XPCNAUc8oPk+ZHNT79bZqu29hmg864BMO+mJMSUAh FLAjQZrafG5y3qfXNknMPFNkDjDfb/0YwOm+PPNEjLmGuYsSSAXSw+yI+T3LZFHMY9 QzCtBiwwKB9zA== From: Roger Quadros Date: Mon, 17 Feb 2025 09:31:50 +0200 Subject: [PATCH net-next 5/5] net: ethernet: ti am65_cpsw: Drop separate TX completion functions Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-am65-cpsw-zc-prep-v1-5-ce450a62d64f@kernel.org> References: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> In-Reply-To: <20250217-am65-cpsw-zc-prep-v1-0-ce450a62d64f@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Siddharth Vadapalli , Md Danish Anwar Cc: srk@ti.com, 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=7478; i=rogerq@kernel.org; h=from:subject:message-id; bh=9NR9uTpmBKM+b/8es4AdXLZK28bJM1hev9e485P/wLY=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBnsuXmEyIePQd9YEPN2pu3BwgVtOrkS7DSCm0Lw 8Tal2YWG8yJAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCZ7Ll5gAKCRDSWmvTvnYw kz1OEACPetSKeh0GKVbNUc4GzjCa2PoQXCqa8as2sGqzUUvb7S7ksBsKEv/78f+EGvO77/lP4Lw bDQ1Gn9T/mHFVv+x8Ury9rVBaDOStgus/FASST9eR/LNTw3W99iZ0dBGjIqP+a0J0t40a1byfdh gQR0wxXvw91VnjUqRU3JeRG5s7bv7HrnCDYFR64p7PuhpbJAWrxF8sqPGz4q4Mp3bUGRxZ3fqRO zBe4fFY/WpRknrXwp8+uKNZXntIo0X0aExIk8XW0uj6baaga6HEXoTGQWr/JFJoQrM5UO6lM8b3 jBsai9NVUMVX33XOsjwBCHPY0kl/573JQRdKLNsiAfHIglH9Q44+n1/yVHlmn31BCFh4cTmHVu8 t16eSS/gWpxF7k0bb5vt2uPpXVoo182OOu29Ga3fhfWSMsQtVvwpuhlh6uw8ps6qY+aESCT9QY1 QOEHiFRFueblTVVAUGsRp3VIv6EJLFqIKdYMKUBfyTyLXRVqijdACdTNZTnbDxv7xkOqeDmBhF6 wTKv+jT6GiHnCYpcRVpq9U6V6g+r0A2+E5YNYXcgTgOhbNLKyzMYK9BM2JBxvzMTHR+ZC4MXsYK NLWexSwiIA+8AIMwvwMTRS5myqK7OjAdkyudzL+tEnEtNCYcRK3jURE9uEba5P2BFCLbqWWKMSS f4YKlDucdjGVW6Q== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 X-Patchwork-Delegate: kuba@kernel.org Drop separate TX completion functions for SKB and XDP. To do that use the SW_DATA mechanism to store ndev and skb/xdpf for TX packets. Use BUILD_BUG_ON_MSG() to fail build if SW_DATA size exceeds whats available. i.e. AM65_CPSW_NAV_SW_DATA_SIZE. Signed-off-by: Roger Quadros Reviewed-by: Simon Horman --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 82 ++++++++++---------------------- drivers/net/ethernet/ti/am65-cpsw-nuss.h | 8 ++++ 2 files changed, 32 insertions(+), 58 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 32349cc58e2e..213ec2cbe436 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -830,19 +830,19 @@ static void am65_cpsw_nuss_tx_cleanup(void *data, dma_addr_t desc_dma) { struct am65_cpsw_tx_chn *tx_chn = data; enum am65_cpsw_tx_buf_type buf_type; + struct am65_cpsw_tx_swdata *swdata; struct cppi5_host_desc_t *desc_tx; struct xdp_frame *xdpf; struct sk_buff *skb; - void **swdata; desc_tx = k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, desc_dma); swdata = cppi5_hdesc_get_swdata(desc_tx); buf_type = am65_cpsw_nuss_buf_type(tx_chn, desc_dma); if (buf_type == AM65_CPSW_TX_BUF_TYPE_SKB) { - skb = *(swdata); + skb = swdata->skb; dev_kfree_skb_any(skb); } else { - xdpf = *(swdata); + xdpf = swdata->xdpf; xdp_return_frame(xdpf); } @@ -1099,10 +1099,10 @@ static int am65_cpsw_xdp_tx_frame(struct net_device *ndev, struct am65_cpsw_common *common = am65_ndev_to_common(ndev); struct am65_cpsw_port *port = am65_ndev_to_port(ndev); struct cppi5_host_desc_t *host_desc; + struct am65_cpsw_tx_swdata *swdata; struct netdev_queue *netif_txq; dma_addr_t dma_desc, dma_buf; u32 pkt_len = xdpf->len; - void **swdata; int ret; host_desc = k3_cppi_desc_pool_alloc(tx_chn->desc_pool); @@ -1132,7 +1132,8 @@ static int am65_cpsw_xdp_tx_frame(struct net_device *ndev, cppi5_hdesc_attach_buf(host_desc, dma_buf, pkt_len, dma_buf, pkt_len); swdata = cppi5_hdesc_get_swdata(host_desc); - *(swdata) = xdpf; + swdata->ndev = ndev; + swdata->xdpf = xdpf; /* Report BQL before sending the packet */ netif_txq = netdev_get_tx_queue(ndev, tx_chn->id); @@ -1433,52 +1434,6 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget) return num_rx; } -static struct sk_buff * -am65_cpsw_nuss_tx_compl_packet_skb(struct am65_cpsw_tx_chn *tx_chn, - dma_addr_t desc_dma) -{ - struct cppi5_host_desc_t *desc_tx; - struct sk_buff *skb; - void **swdata; - - desc_tx = k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, - desc_dma); - swdata = cppi5_hdesc_get_swdata(desc_tx); - skb = *(swdata); - am65_cpsw_nuss_xmit_free(tx_chn, desc_tx); - - am65_cpts_tx_timestamp(tx_chn->common->cpts, skb); - - dev_sw_netstats_tx_add(skb->dev, 1, skb->len); - - return skb; -} - -static struct xdp_frame * -am65_cpsw_nuss_tx_compl_packet_xdp(struct am65_cpsw_common *common, - struct am65_cpsw_tx_chn *tx_chn, - dma_addr_t desc_dma, - struct net_device **ndev) -{ - struct cppi5_host_desc_t *desc_tx; - struct am65_cpsw_port *port; - struct xdp_frame *xdpf; - u32 port_id = 0; - void **swdata; - - desc_tx = k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, desc_dma); - cppi5_desc_get_tags_ids(&desc_tx->hdr, NULL, &port_id); - swdata = cppi5_hdesc_get_swdata(desc_tx); - xdpf = *(swdata); - am65_cpsw_nuss_xmit_free(tx_chn, desc_tx); - - port = am65_common_get_port(common, port_id); - dev_sw_netstats_tx_add(port->ndev, 1, xdpf->len); - *ndev = port->ndev; - - return xdpf; -} - static void am65_cpsw_nuss_tx_wake(struct am65_cpsw_tx_chn *tx_chn, struct net_device *ndev, struct netdev_queue *netif_txq) { @@ -1501,6 +1456,8 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, { bool single_port = AM65_CPSW_IS_CPSW2G(common); enum am65_cpsw_tx_buf_type buf_type; + struct am65_cpsw_tx_swdata *swdata; + struct cppi5_host_desc_t *desc_tx; struct device *dev = common->dev; struct am65_cpsw_tx_chn *tx_chn; struct netdev_queue *netif_txq; @@ -1531,15 +1488,18 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, break; } + desc_tx = k3_cppi_desc_pool_dma2virt(tx_chn->desc_pool, + desc_dma); + swdata = cppi5_hdesc_get_swdata(desc_tx); + ndev = swdata->ndev; buf_type = am65_cpsw_nuss_buf_type(tx_chn, desc_dma); if (buf_type == AM65_CPSW_TX_BUF_TYPE_SKB) { - skb = am65_cpsw_nuss_tx_compl_packet_skb(tx_chn, desc_dma); - ndev = skb->dev; + skb = swdata->skb; + am65_cpts_tx_timestamp(tx_chn->common->cpts, skb); pkt_len = skb->len; napi_consume_skb(skb, budget); } else { - xdpf = am65_cpsw_nuss_tx_compl_packet_xdp(common, tx_chn, - desc_dma, &ndev); + xdpf = swdata->xdpf; pkt_len = xdpf->len; if (buf_type == AM65_CPSW_TX_BUF_TYPE_XDP_TX) xdp_return_frame_rx_napi(xdpf); @@ -1549,7 +1509,8 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, total_bytes += pkt_len; num_tx++; - + am65_cpsw_nuss_xmit_free(tx_chn, desc_tx); + dev_sw_netstats_tx_add(ndev, 1, pkt_len); if (!single_port) { /* as packets from multi ports can be interleaved * on the same channel, we have to figure out the @@ -1632,12 +1593,12 @@ static netdev_tx_t am65_cpsw_nuss_ndo_slave_xmit(struct sk_buff *skb, struct am65_cpsw_common *common = am65_ndev_to_common(ndev); struct cppi5_host_desc_t *first_desc, *next_desc, *cur_desc; struct am65_cpsw_port *port = am65_ndev_to_port(ndev); + struct am65_cpsw_tx_swdata *swdata; struct device *dev = common->dev; struct am65_cpsw_tx_chn *tx_chn; struct netdev_queue *netif_txq; dma_addr_t desc_dma, buf_dma; int ret, q_idx, i; - void **swdata; u32 *psdata; u32 pkt_len; @@ -1683,7 +1644,8 @@ static netdev_tx_t am65_cpsw_nuss_ndo_slave_xmit(struct sk_buff *skb, k3_udma_glue_tx_dma_to_cppi5_addr(tx_chn->tx_chn, &buf_dma); cppi5_hdesc_attach_buf(first_desc, buf_dma, pkt_len, buf_dma, pkt_len); swdata = cppi5_hdesc_get_swdata(first_desc); - *(swdata) = skb; + swdata->ndev = ndev; + swdata->skb = skb; psdata = cppi5_hdesc_get_psdata(first_desc); /* HW csum offload if enabled */ @@ -3525,6 +3487,10 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev) __be64 id_temp; int ret, i; + BUILD_BUG_ON_MSG(sizeof(struct am65_cpsw_tx_swdata) > AM65_CPSW_NAV_SW_DATA_SIZE, + "TX SW_DATA size exceeds AM65_CPSW_NAV_SW_DATA_SIZE"); + BUILD_BUG_ON_MSG(sizeof(struct am65_cpsw_swdata) > AM65_CPSW_NAV_SW_DATA_SIZE, + "SW_DATA size exceeds AM65_CPSW_NAV_SW_DATA_SIZE"); common = devm_kzalloc(dev, sizeof(struct am65_cpsw_common), GFP_KERNEL); if (!common) return -ENOMEM; diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h index e7832a5cf3cc..917c37e4e89b 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h @@ -104,6 +104,14 @@ struct am65_cpsw_rx_flow { char name[32]; }; +struct am65_cpsw_tx_swdata { + struct net_device *ndev; + union { + struct sk_buff *skb; + struct xdp_frame *xdpf; + }; +}; + struct am65_cpsw_swdata { u32 flow_id; struct page *page;