From patchwork Tue May 2 22:08:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenwei Wang X-Patchwork-Id: 13229314 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 1C869AD53 for ; Tue, 2 May 2023 22:08:43 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2089.outbound.protection.outlook.com [40.107.20.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34E92198C; Tue, 2 May 2023 15:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m7X8kjZTkBPIaV8XFWQdS0xPLjX8HSOm/qtOY4Mb5hI9i6sYl8PlTzjO/OE8PadLs2lojQtBh8+DiuCnT6Uf/hOPjoeWdNYV6z7sGV0rML1JA0NS3Mw9sLZO99XrDW5FCeEZSiorXGWTy2dE/5sRkX75ajbRxSdKno5j/0S05O1d2f4UjuixaI815kuiW4jLI3CPXe1RMPHGnwziMQq1WShLLtgv+Xy9zf+kEkmhe5qnIHK3Auoqx+2rEqYhCtLGi1wpN1uFMB9Ol8C2xvWgE/TXZ4YgDbL6z2PevsNKP2kNR+4g+vNTqibwnR+UKK75m8O8HEtaUyZ3ym+kkGFYEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w4ZbOXrqg0Z9bC3JJvm08i9JMWY4/r6DFAeHr8jsRxk=; b=Se6pfkTaKuxaqQ+iiRpz6fTjT4I8KF8ASxEP0wfh5RHI6B+0ODl+AEglJb/voaD5YuuQ5JsRbdd0JQCuiYHD4/ur/fAi5lgn5ZT8/1nTV1DeansoXrCw+DP4RL1qKBbbbibM1slBbYp7uct4TeKWMNOzPDSt2p1eE+4hu7Y+cN9NnRs7CJR5AzAbwidL57r5ynrCfooidbFMMYbYv0xm+zW+FaLPduBtJS/STCJC9SRy89qELiWqpN/bh4kQq/wG/9kEqofUw0L2F+wRx9Dxvhj5xRa/FFK4niPjuflP0X+fPwLXuXhLMbG+gNPh5CjJKTdJuuuzxRHOeHlQktPg/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w4ZbOXrqg0Z9bC3JJvm08i9JMWY4/r6DFAeHr8jsRxk=; b=nBqvhrhgtd8ZAM8UKMvhpKJnDz5H1aX7l5TxpsmGzWva4sJ7OqWoFgm0tP/utqALwrU31Vh45TnL5WVjjn7GuHJTin82Z4lL78psKaLsy5tIb5UTFpf5GWpN6/2e9Y78dBtxn2xZyx3rJTaLjfZ68wE9TGwwiOIh2BNGhj/Z47g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) by PA4PR04MB8016.eurprd04.prod.outlook.com (2603:10a6:102:cb::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.31; Tue, 2 May 2023 22:08:37 +0000 Received: from PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3]) by PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3%5]) with mapi id 15.20.6340.031; Tue, 2 May 2023 22:08:37 +0000 From: Shenwei Wang To: Wei Fang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Shenwei Wang , Clark Wang , NXP Linux Team , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Alexander Lobakin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Gagandeep Singh Subject: [PATCH v2 net 1/2] net: fec: correct the counting of XDP sent frames Date: Tue, 2 May 2023 17:08:17 -0500 Message-Id: <20230502220818.691444-1-shenwei.wang@nxp.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: BY3PR05CA0048.namprd05.prod.outlook.com (2603:10b6:a03:39b::23) To PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9185:EE_|PA4PR04MB8016:EE_ X-MS-Office365-Filtering-Correlation-Id: cd6484fb-6171-446d-88d6-08db4b59c717 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ukEsdoEn8mSp0sGrbKhYPuzCO6BRVXQOFof/YO0ltoUKAGChj1ZUmrv3rTEOmGe/nsbn9tQbVmdTh6LtfKptGRA3LSPu9690k5NBxjQwsB8TEV0LAmExT4tYtmNvJg88FCdFku6USn4eNCnXHDlldZotX/Clu23z+68/oTANJzn7WGMyooKsogVjMOozj2hrKkr/aksI85791+u6g8DajXv6/IfP3OL4i1QAp4tU0qmZfTF/jXpZGZtTt7yphZC6zPWVYmvGz+FOejK5vEjxoczlgZG7MhRLc7qjwgh3dY1Mui/uByksczYBSJjCGGyUGwftx5Ja96RZl8QnT5E3+PgbOTb8gjt4wiUV6UcvXlFBvCL+DqzFwEXiBmLSdpRtmSS0NUNNgsTP4EBFNu/fmCo7nLZ+863+XcqaTlgm76qwxT14/RSpWy+STLLXXKILih8Iz+fzYDh7VcM6B3bLgqTIEO+5ikwFHzG8pRMPlBJ9LIfIJL2aJLwlBcmEu0AMBj2r/fJOiQn4yTpy+5ZnpjPzPGjAOTFauSJNH8vhcsAcmhJEus4iLMXeJ8RzZdEWaHXNk7W2yyRk0BJ8wBCB2jJr6+yYA+pVSLjVYfajlYxMdFjgDVnUW3GbTQHiiLQ6 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9185.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(346002)(136003)(376002)(366004)(396003)(451199021)(54906003)(2616005)(478600001)(83380400001)(6486002)(6666004)(6506007)(26005)(1076003)(6512007)(52116002)(110136005)(4326008)(66946007)(66556008)(66476007)(316002)(55236004)(186003)(7416002)(41300700001)(8676002)(5660300002)(8936002)(44832011)(38350700002)(38100700002)(2906002)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q9irMVYgWNQzMg8AH1Z7dKKxyKbhElIWhCSNHgE62holld/dCCG0GJrQY7/HpYpPMGMg0uh2SrurtG+36DkDZVPAEG+P//tIudE3zgoYADd8s5wMFY5ud+btVGOrphxlnD1BNFUwpa2Jmxq+pg+7f5kARbgTVjYzYEC9s04SLt3WvCsMySxmbXdnE5UqUdJ4KhKXBEjCN9ZbpSvQDLTBnTtPzl7+VScTLGCXb+/4dUGZi66b6BMA2rS707mNiJ30ndmHH/ykp2kJ/wuJaaEtm94uWdYNe9us5GRykTAhjTanxUJrsK73KXUeYYJk/7q1gZnHLig7xNjpQFBZ+nXTAHvC9SMFpKZqDI8kNCLvwia/hRvtmbChrRrulxRAK6uvqmPxHZh5kRVUxovn7exrK/k/EgwJL4bjGJ/4JS45lZ5CezwE3bTgjBBgC8IrlDvB5Pm94ePHHlgYyocMJ4KMtCxt0QT8p4fhgp2DcHjMg+MWK5wJ61q+Pm5Q7NU2dFahDkNR6eC4LsbyqlcsM79MwZUh6Cf1EXUxu0GnizrzSLdTloI7s/Pe7+Sxobmfys1NzsdHGeZWciJWpQYWQNmCmJ2jLpbPTE0RUxpFjaYuGAJv+0RgYd35fW4o6tt0xY2JIUtVMe7wlODs0Tvh0J6E72AAV4MHR6u+Tc3ta4FC7mTDPhdmGxSzSq06nzRzbOdVzjBfxCx1mTkX6CuXnB6JVwYzPeM77/RJZ2L6d1lmQ4xCyr4nmg2McBJmtFl8choUzfM32yj/CQnrmcuKzLBqYM/+qC7ik58luQPtzGvXoU46XObNX9PA6D2ZX6W16GYMRazgK08nmIyUqPzAbt18pHl6oo5E3CrCad2DZ7nL8RY6cuPil0z6PkxVsoVE2VkME7xHZzQ23qUWsHell6hq59JX1+QlvUWwxydy8h7iu2xW9EC+w5xtAE1lv0TyVSxfZH30KeH4/wwCl7ihBv4hZ7CbvleUXS6YjrYk2aanss0u61CIE8wkwOgidFK3xBkUc8acnIqpvwTWpuCnT62q9JTQhViOvmYSqpRSfeUdMCaNPIyX+aRGMEkNeCOAJuxEAInTNjEq9MKrbjLCinTuFPSEBaWeuIrGrs1c+FoPDyKAW43e9Z9wu+oYQ+aiL34BguZQRUibfKEJ5WPD4OMQQ9i7uokxMPqiy6Bm2VLoXYq7KSQ7MXnZIhWl4epxsWWZ85tVxDVcwmJfBlRXCwq2hHiJwLrX9AjSmkOgzP6/7k1jxEClUUXczSH9ppmNsphHMD84o4zBIsMHH+T7ai8RW+UQoF/appW8hPcTskG7HpLFofLINKHzbmFvojIOd+zfrH1bnHCMAoG2uIhr58Vpyc/34P21ynOuD+zlIi+2oWDPwwBB+FpyA+VKCrNr0yGiEoOpyaiaXuRlxC7cbZebsbMeOHQNig7Rhk1g1mP72SnUpFI2dGRXOTRyX81fvMGLiq9XrB3bPcFiOXhwrLmWmIIb2bTYjOSkdqJrrK5+cwP7CUVqnlwbjOoQRBA6W/i2qIE3qIil6dZk/3DQy9GGAwG/0NY439lgK7Q5QW5Ifh1zpg6dEwTS8+tfOgqFM2DE X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd6484fb-6171-446d-88d6-08db4b59c717 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2023 22:08:36.8719 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2oJIMDiWlqq1OEXQ1mXgZ3Oxvp7XtXkoOgOrzSNZah+jcFBh3v9OKABmnidhCscVr4V4kVfxcNlQHswVWZcA1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB8016 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org In the current xdp_xmit implementation, if any single frame fails to transmit due to insufficient buffer descriptors, the function nevertheless reports success in sending all frames. This results in erroneously indicating that frames were transmitted when in fact they were dropped. This patch fixes the issue by ensureing the return value properly indicates the actual number of frames successfully transmitted, rather than potentially reporting success for all frames when some could not transmit. Fixes: 6d6b39f180b8 ("net: fec: add initial XDP support") Signed-off-by: Gagandeep Singh Signed-off-by: Shenwei Wang --- v2: - only keep the bug fix part of codes according to Horatiu's comments. - restructure the functions to avoid the forward declaration. drivers/net/ethernet/freescale/fec_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 160c1b3525f5..42ec6ca3bf03 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3798,7 +3798,8 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep, entries_free = fec_enet_get_free_txdesc_num(txq); if (entries_free < MAX_SKB_FRAGS + 1) { netdev_err(fep->netdev, "NOT enough BD for SG!\n"); - return NETDEV_TX_OK; + xdp_return_frame(frame); + return NETDEV_TX_BUSY; } /* Fill in a Tx ring entry */ @@ -3856,6 +3857,7 @@ static int fec_enet_xdp_xmit(struct net_device *dev, struct fec_enet_private *fep = netdev_priv(dev); struct fec_enet_priv_tx_q *txq; int cpu = smp_processor_id(); + unsigned int sent_frames = 0; struct netdev_queue *nq; unsigned int queue; int i; @@ -3866,8 +3868,11 @@ static int fec_enet_xdp_xmit(struct net_device *dev, __netif_tx_lock(nq, cpu); - for (i = 0; i < num_frames; i++) - fec_enet_txq_xmit_frame(fep, txq, frames[i]); + for (i = 0; i < num_frames; i++) { + if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) != 0) + break; + sent_frames++; + } /* Make sure the update to bdp and tx_skbuff are performed. */ wmb(); @@ -3877,7 +3882,7 @@ static int fec_enet_xdp_xmit(struct net_device *dev, __netif_tx_unlock(nq); - return num_frames; + return sent_frames; } static const struct net_device_ops fec_netdev_ops = { From patchwork Tue May 2 22:08:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenwei Wang X-Patchwork-Id: 13229315 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 E3F74BA24 for ; Tue, 2 May 2023 22:08:48 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2088.outbound.protection.outlook.com [40.107.21.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 762AF2718; Tue, 2 May 2023 15:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mmtb5E9gNLSSW1her0ZafSP9c6ljYQsR6sn6BQrRd2A5z70zz9rv1bOpUI6bHmz5Myc1wTJ1RUe1JvDnr4nLHW/A6lCeWn3ke33V3n9e2uuw6r7xq4cbdUkhmd7xFK+uK4i/XxHW75Vcbu7g4QJ/R1eV7YPzZGB+bT8i1dFJ/1bTEj9+CvW3TuCRe+48HeRkaRNy4+JKKmtkUTx+zIi2awbcXY7CDUyZ2RF1R9oZZkZ9Di6yLwAnrcSdeXl6Z6WXoB/7YxEx3gU2GafMrmnf51l11uELE5PHLA2enRYYeyavIdS6KsoFtyANCfoifAterbDTESi1OWoXl6gvxDlGcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Z/URwLz8UVdnAwxQunp4zr4XBH25d6pXSNWRB0wLBBA=; b=Aa4DdY7e/dtbxku8bGkwSQJ5skJg+VaztNQqMvN7dyQezIbmZcfEo2ElB+rSiWbklctAapx1+aHM9UkO8hAwUKqfNFDf1XZ04VcMcrMTOrjTt9mLrfOemEhRFfTJ4VjlgPgBrNKQzlTtKEpbTwSdySk2pZS5Q7uOScEQ0DRaZwjpzmEhu3Zs5Kc2BRkUkG5O4PNaXX8a2WEbCJjpKVPuumGSPI1t46KHQWOqccdihVumTxGErCg0/zcZIyEOT+7JrVeQJAwWEBCGZSKg1ilg+LVHCYCPJ9p5Ea2fo0F6QO9WfRgPyo9AHK6sLsAF3g3SP8GOy7FzbUCf0jga+RVbEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z/URwLz8UVdnAwxQunp4zr4XBH25d6pXSNWRB0wLBBA=; b=k3b/ZTuibIdb8bMgY8gtqNm7Q3gX+2ZjVucdwTnhv/wwGSnZkc5ojFtYby5NvO4zwN/WTH+8CzQZ4gFMn9d3qd6WktjFINfehv/VUV9UvKNDrWw57B0NqYHgVFZLP2jvrUJwkhX7GMW7qFNM7l0hhY2BGgoPek0yQpxe6OZIqL8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) by PA4PR04MB8016.eurprd04.prod.outlook.com (2603:10a6:102:cb::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.31; Tue, 2 May 2023 22:08:44 +0000 Received: from PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3]) by PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3%5]) with mapi id 15.20.6340.031; Tue, 2 May 2023 22:08:44 +0000 From: Shenwei Wang To: Wei Fang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Shenwei Wang , Clark Wang , NXP Linux Team , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Alexander Lobakin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev Subject: [PATCH v2 net 2/2] net: fec: restructuring the functions to avoid forward declarations Date: Tue, 2 May 2023 17:08:18 -0500 Message-Id: <20230502220818.691444-2-shenwei.wang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502220818.691444-1-shenwei.wang@nxp.com> References: <20230502220818.691444-1-shenwei.wang@nxp.com> X-ClientProxiedBy: BYAPR02CA0069.namprd02.prod.outlook.com (2603:10b6:a03:54::46) To PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9185:EE_|PA4PR04MB8016:EE_ X-MS-Office365-Filtering-Correlation-Id: 890f6969-f5c2-46fc-721b-08db4b59cb43 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NsQQTHuUcIC0vmBiFKE0B5H18g+6IlPsQaHeqgJ4PWwsppnP3/PLpIcFIoniafHY/Fvked63SR4e8dwZXYQQTKAYylsRxGJjltknnoDiiaUeZp9blTYTokw3D26dVvkyNe5wA+SgUozlJO0aLVEn9lOrqlaN2GLhZyahbE0clyhTSN/s/6QcrN7/lQarGCqFy2tGup3LuIBApewb3ciQRQPOCQ8kmy5K7id7iVsza9Tkku8PfpWj13eJh3Br6AMZzhGSltj3LTIFU7Y7HvrBCYxr2M2NPn3T1Et/NuHG6Re20Qy755MLHJjbrPrHKywalqaCebENgfS5m6YFuXyTsL2jfcDN2FGhYi2bKaLw6UTzVqyZ3HQdxtTrTfpWjzOMukBSGoEhoP3/14ipeifKsqxksLZYjomcIu8XOiqBniIW8qnVbpkSQzLkDddXUVO6XGYmwL4QInxyo9K6yiYXrSJzpnNgDP+NRKM8ATFrIHog0hpd+MuYQ5ZIpEI80aX5TcFT+rDcPU0B4gyEVzGDKQ8Q4L77SAUR9YVGdIhUyJoukKSCMyWdmqiDWGEjKzIdOojhXYyxcTTSz1GENxRCLUzKNLEDYuNDc8Y+w4W+/v8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9185.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(346002)(136003)(376002)(366004)(396003)(451199021)(54906003)(2616005)(478600001)(83380400001)(6486002)(6666004)(6506007)(26005)(1076003)(6512007)(52116002)(110136005)(4326008)(66946007)(66556008)(66476007)(316002)(55236004)(186003)(7416002)(41300700001)(8676002)(5660300002)(8936002)(44832011)(38350700002)(38100700002)(2906002)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZVd/cHyjgU9tOEHwOVgiZzIPXFV3+bsWsuIvZg0puRYFCV8kcGAIy8aG/v7cGqzv86RnlbDuyAiNU4BdKIhK0ZZ8XyXtWpOVVEQeJqp6GhwlJYWMNIqpHIjGrxNbckNOzxcmm3W082tsOW+idZHcAbKwT5MwIrwDiT5BSg1cItxe0OdZEEt+541z+b37qCVmAylVnScWbQqvXE2jRrERLSgEW42XrqSBydRW1YMO4HTdLdTK23B60X8eebmVIFUPsvl8QKrqpvqAqpDgBiOrzNW03ttRhSt6BkpCMAvzWaIuvVu41ZAoyTqnAZJK9q7ckpkbwgORUIDMeCy2cjbER1W+0G6Vr3KpDbAY2NolNReGCEmoW3oiAz4qvCpcM8uJg/SQq7A19KUoGSk35L+JEpjK8GzsubGAzp3hk8pGW7n1/LBT+KTpvt6neoj25VubOeKbua4EatETbDamgoYynk7pPM9V3pgPB4JFJOpw5vc2WDKQ5dixMrxOVGQzjUQZypZVdqTsXwiVya2z+NxQU5xfdVZ6Adph4c+ly32qXpj/kNxGULinXP0Z9G3/acSFFQCLpGp3mQzZt2YKczrfw1qtT2EcwtcajEmu5iTCPhP6NsqL8T/8diNJ0zQJtUarQsbA+nKeft+crEPXHibV+UA5nJUYCkvARImCQ7CBIFanDoIAyaWg6xsuFqlwgOL2TfVPoTEFLSlTRGqVkLS5+VeafxTGTfKbH1Yih2R6dIVn1VzmFCd9G92Hdieet8I1SFYIHLZHRPjQtzxd797pp4sWQ1sbZQeHVKy64xgAxXus7soo7vjr9hVEweo4CGZEFvwl/O1c5heU19Svho1vA24VpBKmGSmV7GTsY/hFAbVd6VALt7WAq/cyD+vOnnSYwP87IWwWQQqyDP1yobhm9KMljUkv645yAYjoXmrzMJ/BkGWVen1pa4tzpGAqjyh2uuAgNEcBJIZqgnfjavadZwk+dmZZ7UfwZXxOrk+mWd90cHruyHIWfn62SE9zTvoEopO5olm9EDs8VrDNA85NIbfhmaVhI/swXostst77YyYyWggBRts5AOC6KQ/cpEaQUlU+Jqt+jMIJFTELh6J7hgx+LhtfslFLpj2oQRmkHd8KuJNmZ0Cpt+Hxh+aSvbLBxWQxTsH9PvUKJGGTtMhxBDYH25VdtDk/bmjXkn60lYHr0D35WsJBAbSyaz9doBGirAZvjgsNIFLnPifD2/I+V0tcN09fLiAipxBDgzm+3oPXPVhwVe45eua0RmXJcGQ03W9oMXefOmZF4kET3fjhzyCHqvgWW0nmUOtN5Ok4psoY70sh//so0fjws6IyTg0J6FVyT4HZZLRRQps8j3BntWOaOa28LV0vQ5GEoACpMJgRB1puais2ZdoZnpW1NukSWY9wxVvV0gAoBp+nJyH6wbgKwLy5edu6glQa6PK4vYkqX4exmxTsb031f/ZDcbtIzMw1fry9X3vFanD11V7ADC2EM9tUgBpcBy3xWivVhdnm+AWjiKsOglVtSqL65b63CwHw0KooVG2YtNmaVFo+cAu+P5NnzXAAw+o6GUFLCsq4OfDJo0Cl1A1+3t0N630F X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 890f6969-f5c2-46fc-721b-08db4b59cb43 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2023 22:08:43.9748 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FJWDHUJl/xkTJdh3jy8zuGUUz/wqWnsHA13SjS+/YzqEnZ651Mm3Wkz3iotIaOJ3tpx37VUkVM50WkZiLtQqsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB8016 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org The patch reorganizes functions related to XDP frame transmission, moving them above the fec_enet_run_xdp implementation. This eliminates the need for forward declarations of these functions. Fixes: 6d6b39f180b8 ("net: fec: add initial XDP support") Signed-off-by: Shenwei Wang --- drivers/net/ethernet/freescale/fec_main.c | 216 +++++++++++----------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 42ec6ca3bf03..14f9907f3ca2 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1511,6 +1511,114 @@ static void fec_enet_update_cbd(struct fec_enet_priv_rx_q *rxq, bdp->cbd_bufaddr = cpu_to_fec32(phys_addr); } +static int +fec_enet_xdp_get_tx_queue(struct fec_enet_private *fep, int index) +{ + if (unlikely(index < 0)) + return 0; + + return (index % fep->num_tx_queues); +} + +static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep, + struct fec_enet_priv_tx_q *txq, + struct xdp_frame *frame) +{ + unsigned int index, status, estatus; + struct bufdesc *bdp, *last_bdp; + dma_addr_t dma_addr; + int entries_free; + + entries_free = fec_enet_get_free_txdesc_num(txq); + if (entries_free < MAX_SKB_FRAGS + 1) { + netdev_err(fep->netdev, "NOT enough BD for SG!\n"); + xdp_return_frame(frame); + return NETDEV_TX_BUSY; + } + + /* Fill in a Tx ring entry */ + bdp = txq->bd.cur; + last_bdp = bdp; + status = fec16_to_cpu(bdp->cbd_sc); + status &= ~BD_ENET_TX_STATS; + + index = fec_enet_get_bd_index(bdp, &txq->bd); + + dma_addr = dma_map_single(&fep->pdev->dev, frame->data, + frame->len, DMA_TO_DEVICE); + if (dma_mapping_error(&fep->pdev->dev, dma_addr)) + return FEC_ENET_XDP_CONSUMED; + + status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST); + if (fep->bufdesc_ex) + estatus = BD_ENET_TX_INT; + + bdp->cbd_bufaddr = cpu_to_fec32(dma_addr); + bdp->cbd_datlen = cpu_to_fec16(frame->len); + + if (fep->bufdesc_ex) { + struct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp; + + if (fep->quirks & FEC_QUIRK_HAS_AVB) + estatus |= FEC_TX_BD_FTYPE(txq->bd.qid); + + ebdp->cbd_bdu = 0; + ebdp->cbd_esc = cpu_to_fec32(estatus); + } + + index = fec_enet_get_bd_index(last_bdp, &txq->bd); + txq->tx_skbuff[index] = NULL; + + /* Send it on its way. Tell FEC it's ready, interrupt when done, + * it's the last BD of the frame, and to put the CRC on the end. + */ + status |= (BD_ENET_TX_READY | BD_ENET_TX_TC); + bdp->cbd_sc = cpu_to_fec16(status); + + /* If this was the last BD in the ring, start at the beginning again. */ + bdp = fec_enet_get_nextdesc(last_bdp, &txq->bd); + + txq->bd.cur = bdp; + + return 0; +} + +static int fec_enet_xdp_xmit(struct net_device *dev, + int num_frames, + struct xdp_frame **frames, + u32 flags) +{ + struct fec_enet_private *fep = netdev_priv(dev); + struct fec_enet_priv_tx_q *txq; + int cpu = smp_processor_id(); + unsigned int sent_frames = 0; + struct netdev_queue *nq; + unsigned int queue; + int i; + + queue = fec_enet_xdp_get_tx_queue(fep, cpu); + txq = fep->tx_queue[queue]; + nq = netdev_get_tx_queue(fep->netdev, queue); + + __netif_tx_lock(nq, cpu); + + for (i = 0; i < num_frames; i++) { + if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) != 0) + break; + sent_frames++; + } + + /* Make sure the update to bdp and tx_skbuff are performed. */ + wmb(); + + /* Trigger transmission start */ + writel(0, txq->bd.reg_desc_active); + + __netif_tx_unlock(nq); + + return sent_frames; +} + static u32 fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog, struct xdp_buff *xdp, struct fec_enet_priv_rx_q *rxq, int index) @@ -3777,114 +3885,6 @@ static int fec_enet_bpf(struct net_device *dev, struct netdev_bpf *bpf) } } -static int -fec_enet_xdp_get_tx_queue(struct fec_enet_private *fep, int index) -{ - if (unlikely(index < 0)) - return 0; - - return (index % fep->num_tx_queues); -} - -static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep, - struct fec_enet_priv_tx_q *txq, - struct xdp_frame *frame) -{ - unsigned int index, status, estatus; - struct bufdesc *bdp, *last_bdp; - dma_addr_t dma_addr; - int entries_free; - - entries_free = fec_enet_get_free_txdesc_num(txq); - if (entries_free < MAX_SKB_FRAGS + 1) { - netdev_err(fep->netdev, "NOT enough BD for SG!\n"); - xdp_return_frame(frame); - return NETDEV_TX_BUSY; - } - - /* Fill in a Tx ring entry */ - bdp = txq->bd.cur; - last_bdp = bdp; - status = fec16_to_cpu(bdp->cbd_sc); - status &= ~BD_ENET_TX_STATS; - - index = fec_enet_get_bd_index(bdp, &txq->bd); - - dma_addr = dma_map_single(&fep->pdev->dev, frame->data, - frame->len, DMA_TO_DEVICE); - if (dma_mapping_error(&fep->pdev->dev, dma_addr)) - return FEC_ENET_XDP_CONSUMED; - - status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST); - if (fep->bufdesc_ex) - estatus = BD_ENET_TX_INT; - - bdp->cbd_bufaddr = cpu_to_fec32(dma_addr); - bdp->cbd_datlen = cpu_to_fec16(frame->len); - - if (fep->bufdesc_ex) { - struct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp; - - if (fep->quirks & FEC_QUIRK_HAS_AVB) - estatus |= FEC_TX_BD_FTYPE(txq->bd.qid); - - ebdp->cbd_bdu = 0; - ebdp->cbd_esc = cpu_to_fec32(estatus); - } - - index = fec_enet_get_bd_index(last_bdp, &txq->bd); - txq->tx_skbuff[index] = NULL; - - /* Send it on its way. Tell FEC it's ready, interrupt when done, - * it's the last BD of the frame, and to put the CRC on the end. - */ - status |= (BD_ENET_TX_READY | BD_ENET_TX_TC); - bdp->cbd_sc = cpu_to_fec16(status); - - /* If this was the last BD in the ring, start at the beginning again. */ - bdp = fec_enet_get_nextdesc(last_bdp, &txq->bd); - - txq->bd.cur = bdp; - - return 0; -} - -static int fec_enet_xdp_xmit(struct net_device *dev, - int num_frames, - struct xdp_frame **frames, - u32 flags) -{ - struct fec_enet_private *fep = netdev_priv(dev); - struct fec_enet_priv_tx_q *txq; - int cpu = smp_processor_id(); - unsigned int sent_frames = 0; - struct netdev_queue *nq; - unsigned int queue; - int i; - - queue = fec_enet_xdp_get_tx_queue(fep, cpu); - txq = fep->tx_queue[queue]; - nq = netdev_get_tx_queue(fep->netdev, queue); - - __netif_tx_lock(nq, cpu); - - for (i = 0; i < num_frames; i++) { - if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) != 0) - break; - sent_frames++; - } - - /* Make sure the update to bdp and tx_skbuff are performed. */ - wmb(); - - /* Trigger transmission start */ - writel(0, txq->bd.reg_desc_active); - - __netif_tx_unlock(nq); - - return sent_frames; -} - static const struct net_device_ops fec_netdev_ops = { .ndo_open = fec_enet_open, .ndo_stop = fec_enet_close,