From nobody Sun Feb 8 20:00:05 2026 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012053.outbound.protection.outlook.com [52.101.66.53]) (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 4E3DA3A7F62; Wed, 21 Jan 2026 03:35:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768966536; cv=fail; b=Mdxbus0G24tuxnplu509XrHgVlzY0k8hiS/H0FWyeGE6/rureh9dt+WPwnwr/pCDW1dowpCnrn7z3KUV4MJW12MFhtUQ9z0ybGgYMHsLk55j/Hs9911HFq3AE7UI7yLah4Qv53bPvIk3XqU/uGNnlqMfC689rcdQt00s32qcxEk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768966536; c=relaxed/simple; bh=cZnL2Rju7JqTcGoYYZeqjdY7D1z/QPDtLrvDFJFMm4g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=b6Ln0/o3riwCTz+kiTvz0M41ejZwpa2hBTLwt33T0WUzSGMSRvcRZK7sq9quFUPiUD/lRvPFft/bN0AVOYspeNH2UVpdMdN8+OAOBv641VURnMwuEdQLVyWprjdDr32TPvyzRkC/kYZy85ypj79qXKq4j4T7DpGk8/IXV5g4cFM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=H4eUJZap; arc=fail smtp.client-ip=52.101.66.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="H4eUJZap" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JxVfkNNRFWC3m2u6F4q4QXm3zir/ksMmh7V0XdZfSpKgtP7vUvmDRThU/fLQGYhtz5ayC6JuWHCKR9eS8lubNGKL1MlD9LkEcQx+xyp4RN5WYfvM2ALolqWD1Fh7X1utAf8o6N5QWC3midR7QT/EomlPDPdmFo581dU5S/BA9l5U4EiTpe/iF9WRgqXtH1IuPaGJmxu1UD431DTUNKjOs4q8iAgnhZx8zqK+YG3izodvsKep3mBRecjlXW14QfGTYXHFIxiUNwWtSKLady2hfHMVmym2Yo90LZOhRSzebfh7L/NcZf7LsuKABslKdKy97HSFnQPa//QNt1bbPwVwnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=RFeYfhbTnZC6+m7hgzAiwpZN5ZaFLdQTtG//Tgvpdjg=; b=p9CJCNTIx+vnEQ0Hm9TMNaO0J6HkEO5IDDAluFqwhrRVcA7yCi3zmwS/Q81fc67FClYHsiPSu6RvzvzZEcN4DaccmchvExIqujP3Q2y+CVqUtxybxU8dpsfqOGwxOgd2AoWSyafQtDq8UU0ZqaOducRdVwPol2cmXmAuBFc+re1KffoLmhwr4pXEAKY1WvZEnv1sfa6srjBIjKLJXou59hvUWwbV9Rs1FwiTmAHwKW3c/CrBbF7Lizu/0vXqSSubamgP+lpuPG+QbAeLTaP2BhGLnFrhQUvfcmVrBbjUqWt2zLIVLMWuGlfEopCUws9LEdP3rM5dLms0KbL/IGYVsA== 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=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RFeYfhbTnZC6+m7hgzAiwpZN5ZaFLdQTtG//Tgvpdjg=; b=H4eUJZapc+/OiMRsTIc/Hk3como6JIdbVhe43njUpsPaqPdcGFgIcQi8oDMUfD0CGWf2z74Gznafm/33md8AyH50akLzbcg00LVcwhaTs0Fw7TbWp7AdGlX4IQsEeg1MbpNtcaR1wU5h4F/r2WwiEWzRHfDVSli0fmHnpmmDAer6CtqXcRtlgFRxEEjGiidJ2aC9s0m+95W//Zn8DNHrComzLnR4LCnXFBNGjeYFzrofUIHZXaKruXByRAdL0RKZyqv8ypRp1BKLMX5r2yebSVR4ot1E1Hx2IUcVTPVlaM6RITJLOmFNGPqYbN7c8MoHjlpYaLcrz6XG/eGbVaAm9A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DU2PR04MB8773.eurprd04.prod.outlook.com (2603:10a6:10:2e0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.9; Wed, 21 Jan 2026 03:35:30 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%4]) with mapi id 15.20.9499.001; Wed, 21 Jan 2026 03:35:30 +0000 From: Wei Fang To: shenwei.wang@nxp.com, xiaoning.wang@nxp.com, frank.li@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, bpf@vger.kernel.org Subject: [PATCH v3 net-next 15/15] net: fec: add AF_XDP zero-copy support Date: Wed, 21 Jan 2026 11:33:57 +0800 Message-Id: <20260121033357.3261464-16-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121033357.3261464-1-wei.fang@nxp.com> References: <20260121033357.3261464-1-wei.fang@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0049.apcprd02.prod.outlook.com (2603:1096:4:196::7) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DU2PR04MB8773:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b854dd5-a2d0-4de8-5f10-08de589e2018 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|376014|52116014|19092799006|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NzCjJRxqVwCkoqTORiuZyZZxUV5UE2P5F3wmQjIPooPWIwDDhNKNdQz6rUFH?= =?us-ascii?Q?CLhjGKrPCr+xbirFIy0EId0mYLYrIbX06u0HKQGA9MLVLboyL/b8Asqati2j?= =?us-ascii?Q?o0o2jUkBS8m53OiLLev0irA6nL0UiHeaZcVwlQXr4GaZoVJaOinY2bnHFy/0?= =?us-ascii?Q?RrLiJR4u5XceD9lrwddxVuooIt6AB4jVWdLaAAKR3IpH/UhMyO8VSVou0rLp?= =?us-ascii?Q?S/Mk0tXFXhpSQbVmSW0tC5W4QxzpWKnsihoLmi77sGJ3EP8/DMOXnYcO4+ud?= =?us-ascii?Q?rDAMl0W8cwMPv+gi2o479h27G0OC3gN7HtlcAMP/k/Avv4YTtcrXPVBN4y56?= =?us-ascii?Q?wctcjTr4ekW/RdDOKS961r3EpF1veewLStpAaSfrDIpWrHSYw2devsVjH1AR?= =?us-ascii?Q?L5PiUPPtCBnhNdv+DlE3XnybrRxfCRqVM82KNqKjnVYckVIw7VUv90Ur3hqN?= =?us-ascii?Q?i+UD8TO6Eq2/Mxv/rLCeEYi4jaNjscfA6Xm3XtbGrzAcGDczeria8FNUaKMo?= =?us-ascii?Q?LrN+HUntTFBatiShT5TfKY56ItpetoIxdj0bvMdUh+jBJ5M2VI8VFDCSeupd?= =?us-ascii?Q?WzcpGcefxqVwTL82/Wa/907RXlxJmviIv3qvCudVQ7EjkAWj9O5SkBWzZuaz?= =?us-ascii?Q?Elo1WNkqxxIv4gc3+rd6deeQS9xjQu0yEM9oJAZXZUwRKG9GRvPYuyeLJeCm?= =?us-ascii?Q?W6mbqXleb6Q3Oqrlxvz+wh5FUrBILIMulPOWiC2CkcE1G3rbYxyosBq8aelL?= =?us-ascii?Q?a8d6+C9Mq43j6jRMn5vhJ8efhMiqzl2+7+ViG+wQpvvrfrCR3lFCLgBIRIRn?= =?us-ascii?Q?4WWuvwy9VZTzLEhmQEzmouuTAojG4AhyRTvUgCBWq447OANmQ8xxE75N1uJ6?= =?us-ascii?Q?Q8KpxcF2H6Nk7hvLhe7A1bqN94Cs0htgX3UUCNpQrA7KlDt+dsDbVQNsW3va?= =?us-ascii?Q?iWyb3ryxcMdRAuAOE+y0OPPrl65euxFFu52wVzI5N5weJuOMkTomfh/U4iFk?= =?us-ascii?Q?uCzTj8GqBxNqHKNaf/Zundx4Biw6I+M4cYJZtd3ufUamYUcEaKjy7DaxAdil?= =?us-ascii?Q?dloOwkTKiVVhU9kYOtfJUchY0aPiH5xqlcYIRD/3SNBzduXoiJlWgL44phNZ?= =?us-ascii?Q?zJf5ihu6Rn4Zei7zw4mQFIx3WAl+SCK/O4hPoo81Eezvw2SF+hKF/6hpTDbO?= =?us-ascii?Q?M4pKr8q5e7RMpR9q98jVm7wO0FaTaerGBweQKzO03mwvspv2OBYm7FfsKw/F?= =?us-ascii?Q?YslgLDp/CvuWGdpyXdW7nK4cSEQiVUfZrOLrGi2X0K3LR/8dmKkC5l+7UZxj?= =?us-ascii?Q?yDSgG2LtKYCk8KBj34yXoa9BBedwb/VDeFmqy9YvHHalYrmJ18BGBYQd2MPd?= =?us-ascii?Q?p4EmxlD0/3AGgTvYxWCoSqa9RXNSkz8yzNu2mHbMTKylrTpO6vTbxTo6mEhp?= =?us-ascii?Q?11XtXHiQCuMpybwZtplHdULfV5TN6E+K73AOytAIRyN4B3nO08h+JieNLe8l?= =?us-ascii?Q?FaRc7QJLiVSuJ0GTgFom96WtNclDKRQcxPlUOC9WvKi5LXLEug0Ui4lASRgM?= =?us-ascii?Q?ezUq9WYV7TtlC914/rrs9OJwHSyOVVH8kkM8SUA83BLMwZXKgCYQzaI3Sb7r?= =?us-ascii?Q?TIg1WV2NKNpgVnoXkELtjvBsrkvFgqHKve2/2t4Bc+2N?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(7416014)(376014)(52116014)(19092799006)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nVHNjZ4UUbPk/ibzlXJJW+EFCP+ZIqW0V3gpQ1SrJaHiu+WahQD4lwlOAT7M?= =?us-ascii?Q?iJTLkeAvX7otbqPRnpeC2lKrHVGTNJfVziML70lk8gYj2llUg9QkLEp+kCBb?= =?us-ascii?Q?bLWeVaYiyIHafPj1nySlEMwg6fLIGjjriLGzVGePlRKDHPsuE6QiczdPRt1/?= =?us-ascii?Q?4GZcirYULGi+f41VjC2AAYzhbyeG362OmoWuWfyUw9vGuHifhkCAcaic14yn?= =?us-ascii?Q?sRmJMaAxoqcJYHZSB7ROz6p17ovxTy/yusGAO+Ktxwo0wpEGj0SO614Vh492?= =?us-ascii?Q?Ndv8f4j68qgZyBHs7CZiOe4ngj4zjdz4MYC2pa7nEKeUkDyIIlk6BPekw6q8?= =?us-ascii?Q?hL15ZVPkROfvBz2hlUGK0682mnVuGG8ctwqBj/+KniVSZV4NDQw4Q7Wsoxf0?= =?us-ascii?Q?XFEoU+XcJvFmDod1QhA4BFqz8f5MwPLE7QnKOdYIDQhV+ncO4Ccf2vDyDvwM?= =?us-ascii?Q?y/fUkvSSHcKnQPxIJ8Gcgjw0Z/1l5qoZsRy0iD/AqpeNU3DJjWn3MKJEdKBU?= =?us-ascii?Q?8rMtG26zHzUvrqrl6xZ02Js0dEBbySJqG64nDIjZvsaLsY5yy04VA2ynUySW?= =?us-ascii?Q?URPKikKKsK0bD2lrcI8fiuuiYsBW4yYco3ENAeoLzZcXNbt8LAcUdRYl4vc1?= =?us-ascii?Q?98o0F+JH4zRWwhNVcPF4cnusWWN6p/a1DoS9hnh05mX06cdvT9wZpM0SiuDB?= =?us-ascii?Q?zBruq4jWNkPP6VGojHuHU/p6AWyw+RuJ6tea0eVo5VEotljM6m+f4GAJtqKf?= =?us-ascii?Q?J7eJ+sCleVatpK2wmY7yuPm3xwa/ss++xgmy/n461CdH85GioA5Paa/bclYe?= =?us-ascii?Q?MmT4Ka8UdQQrZ6FaMS8fDUvxpZ5oT5HuOpb0DEKlGMqQ2rYdwLg6C+7n7m+P?= =?us-ascii?Q?H0SwpI93FV5NZyC0YBz3UB2+q1zjY6YNINJeoRgwCq0vyfxQGJbZDallJL6q?= =?us-ascii?Q?sPqy/Ykig8YHZe8fFqgWGG5T3fVAdykgU58cGP6NvAiZSarpLkiCOPeIVT+B?= =?us-ascii?Q?uC2zucdEzejDgP5sixVaSH/n3uymdEBtScQGVyva7/ViEt0rVjL0XBiMsqpO?= =?us-ascii?Q?/uCMketCkf3tp8p4iyQE8UL7Dv6JAvSYs96bYtCT0kwNh4jNCMQBf9qtpcBv?= =?us-ascii?Q?fHLxAaEtJP6LAXnADy26lgxfh9siPjLVTl+NCkByoS/gcLInmUBctqyZ4IHN?= =?us-ascii?Q?MxsqjlmefiVEqntbfQ/9iK3aj9dGeN4lmzRXeaH3LG3cZ0mivnDXzN+S5XOC?= =?us-ascii?Q?SWd/groVuOvrj4fshMQfHDdfgPdWAVMa+9rMiIqVhQY/SRoYgus1sRH/Gu3X?= =?us-ascii?Q?nE89FGjQzzG9uotzdRj9oN0KzJUSctXzbtCIeK79HvjudQrTKuA/IzLME6RF?= =?us-ascii?Q?MZgYPP8xCL6eLOCg2dts+BPI8igBnEKuKQHEQO3Z2ZjmN/VxfoyztM5i54J9?= =?us-ascii?Q?N55x5w0RRnI7QwFmSTnd0YiGghJlwGNNJ+dJ2unBZuVU8/ONe/SIPTGeZY5Z?= =?us-ascii?Q?zAOEOd8twRem0b3FMmx2GrgXfAQrg1nmjtMbQYZt5SEO6oO5VYxHr8SXTGOe?= =?us-ascii?Q?1Ywb6j3DshkzNp9WCFuC4iJdYMhFQXBHOcWXAtKpx5xoYKBRkNzGVipQ7zND?= =?us-ascii?Q?SHy0KyeFzpyuE1zHlKR5vIZr1OBJqBIbzn52ARlR078VfdSYvNe1cDrl4QYO?= =?us-ascii?Q?CJ3QZj5df/ihqBUzacQKWp+E8VsFGoJ0JwSvNSj8WmcpI+sFsiPW+b9Ea7/g?= =?us-ascii?Q?Vjji5mTeQw=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b854dd5-a2d0-4de8-5f10-08de589e2018 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2026 03:35:30.3044 (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: qEd0xYKKCwMDQpzHIlX2pwjB2Ji71qnphumWcY4QFELNqES6RY6vXG8yvOvypHaS87EByEUi+0ysKQx5MaoW/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8773 Content-Type: text/plain; charset="utf-8" Add AF_XDP zero-copy support for both TX and RX. For RX, instead of allocating buffers from the page pool, the buffers are allocated from xsk pool, so fec_alloc_rxq_buffers_zc() is added to allocate RX buffers from xsk pool. And fec_enet_rx_queue_xsk() is used to process the frames from the RX queue which is bound to the AF_XDP socket. Similar to the XDP copy mode, the zero-copy mode also supports XDP_TX, XDP_PASS, XDP_DROP and XDP_REDIRECT actions. In addition, fec_enet_xsk_tx_xmit() is similar to fec_enet_xdp_tx_xmit() and is used to handle XDP_TX action in zero-copy mode. For TX, there are two cases, one is the frames from the AF_XDP socket, so fec_enet_xsk_xmit() is added to directly transmit the frames from the socket and the buffer type is marked as FEC_TXBUF_T_XSK_XMIT. The other one is the frams from the RX queue (XDP_TX action), the buffer type is marked as FEC_TXBUF_T_XSK_TX. Therefore, fec_enet_tx_queue() could correctly clean the TX queue base on the buffer type. Also, some tests have been done on the i.MX93-EVK board with the xdpsock tool, the following are the results. Env: i.MX93 connects to a packet generator, the link speed is 1Gbps, and flow-control is off. The RX packet size is 64 bytes including FCS. Only one RX queue (CPU) is used to receive frames. 1. MAC swap L2 forwarding 1.1 Zero-copy mode root@imx93evk:~# ./xdpsock -i eth0 -l -z sock0@eth0:0 l2fwd xdp-drv pps pkts 1.00 rx 414715 415455 tx 414715 415455 1.2 Copy mode root@imx93evk:~# ./xdpsock -i eth0 -l -c sock0@eth0:0 l2fwd xdp-drv pps pkts 1.00 rx 356396 356609 tx 356396 356609 2. TX only 2.1 Zero-copy mode root@imx93evk:~# ./xdpsock -i eth0 -t -s 64 -z sock0@eth0:0 txonly xdp-drv pps pkts 1.00 rx 0 0 tx 1119573 1126720 2.2 Copy mode root@imx93evk:~# ./xdpsock -i eth0 -t -s 64 -c sock0@eth0:0 txonly xdp-drv pps pkts 1.00 rx 0 0 tx 406864 407616 Signed-off-by: Wei Fang --- drivers/net/ethernet/freescale/fec.h | 13 +- drivers/net/ethernet/freescale/fec_main.c | 612 ++++++++++++++++++++-- 2 files changed, 583 insertions(+), 42 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index ad7aba1a8536..7176803146f3 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -340,6 +340,7 @@ struct bufdesc_ex { #define FEC_ENET_TX_FRPPG (PAGE_SIZE / FEC_ENET_TX_FRSIZE) #define TX_RING_SIZE 1024 /* Must be power of two */ #define TX_RING_MOD_MASK 511 /* for this to work */ +#define FEC_XSK_TX_BUDGET_MAX 256 =20 #define BD_ENET_RX_INT 0x00800000 #define BD_ENET_RX_PTP ((ushort)0x0400) @@ -528,6 +529,8 @@ enum fec_txbuf_type { FEC_TXBUF_T_SKB, FEC_TXBUF_T_XDP_NDO, FEC_TXBUF_T_XDP_TX, + FEC_TXBUF_T_XSK_XMIT, + FEC_TXBUF_T_XSK_TX, }; =20 struct fec_tx_buffer { @@ -539,6 +542,7 @@ struct fec_enet_priv_tx_q { struct bufdesc_prop bd; unsigned char *tx_bounce[TX_RING_SIZE]; struct fec_tx_buffer tx_buf[TX_RING_SIZE]; + struct xsk_buff_pool *xsk_pool; =20 unsigned short tx_stop_threshold; unsigned short tx_wake_threshold; @@ -548,9 +552,16 @@ struct fec_enet_priv_tx_q { dma_addr_t tso_hdrs_dma; }; =20 +union fec_rx_buffer { + void *buf_p; + struct page *page; + struct xdp_buff *xdp; +}; + struct fec_enet_priv_rx_q { struct bufdesc_prop bd; - struct page *rx_buf[RX_RING_SIZE]; + union fec_rx_buffer rx_buf[RX_RING_SIZE]; + struct xsk_buff_pool *xsk_pool; =20 /* page_pool */ struct page_pool *page_pool; diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 273d40027015..da280040a6ec 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -71,6 +71,7 @@ #include #include #include +#include #include =20 #include "fec.h" @@ -1034,6 +1035,9 @@ static void fec_enet_bd_init(struct net_device *dev) page_pool_put_page(pp_page_to_nmdesc(page)->pp, page, 0, false); break; + case FEC_TXBUF_T_XSK_TX: + xsk_buff_free(txq->tx_buf[i].buf_p); + break; default: break; }; @@ -1467,8 +1471,91 @@ fec_enet_hwtstamp(struct fec_enet_private *fep, unsi= gned ts, hwtstamps->hwtstamp =3D ns_to_ktime(ns); } =20 -static void fec_enet_tx_queue(struct fec_enet_private *fep, - u16 queue, int budget) +static bool fec_enet_xsk_xmit(struct fec_enet_private *fep, + struct xsk_buff_pool *pool, + u32 queue) +{ + struct fec_enet_priv_tx_q *txq =3D fep->tx_queue[queue]; + struct xdp_desc *xsk_desc =3D pool->tx_descs; + int cpu =3D smp_processor_id(); + int free_bds, budget, batch; + struct netdev_queue *nq; + struct bufdesc *bdp; + dma_addr_t dma; + u32 estatus; + u16 status; + int i, j; + + nq =3D netdev_get_tx_queue(fep->netdev, queue); + __netif_tx_lock(nq, cpu); + + txq_trans_cond_update(nq); + free_bds =3D fec_enet_get_free_txdesc_num(txq); + if (!free_bds) + goto tx_unlock; + + budget =3D min(free_bds, FEC_XSK_TX_BUDGET_MAX); + batch =3D xsk_tx_peek_release_desc_batch(pool, budget); + if (!batch) + goto tx_unlock; + + bdp =3D txq->bd.cur; + for (i =3D 0; i < batch; i++) { + dma =3D xsk_buff_raw_get_dma(pool, xsk_desc[i].addr); + xsk_buff_raw_dma_sync_for_device(pool, dma, xsk_desc[i].len); + + j =3D fec_enet_get_bd_index(bdp, &txq->bd); + txq->tx_buf[j].type =3D FEC_TXBUF_T_XSK_XMIT; + txq->tx_buf[j].buf_p =3D NULL; + + status =3D fec16_to_cpu(bdp->cbd_sc); + status &=3D ~BD_ENET_TX_STATS; + status |=3D BD_ENET_TX_INTR | BD_ENET_TX_LAST; + bdp->cbd_datlen =3D cpu_to_fec16(xsk_desc[i].len); + bdp->cbd_bufaddr =3D cpu_to_fec32(dma); + + if (fep->bufdesc_ex) { + struct bufdesc_ex *ebdp =3D (struct bufdesc_ex *)bdp; + + estatus =3D BD_ENET_TX_INT; + if (fep->quirks & FEC_QUIRK_HAS_AVB) + estatus |=3D FEC_TX_BD_FTYPE(txq->bd.qid); + + ebdp->cbd_bdu =3D 0; + ebdp->cbd_esc =3D cpu_to_fec32(estatus); + } + + /* Make sure the updates to rest of the descriptor are performed + * before transferring ownership. + */ + dma_wmb(); + + /* 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 |=3D BD_ENET_TX_READY | BD_ENET_TX_TC; + bdp->cbd_sc =3D cpu_to_fec16(status); + dma_wmb(); + + bdp =3D fec_enet_get_nextdesc(bdp, &txq->bd); + txq->bd.cur =3D bdp; + } + + /* Trigger transmission start */ + fec_txq_trigger_xmit(fep, txq); + + __netif_tx_unlock(nq); + + return batch < budget; + +tx_unlock: + __netif_tx_unlock(nq); + + return true; +} + +static int fec_enet_tx_queue(struct fec_enet_private *fep, + u16 queue, int budget) { struct netdev_queue *nq =3D netdev_get_tx_queue(fep->netdev, queue); struct fec_enet_priv_tx_q *txq =3D fep->tx_queue[queue]; @@ -1479,6 +1566,7 @@ static void fec_enet_tx_queue(struct fec_enet_private= *fep, unsigned short status; struct sk_buff *skb; struct page *page; + int xsk_cnt =3D 0; =20 /* get next bdp of dirty_tx */ bdp =3D fec_enet_get_nextdesc(bdp, &txq->bd); @@ -1552,6 +1640,14 @@ static void fec_enet_tx_queue(struct fec_enet_privat= e *fep, page_pool_put_page(pp_page_to_nmdesc(page)->pp, page, 0, true); break; + case FEC_TXBUF_T_XSK_XMIT: + bdp->cbd_bufaddr =3D cpu_to_fec32(0); + xsk_cnt++; + break; + case FEC_TXBUF_T_XSK_TX: + bdp->cbd_bufaddr =3D cpu_to_fec32(0); + xsk_buff_free(tx_buf->buf_p); + break; default: break; } @@ -1611,16 +1707,37 @@ static void fec_enet_tx_queue(struct fec_enet_priva= te *fep, if (bdp !=3D txq->bd.cur && readl(txq->bd.reg_desc_active) =3D=3D 0) writel(0, txq->bd.reg_desc_active); + + if (txq->xsk_pool) { + struct xsk_buff_pool *pool =3D txq->xsk_pool; + + if (xsk_cnt) + xsk_tx_completed(pool, xsk_cnt); + + if (xsk_uses_need_wakeup(pool)) + xsk_set_tx_need_wakeup(pool); + + /* If the condition is true, it indicates that there are still + * packets to be transmitted, so return "budget" to make the + * NAPI continue polling. + */ + if (!fec_enet_xsk_xmit(fep, pool, queue)) + return budget; + } + + return 0; } =20 -static void fec_enet_tx(struct net_device *ndev, int budget) +static int fec_enet_tx(struct net_device *ndev, int budget) { struct fec_enet_private *fep =3D netdev_priv(ndev); - int i; + int i, count =3D 0; =20 /* Make sure that AVB queues are processed first. */ for (i =3D fep->num_tx_queues - 1; i >=3D 0; i--) - fec_enet_tx_queue(fep, i, budget); + count +=3D fec_enet_tx_queue(fep, i, budget); + + return count; } =20 static int fec_enet_update_cbd(struct fec_enet_priv_rx_q *rxq, @@ -1633,13 +1750,30 @@ static int fec_enet_update_cbd(struct fec_enet_priv= _rx_q *rxq, if (unlikely(!new_page)) return -ENOMEM; =20 - rxq->rx_buf[index] =3D new_page; + rxq->rx_buf[index].page =3D new_page; phys_addr =3D page_pool_get_dma_addr(new_page) + FEC_ENET_XDP_HEADROOM; bdp->cbd_bufaddr =3D cpu_to_fec32(phys_addr); =20 return 0; } =20 +static int fec_enet_update_cbd_zc(struct fec_enet_priv_rx_q *rxq, + struct bufdesc *bdp, int index) +{ + struct xdp_buff *new_xdp; + dma_addr_t phys_addr; + + new_xdp =3D xsk_buff_alloc(rxq->xsk_pool); + if (unlikely(!new_xdp)) + return -ENOMEM; + + rxq->rx_buf[index].xdp =3D new_xdp; + phys_addr =3D xsk_buff_xdp_get_dma(new_xdp); + bdp->cbd_bufaddr =3D cpu_to_fec32(phys_addr); + + return 0; +} + static void fec_enet_rx_vlan(const struct net_device *ndev, struct sk_buff= *skb) { if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) { @@ -1794,7 +1928,7 @@ static int fec_enet_rx_queue(struct fec_enet_private = *fep, ndev->stats.rx_bytes +=3D pkt_len - fep->rx_shift; =20 index =3D fec_enet_get_bd_index(bdp, &rxq->bd); - page =3D rxq->rx_buf[index]; + page =3D rxq->rx_buf[index].page; dma =3D fec32_to_cpu(bdp->cbd_bufaddr); if (fec_enet_update_cbd(rxq, bdp, index)) { ndev->stats.rx_dropped++; @@ -1924,7 +2058,7 @@ static int fec_enet_rx_queue_xdp(struct fec_enet_priv= ate *fep, int queue, ndev->stats.rx_bytes +=3D pkt_len - fep->rx_shift; =20 index =3D fec_enet_get_bd_index(bdp, &rxq->bd); - page =3D rxq->rx_buf[index]; + page =3D rxq->rx_buf[index].page; dma =3D fec32_to_cpu(bdp->cbd_bufaddr); =20 if (fec_enet_update_cbd(rxq, bdp, index)) { @@ -2039,6 +2173,250 @@ static int fec_enet_rx_queue_xdp(struct fec_enet_pr= ivate *fep, int queue, return pkt_received; } =20 +static struct sk_buff *fec_build_skb_zc(struct xdp_buff *xsk, + struct napi_struct *napi) +{ + size_t len =3D xdp_get_buff_len(xsk); + struct sk_buff *skb; + + skb =3D napi_alloc_skb(napi, len); + if (unlikely(!skb)) { + xsk_buff_free(xsk); + return NULL; + } + + skb_put_data(skb, xsk->data, len); + xsk_buff_free(xsk); + + return skb; +} + +static int fec_enet_xsk_tx_xmit(struct fec_enet_private *fep, + struct xdp_buff *xsk, int cpu, + int queue) +{ + struct netdev_queue *nq =3D netdev_get_tx_queue(fep->netdev, queue); + struct fec_enet_priv_tx_q *txq =3D fep->tx_queue[queue]; + u32 offset =3D xsk->data - xsk->data_hard_start; + u32 headroom =3D txq->xsk_pool->headroom; + u32 len =3D xsk->data_end - xsk->data; + u32 index, status, estatus; + struct bufdesc *bdp; + dma_addr_t dma; + + __netif_tx_lock(nq, cpu); + + /* Avoid tx timeout as XDP shares the queue with kernel stack */ + txq_trans_cond_update(nq); + + if (!fec_enet_get_free_txdesc_num(txq)) { + __netif_tx_unlock(nq); + + return -EBUSY; + } + + /* Fill in a Tx ring entry */ + bdp =3D txq->bd.cur; + status =3D fec16_to_cpu(bdp->cbd_sc); + status &=3D ~BD_ENET_TX_STATS; + + index =3D fec_enet_get_bd_index(bdp, &txq->bd); + dma =3D xsk_buff_xdp_get_frame_dma(xsk) + headroom + offset; + + xsk_buff_raw_dma_sync_for_device(txq->xsk_pool, dma, len); + + txq->tx_buf[index].buf_p =3D xsk; + txq->tx_buf[index].type =3D FEC_TXBUF_T_XSK_TX; + + status |=3D (BD_ENET_TX_INTR | BD_ENET_TX_LAST); + if (fep->bufdesc_ex) + estatus =3D BD_ENET_TX_INT; + + bdp->cbd_bufaddr =3D cpu_to_fec32(dma); + bdp->cbd_datlen =3D cpu_to_fec16(len); + + if (fep->bufdesc_ex) { + struct bufdesc_ex *ebdp =3D (struct bufdesc_ex *)bdp; + + if (fep->quirks & FEC_QUIRK_HAS_AVB) + estatus |=3D FEC_TX_BD_FTYPE(txq->bd.qid); + + ebdp->cbd_bdu =3D 0; + ebdp->cbd_esc =3D cpu_to_fec32(estatus); + } + + status |=3D (BD_ENET_TX_READY | BD_ENET_TX_TC); + bdp->cbd_sc =3D cpu_to_fec16(status); + dma_wmb(); + + bdp =3D fec_enet_get_nextdesc(bdp, &txq->bd); + txq->bd.cur =3D bdp; + + __netif_tx_unlock(nq); + + return 0; +} + +static int fec_enet_rx_queue_xsk(struct fec_enet_private *fep, int queue, + int budget, struct bpf_prog *prog) +{ + u32 data_start =3D FEC_ENET_XDP_HEADROOM + fep->rx_shift; + struct fec_enet_priv_rx_q *rxq =3D fep->rx_queue[queue]; + struct net_device *ndev =3D fep->netdev; + struct bufdesc *bdp =3D rxq->bd.cur; + u32 sub_len =3D 4 + fep->rx_shift; + int cpu =3D smp_processor_id(); + bool wakeup_xsk =3D false; + struct xdp_buff *xsk; + int pkt_received =3D 0; + struct sk_buff *skb; + u16 status, pkt_len; + u32 xdp_res =3D 0; + int index, err; + u32 act; + +#if defined(CONFIG_COLDFIRE) && !defined(CONFIG_COLDFIRE_COHERENT_DMA) + /* + * Hacky flush of all caches instead of using the DMA API for the TSO + * headers. + */ + flush_cache_all(); +#endif + + while (!((status =3D fec16_to_cpu(bdp->cbd_sc)) & BD_ENET_RX_EMPTY)) { + if (pkt_received >=3D budget) + break; + pkt_received++; + + writel(FEC_ENET_RXF_GET(queue), fep->hwp + FEC_IEVENT); + + /* Check for errors. */ + status ^=3D BD_ENET_RX_LAST; + if (unlikely(fec_rx_error_check(ndev, status))) + goto rx_processing_done; + + /* Process the incoming frame. */ + ndev->stats.rx_packets++; + pkt_len =3D fec16_to_cpu(bdp->cbd_datlen); + ndev->stats.rx_bytes +=3D pkt_len - fep->rx_shift; + + index =3D fec_enet_get_bd_index(bdp, &rxq->bd); + xsk =3D rxq->rx_buf[index].xdp; + + if (fec_enet_update_cbd_zc(rxq, bdp, index)) { + ndev->stats.rx_dropped++; + goto rx_processing_done; + } + + pkt_len -=3D sub_len; + xsk->data =3D xsk->data_hard_start + data_start; + /* Subtract FCS and 16bit shift */ + xsk->data_end =3D xsk->data + pkt_len; + xsk->data_meta =3D xsk->data; + xsk_buff_dma_sync_for_cpu(xsk); + + /* If the XSK pool is enabled before the bpf program is + * installed, or the bpf program is uninstalled before + * the XSK pool is disabled. prog will be NULL and we + * need to set a default XDP_PASS action. + */ + if (unlikely(!prog)) + act =3D XDP_PASS; + else + act =3D bpf_prog_run_xdp(prog, xsk); + + switch (act) { + case XDP_PASS: + rxq->stats[RX_XDP_PASS]++; + skb =3D fec_build_skb_zc(xsk, &fep->napi); + if (unlikely(!skb)) + ndev->stats.rx_dropped++; + else + napi_gro_receive(&fep->napi, skb); + break; + case XDP_TX: + rxq->stats[RX_XDP_TX]++; + err =3D fec_enet_xsk_tx_xmit(fep, xsk, cpu, queue); + if (unlikely(err)) { + rxq->stats[RX_XDP_TX_ERRORS]++; + xsk_buff_free(xsk); + } else { + xdp_res |=3D FEC_ENET_XDP_TX; + } + break; + case XDP_REDIRECT: + rxq->stats[RX_XDP_REDIRECT]++; + err =3D xdp_do_redirect(ndev, xsk, prog); + if (unlikely(err)) { + if (err =3D=3D -ENOBUFS) + wakeup_xsk =3D true; + + rxq->stats[RX_XDP_DROP]++; + xsk_buff_free(xsk); + } else { + xdp_res |=3D FEC_ENET_XDP_REDIR; + } + break; + default: + bpf_warn_invalid_xdp_action(ndev, prog, act); + fallthrough; + case XDP_ABORTED: + trace_xdp_exception(ndev, prog, act); + fallthrough; + case XDP_DROP: + rxq->stats[RX_XDP_DROP]++; + xsk_buff_free(xsk); + break; + } + +rx_processing_done: + /* Clear the status flags for this buffer */ + status &=3D ~BD_ENET_RX_STATS; + /* Mark the buffer empty */ + status |=3D BD_ENET_RX_EMPTY; + + if (fep->bufdesc_ex) { + struct bufdesc_ex *ebdp =3D (struct bufdesc_ex *)bdp; + + ebdp->cbd_esc =3D cpu_to_fec32(BD_ENET_RX_INT); + ebdp->cbd_prot =3D 0; + ebdp->cbd_bdu =3D 0; + } + + /* Make sure the updates to rest of the descriptor are + * performed before transferring ownership. + */ + dma_wmb(); + bdp->cbd_sc =3D cpu_to_fec16(status); + + /* Update BD pointer to next entry */ + bdp =3D fec_enet_get_nextdesc(bdp, &rxq->bd); + + /* Doing this here will keep the FEC running while we process + * incoming frames. On a heavily loaded network, we should be + * able to keep up at the expense of system resources. + */ + writel(0, rxq->bd.reg_desc_active); + } + + rxq->bd.cur =3D bdp; + + if (xdp_res & FEC_ENET_XDP_REDIR) + xdp_do_flush(); + + if (xdp_res & FEC_ENET_XDP_TX) + fec_txq_trigger_xmit(fep, fep->tx_queue[queue]); + + if (rxq->xsk_pool && xsk_uses_need_wakeup(rxq->xsk_pool)) { + if (wakeup_xsk) + xsk_set_rx_need_wakeup(rxq->xsk_pool); + else + xsk_clear_rx_need_wakeup(rxq->xsk_pool); + } + + return pkt_received; +} + static int fec_enet_rx(struct net_device *ndev, int budget) { struct fec_enet_private *fep =3D netdev_priv(ndev); @@ -2047,11 +2425,15 @@ static int fec_enet_rx(struct net_device *ndev, int= budget) =20 /* Make sure that AVB queues are processed first. */ for (i =3D fep->num_rx_queues - 1; i >=3D 0; i--) { - if (prog) - done +=3D fec_enet_rx_queue_xdp(fep, i, budget - done, - prog); + struct fec_enet_priv_rx_q *rxq =3D fep->rx_queue[i]; + int batch =3D budget - done; + + if (rxq->xsk_pool) + done +=3D fec_enet_rx_queue_xsk(fep, i, batch, prog); + else if (prog) + done +=3D fec_enet_rx_queue_xdp(fep, i, batch, prog); else - done +=3D fec_enet_rx_queue(fep, i, budget - done); + done +=3D fec_enet_rx_queue(fep, i, batch); } =20 return done; @@ -2095,19 +2477,22 @@ static int fec_enet_rx_napi(struct napi_struct *nap= i, int budget) { struct net_device *ndev =3D napi->dev; struct fec_enet_private *fep =3D netdev_priv(ndev); - int done =3D 0; + int rx_done =3D 0, tx_done =3D 0; + int max_done; =20 do { - done +=3D fec_enet_rx(ndev, budget - done); - fec_enet_tx(ndev, budget); - } while ((done < budget) && fec_enet_collect_events(fep)); + rx_done +=3D fec_enet_rx(ndev, budget - rx_done); + tx_done +=3D fec_enet_tx(ndev, budget); + max_done =3D max(rx_done, tx_done); + } while ((max_done < budget) && fec_enet_collect_events(fep)); =20 - if (done < budget) { - napi_complete_done(napi, done); + if (max_done < budget) { + napi_complete_done(napi, max_done); writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); + return max_done; } =20 - return done; + return budget; } =20 /* -----------------------------------------------------------------------= -- */ @@ -3398,7 +3783,8 @@ static int fec_xdp_rxq_info_reg(struct fec_enet_priva= te *fep, struct fec_enet_priv_rx_q *rxq) { struct net_device *ndev =3D fep->netdev; - int err; + void *allocator; + int type, err; =20 err =3D xdp_rxq_info_reg(&rxq->xdp_rxq, ndev, rxq->id, 0); if (err) { @@ -3406,8 +3792,9 @@ static int fec_xdp_rxq_info_reg(struct fec_enet_priva= te *fep, return err; } =20 - err =3D xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, MEM_TYPE_PAGE_POOL, - rxq->page_pool); + allocator =3D rxq->xsk_pool ? NULL : rxq->page_pool; + type =3D rxq->xsk_pool ? MEM_TYPE_XSK_BUFF_POOL : MEM_TYPE_PAGE_POOL; + err =3D xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, type, allocator); if (err) { netdev_err(ndev, "Failed to register XDP mem model\n"); xdp_rxq_info_unreg(&rxq->xdp_rxq); @@ -3415,6 +3802,9 @@ static int fec_xdp_rxq_info_reg(struct fec_enet_priva= te *fep, return err; } =20 + if (rxq->xsk_pool) + xsk_pool_set_rxq_info(rxq->xsk_pool, &rxq->xdp_rxq); + return 0; } =20 @@ -3428,20 +3818,28 @@ static void fec_xdp_rxq_info_unreg(struct fec_enet_= priv_rx_q *rxq) =20 static void fec_free_rxq_buffers(struct fec_enet_priv_rx_q *rxq) { + bool xsk =3D !!rxq->xsk_pool; int i; =20 for (i =3D 0; i < rxq->bd.ring_size; i++) { - struct page *page =3D rxq->rx_buf[i]; + union fec_rx_buffer *buf =3D &rxq->rx_buf[i]; =20 - if (!page) + if (!buf->buf_p) continue; =20 - page_pool_put_full_page(rxq->page_pool, page, false); - rxq->rx_buf[i] =3D NULL; + if (xsk) + xsk_buff_free(buf->xdp); + else + page_pool_put_full_page(rxq->page_pool, + buf->page, false); + + rxq->rx_buf[i].buf_p =3D NULL; } =20 - page_pool_destroy(rxq->page_pool); - rxq->page_pool =3D NULL; + if (!xsk) { + page_pool_destroy(rxq->page_pool); + rxq->page_pool =3D NULL; + } } =20 static void fec_enet_free_buffers(struct net_device *ndev) @@ -3481,6 +3879,9 @@ static void fec_enet_free_buffers(struct net_device *= ndev) page_pool_put_page(pp_page_to_nmdesc(page)->pp, page, 0, false); break; + case FEC_TXBUF_T_XSK_TX: + xsk_buff_free(txq->tx_buf[i].buf_p); + break; default: break; } @@ -3597,7 +3998,7 @@ static int fec_alloc_rxq_buffers_pp(struct fec_enet_p= rivate *fep, phys_addr =3D page_pool_get_dma_addr(page) + FEC_ENET_XDP_HEADROOM; bdp->cbd_bufaddr =3D cpu_to_fec32(phys_addr); =20 - rxq->rx_buf[i] =3D page; + rxq->rx_buf[i].page =3D page; bdp->cbd_sc =3D cpu_to_fec16(BD_ENET_RX_EMPTY); =20 if (fep->bufdesc_ex) { @@ -3621,6 +4022,40 @@ static int fec_alloc_rxq_buffers_pp(struct fec_enet_= private *fep, return err; } =20 +static int fec_alloc_rxq_buffers_zc(struct fec_enet_private *fep, + struct fec_enet_priv_rx_q *rxq) +{ + struct bufdesc *bdp =3D rxq->bd.base; + union fec_rx_buffer *buf; + dma_addr_t phys_addr; + int i; + + for (i =3D 0; i < rxq->bd.ring_size; i++) { + buf =3D &rxq->rx_buf[i]; + buf->xdp =3D xsk_buff_alloc(rxq->xsk_pool); + if (!buf->xdp) + return -ENOMEM; + + phys_addr =3D xsk_buff_xdp_get_dma(buf->xdp); + bdp->cbd_bufaddr =3D cpu_to_fec32(phys_addr); + bdp->cbd_sc =3D cpu_to_fec16(BD_ENET_RX_EMPTY); + + if (fep->bufdesc_ex) { + struct bufdesc_ex *ebdp =3D (struct bufdesc_ex *)bdp; + + ebdp->cbd_esc =3D cpu_to_fec32(BD_ENET_RX_INT); + } + + bdp =3D fec_enet_get_nextdesc(bdp, &rxq->bd); + } + + /* Set the last buffer to wrap. */ + bdp =3D fec_enet_get_prevdesc(bdp, &rxq->bd); + bdp->cbd_sc |=3D cpu_to_fec16(BD_ENET_RX_WRAP); + + return 0; +} + static int fec_enet_alloc_rxq_buffers(struct net_device *ndev, unsigned int queue) { @@ -3629,9 +4064,16 @@ fec_enet_alloc_rxq_buffers(struct net_device *ndev, = unsigned int queue) int err; =20 rxq =3D fep->rx_queue[queue]; - err =3D fec_alloc_rxq_buffers_pp(fep, rxq); - if (err) - return err; + if (rxq->xsk_pool) { + /* RX XDP ZC buffer pool may not be populated, e.g. + * xdpsock TX-only. + */ + fec_alloc_rxq_buffers_zc(fep, rxq); + } else { + err =3D fec_alloc_rxq_buffers_pp(fep, rxq); + if (err) + return err; + } =20 err =3D fec_xdp_rxq_info_reg(fep, rxq); if (err) { @@ -3954,21 +4396,83 @@ static u16 fec_enet_select_queue(struct net_device = *ndev, struct sk_buff *skb, return fec_enet_vlan_pri_to_queue[vlan_tag >> 13]; } =20 +static int fec_setup_xsk_pool(struct net_device *ndev, + struct xsk_buff_pool *pool, + u16 queue) +{ + struct fec_enet_private *fep =3D netdev_priv(ndev); + bool is_run =3D netif_running(ndev); + struct fec_enet_priv_rx_q *rxq; + struct fec_enet_priv_tx_q *txq; + bool enable =3D !!pool; + int err; + + if (queue >=3D fep->num_rx_queues || queue >=3D fep->num_tx_queues) + return -ERANGE; + + if (is_run) { + napi_disable(&fep->napi); + netif_tx_disable(ndev); + synchronize_rcu(); + fec_enet_free_buffers(ndev); + } + + rxq =3D fep->rx_queue[queue]; + txq =3D fep->tx_queue[queue]; + + if (enable) { + err =3D xsk_pool_dma_map(pool, &fep->pdev->dev, 0); + if (err) { + netdev_err(ndev, "Failed to map xsk pool\n"); + return err; + } + + rxq->xsk_pool =3D pool; + txq->xsk_pool =3D pool; + } else { + xsk_pool_dma_unmap(rxq->xsk_pool, 0); + rxq->xsk_pool =3D NULL; + txq->xsk_pool =3D NULL; + } + + if (is_run) { + err =3D fec_enet_alloc_buffers(ndev); + if (err) { + netdev_err(ndev, "Failed to alloc buffers\n"); + goto err_alloc_buffers; + } + + fec_restart(ndev); + napi_enable(&fep->napi); + netif_tx_start_all_queues(ndev); + } + + return 0; + +err_alloc_buffers: + if (enable) { + xsk_pool_dma_unmap(pool, 0); + rxq->xsk_pool =3D NULL; + txq->xsk_pool =3D NULL; + } + + return err; +} + static int fec_enet_bpf(struct net_device *dev, struct netdev_bpf *bpf) { struct fec_enet_private *fep =3D netdev_priv(dev); bool is_run =3D netif_running(dev); struct bpf_prog *old_prog; =20 + /* No need to support the SoCs that require to do the frame swap + * because the performance wouldn't be better than the skb mode. + */ + if (fep->quirks & FEC_QUIRK_SWAP_FRAME) + return -EOPNOTSUPP; + switch (bpf->command) { case XDP_SETUP_PROG: - /* No need to support the SoCs that require to - * do the frame swap because the performance wouldn't be - * better than the skb mode. - */ - if (fep->quirks & FEC_QUIRK_SWAP_FRAME) - return -EOPNOTSUPP; - if (!bpf->prog) xdp_features_clear_redirect_target(dev); =20 @@ -3994,7 +4498,8 @@ static int fec_enet_bpf(struct net_device *dev, struc= t netdev_bpf *bpf) return 0; =20 case XDP_SETUP_XSK_POOL: - return -EOPNOTSUPP; + return fec_setup_xsk_pool(dev, bpf->xsk.pool, + bpf->xsk.queue_id); =20 default: return -EOPNOTSUPP; @@ -4143,6 +4648,29 @@ static int fec_enet_xdp_xmit(struct net_device *dev, return sent_frames; } =20 +static int fec_enet_xsk_wakeup(struct net_device *ndev, u32 queue, u32 fla= gs) +{ + struct fec_enet_private *fep =3D netdev_priv(ndev); + struct fec_enet_priv_rx_q *rxq; + + if (!netif_running(ndev) || !netif_carrier_ok(ndev)) + return -ENETDOWN; + + if (queue >=3D fep->num_rx_queues || queue >=3D fep->num_tx_queues) + return -ERANGE; + + rxq =3D fep->rx_queue[queue]; + if (!rxq->xsk_pool) + return -EINVAL; + + if (!napi_if_scheduled_mark_missed(&fep->napi)) { + if (likely(napi_schedule_prep(&fep->napi))) + __napi_schedule(&fep->napi); + } + + return 0; +} + static int fec_hwtstamp_get(struct net_device *ndev, struct kernel_hwtstamp_config *config) { @@ -4205,6 +4733,7 @@ static const struct net_device_ops fec_netdev_ops =3D= { .ndo_set_features =3D fec_set_features, .ndo_bpf =3D fec_enet_bpf, .ndo_xdp_xmit =3D fec_enet_xdp_xmit, + .ndo_xsk_wakeup =3D fec_enet_xsk_wakeup, .ndo_hwtstamp_get =3D fec_hwtstamp_get, .ndo_hwtstamp_set =3D fec_hwtstamp_set, }; @@ -4332,7 +4861,8 @@ static int fec_enet_init(struct net_device *ndev) =20 if (!(fep->quirks & FEC_QUIRK_SWAP_FRAME)) ndev->xdp_features =3D NETDEV_XDP_ACT_BASIC | - NETDEV_XDP_ACT_REDIRECT; + NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_XSK_ZEROCOPY; =20 fec_restart(ndev); =20 --=20 2.34.1