From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D1C64374F; Thu, 21 Dec 2023 11:44:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9B064027D; Thu, 21 Dec 2023 11:44:30 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 68433400D6 for ; Thu, 21 Dec 2023 11:44:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703155468; x=1734691468; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=k05X3U4bzFloJDT/k9xmQ0KjeJLfwr2MUuWHbYvNfS0=; b=UYqJDfmc25LsJWKwwq4zWhLAw1CCxl7Xmgdz31ZItZZqxjFzL81oPhbK AV4IW0b7XOgyCoThQBNx/PWRHqLP0s86FranRCTvJ7HMGZVM6eaYTd33S K28vOCQ3rv48AJ84cuznh2gWZrUWVIllQG7qX7JTUcruS9XxjvoYrkAgM /6/FZ04dCi8AJEYxb91zqyL/2rLDwaiS+kVzbePXEAesDkDrqhb3aJxsE EMjr7ePtp1UobO8f74/S+fM1ndtIa183CIRQ1rcDSqB+TOIF42xS4YQRx XFjssMAwsBCLQldNwOjhDmTWRp5QMk0W4XIqUaMHBDul5UTyZ7PbXfTI5 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10930"; a="460293682" X-IronPort-AV: E=Sophos;i="6.04,293,1695711600"; d="scan'208";a="460293682" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 02:44:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10930"; a="810931606" X-IronPort-AV: E=Sophos;i="6.04,293,1695711600"; d="scan'208";a="810931606" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 21 Dec 2023 02:44:22 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 21 Dec 2023 02:44:21 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 21 Dec 2023 02:44:21 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Thu, 21 Dec 2023 02:44:21 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 21 Dec 2023 02:44:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hBeH/hbObIMj4LLPO8S24XIDPS6wSfo89juFI0T9rBZqRloBJ8VjB/56lt8FuQO+Y3Fx99trbB1QzxNBrdMOv2cNpgCScvS6XdV2t7eNcRD5RVj/ABL3ZsHPeuUt61kUflbScP0qPvUnvO10BuraHc8mD1wdWrNrv4yw2Fl+dIJqHEk2fVtQruvqI5M/jxn58qz5T6IsK4iOeSsacMvj1oiY1S6rAIIc2t6wyBs53qYQfkfP6jIWqHFOdhXkC3qY1Cgi0vSrrmVU3Ej3Kx+7I9DemSHdQPwOopV/aFEoHWwssDZlT8He9+JOjjUIeCqoK7hKwWF/+OA4YyW1EosdYw== 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=jdcLTn/iU6UX0Uh1/W+yk5MOcsF5if5NMYxSEDUZnFY=; b=lYeikFlhL/ui+kHO57Oxb3aS91CuxjsrG3pEkniGEbVcFhkEbWL1OJ6j7NZFg82yLZaLpLd1Km+cIi4K4c5nkoMSUWX1pESaEvR+2sXBP/UMvY6Iux6/eEDkWagu6c5eW3Dp7jN/hJt5+ffCJrGsEb8l/gLZ0LrccElQ49YDDZt6ImxzdEeMC0NyPwmjsi7Qo558PmVwpcv0kC8JKtD4xUVMGdj2ZiYMpU0kSvl/Wzblt+N1pXap8Oq6nDx8cLUqUCFt6fVNbLpnevMcAbvtwYCL80n+TBkx7zOcfzADpGR44WRGp2g18zqgUhuj/c3gUm81/ozid4xwiQ7IuvNMSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB3995.namprd11.prod.outlook.com (2603:10b6:5:6::12) by MW3PR11MB4732.namprd11.prod.outlook.com (2603:10b6:303:2c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.21; Thu, 21 Dec 2023 10:44:15 +0000 Received: from DM6PR11MB3995.namprd11.prod.outlook.com ([fe80::7c33:4ba9:947f:d875]) by DM6PR11MB3995.namprd11.prod.outlook.com ([fe80::7c33:4ba9:947f:d875%4]) with mapi id 15.20.7113.016; Thu, 21 Dec 2023 10:44:15 +0000 From: "Koikkara Reeny, Shibin" To: "Tahhan, Maryam" , "ferruh.yigit@amd.com" , "stephen@networkplumber.org" , "lihuisong@huawei.com" , "fengchengwen@huawei.com" , "liuyonglong@huawei.com" , "Loftus, Ciara" CC: "dev@dpdk.org" , "Tahhan, Maryam" Subject: RE: [v6] net/af_xdp: enable uds_path instead of use_cni Thread-Topic: [v6] net/af_xdp: enable uds_path instead of use_cni Thread-Index: AQHaL20JnFVQC5Q1OEqOsdWBunhhSbCzlhkA Date: Thu, 21 Dec 2023 10:44:15 +0000 Message-ID: References: <20231215153946.2100669-1-mtahhan@redhat.com> In-Reply-To: <20231215153946.2100669-1-mtahhan@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB3995:EE_|MW3PR11MB4732:EE_ x-ms-office365-filtering-correlation-id: 48cf8a54-4774-4d44-751d-08dc0211c6f5 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CQbGtKERwN/YDQjruX6G2/ve11aoOuXk86VRArQlKUrkujtWh7/m1NH7j6J+Gzq5cYZOt3lMkUPqJfQDPTvP0HHBjBUABTVycZT8lVSDqNwTdiwuCMTcjtEc9UxJWQarF3pWsfNsevT3GK191IAvM6ExB3+xavN6rOsqwZ6R9QCLEUiHu6r5Kqesk6SAVuq6EzKje8TZajJKsEUOyV/fswBg34qV4ODzpG0KTPf2pww4poRtAV0o4ohHmqXTmyB/T4ISRZfQno1AxqlPqKUxADv1jPVgP/GzGq6RL+RPONr6pgzbfeI+3ydALbzgyOiY3NWiKS0Stwq4F1ZKSBdOWsKdvhMKWgfq0ZDtloVQGz4b8sQq0ds9G2FcvqKtwno97qH+Uz+sVuKfJpDf0zs0I8wAoKevXapJJVmw/SbvriUz0URmCOX1FwPUNOFTHZ55o2hVnz2PJpxF8//5zT8UrzTTHpZMZdUPfUHQr2cKTqgh1lu+BrNi5iF8P4clkyR6Ga2GqGgId/Po3d+15SfZhBuLwjccsnKvxyR0nXUOGLq0hwVVDWmv7Ao2EneK4rS2yNAnsMxRm6YFNim4Mm7PaiJBWuBqigvlffiBVOjB4GKPoDzFRDI9Y/g3/T+x5b5T x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB3995.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(376002)(346002)(39860400002)(136003)(396003)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(52536014)(4326008)(54906003)(110136005)(316002)(8676002)(8936002)(5660300002)(30864003)(38070700009)(2906002)(33656002)(41300700001)(86362001)(122000001)(82960400001)(38100700002)(71200400001)(7696005)(966005)(478600001)(9686003)(53546011)(6506007)(6636002)(64756008)(66446008)(66556008)(76116006)(66476007)(66946007)(26005)(83380400001)(55016003)(84970400001)(579004)(559001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?mu1x5ZOvcEIS+zBcIgEb5MRMsUUChAjUMD5XfJ/7t0Ev8FDNj60bQOyrBqCA?= =?us-ascii?Q?8Dq7rYIl6iPYIos9s4Ts7PxuglAxfdKfyyRPOYnIu7li5NUt+FAlTvI4VqOb?= =?us-ascii?Q?FluvDmCTkevJMu/AeJopPgOuiPIIhfSJEck8OU3ZfELOJGfJIksU0tbIQNv6?= =?us-ascii?Q?w2opdTyNATNfnLOuD1FV2MCkqpDue84jOTlvyz6niM8RamoRqEWLktBviwRv?= =?us-ascii?Q?6GaSOgwINLqCQu16htqMCeMB/dUBBTS7N8KcUi7coLY7QZlARLtsg/OEfHTf?= =?us-ascii?Q?7AU5kucwzFBNOZ5VEUbo52rta+WOtAL5yp4z1rRlg6nii4QnnIZsowFfD5DU?= =?us-ascii?Q?/2kU02BONPujdQxLjPZa4Zq7M5NOU7iORDUss6tia5aV+ZgFSQn1ZIiLK2dg?= =?us-ascii?Q?f2gIbTCBnSjRMKK1bnUc+f3OUt7V+2XOyk/nHm2BjiDBCyWEvvXqZpypPNaq?= =?us-ascii?Q?RbATJ+coEF6ksPJ1Z9YsNOSSAtOmLWePhN4iElUfK5tzmrVpZzCshU/qOgFc?= =?us-ascii?Q?FK7ICbDISpy2j4goqoiQZ12jjsqEnPR85Un+wHgK36hXKLxMZOwX1qbDMiVY?= =?us-ascii?Q?KYou8d0qji71QyBnp+fza0jafAZA8hDaNmDKTWTnB3iDOwDj6MrpI+iuRBQg?= =?us-ascii?Q?kTBGygx4P0fkVlA3ftttCwGK6O7P/4As8sgYussButk5gXBu6X0gXBIXgYww?= =?us-ascii?Q?rPacDgtKaUNKSItKRFXnAGvGZL2LpStkVK3Pj32y9Yfe4CGx7Ib5Aiq8NESr?= =?us-ascii?Q?I2KwKgRNvpOwfHWASd3XVvSV0+X5G+2x7Q1J5YSgwSwPFmLVEO4RX+qplDtz?= =?us-ascii?Q?bmvImavDBLcdutgjTnYAMUTC1I453tKCkoMN3irHOjz3UC7VREiDl/cqqCHO?= =?us-ascii?Q?kEtYYuqXnxlH9LgI7/cG25ArGyq3XUJFlCqSbnpO7/swmn1xw4cmru7i1Fu6?= =?us-ascii?Q?6sMnSMaipvGwxYWmuFEx6/NnA5D+yqBCIugBYQ/8F/Q1IHVLXzNphOa3imCl?= =?us-ascii?Q?9ZiHisUMAR2qSfa0hnVtnGMbc0t0Fr8qoHheMfos5fZyW+841wmKNGXON/o5?= =?us-ascii?Q?mkhVEJMYWiLVkFkB6by/KiSSjYGLmhZlM5ofpSP0KUxMkF2O8EoKO5Ahe1WK?= =?us-ascii?Q?ayxT57Hy5UUBW/o4s+JK7uObZArzGA+7PKXZILpIY8B27dxmFaTavGm+PHz+?= =?us-ascii?Q?GMDbgvLPjqdqkBcgBq/H3FLs6ovpz1mAoIFEO1kvCKXbbx8CFHlydj+ZxcpA?= =?us-ascii?Q?+8icsuIE7oqp9ADJ3XrGY3PHENmxYZpkIJ7KZRif1+TgMBAiJg4E6emn80DC?= =?us-ascii?Q?fDMSnTUJhshwXSGNL7rTXfuKNqyRoanso+lsLmVJrPHZLFeBjvjBN9YOcaXk?= =?us-ascii?Q?Vc6FPxJoEGHbPikig5ie7uWnu8IaUTlr2eAU+xhaJGqPQbr2I6wk92Lv0VzE?= =?us-ascii?Q?crRAO3wruwNdFT+PeKytv/0fojtk3y+5Sr8Mq+e8ZKzjANJx/jOyI3gtMpxo?= =?us-ascii?Q?9eOpBiy7rL/GjSSFO0EcrnQy5D25RLPbk3MrlKF8U/DOsgVE7YnVhFoA/i70?= =?us-ascii?Q?inliHOB5377AITCMP+hLnJQsRZQQarY2MiEqgAH4A1ocq+/5RrJlpXhDVnWm?= =?us-ascii?Q?LQ=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3995.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48cf8a54-4774-4d44-751d-08dc0211c6f5 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2023 10:44:15.4823 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: N+hy4dzZwxo+2iMyAxSZbbshG8HY4pIHDJyXqKLF8DgT96zMN1dU5xhWw+VbPEL0X0owkz7VHnNtLuHPKDDZCxCC5W5SvyMcru7RrAvSwAY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4732 X-OriginatorOrg: intel.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Thank you Maryam for the changes.=20 We can merge the patch. Regards, Shibin > -----Original Message----- > From: Maryam Tahhan > Sent: Friday, December 15, 2023 3:40 PM > To: ferruh.yigit@amd.com; stephen@networkplumber.org; > lihuisong@huawei.com; fengchengwen@huawei.com; > liuyonglong@huawei.com; Koikkara Reeny, Shibin > ; Loftus, Ciara > Cc: dev@dpdk.org; Tahhan, Maryam > Subject: [v6] net/af_xdp: enable uds_path instead of use_cni >=20 > With the original 'use_cni' implementation, (using a hardcoded socket rat= her > than a configurable one), if a DPDK pod is requesting multiple net device= s > and these devices are from different pools, then the container attempts t= o > mount all the netdev UDSes in the pod as /tmp/afxdp.sock. Which means > that at best only 1 netdev will handshake correctly with the AF_XDP DP. T= his > patch addresses this by making the socket parameter configurable using a > new vdev param called 'uds_path' and removing the previous 'use_cni' > param. > This patch also fixes incorrect references to the AF_XDP DP as CNI and > updates the documentation with a working example. This change has been > tested with the AF_XDP DP PR 81[1], with both single and multiple interfa= ces. >=20 > [1] https://github.com/intel/afxdp-plugins-for-kubernetes/pull/81 >=20 > v6: > * Add link to PR 81 in commit message > * Add release notes changes to this patchset >=20 > v5: > * Fix alignment for ETH_AF_XDP_USE_DP_UDS_PATH_ARG > * Remove use_cni references in af_xdp.rst >=20 > v4: > * Rename af_xdp_cni.rst to af_xdp_dp.rst > * Removed all incorrect references to CNI throughout af_xdp > PMD file. > * Fixed Typos in af_xdp_dp.rst >=20 > v3: > * Remove `use_cni` vdev argument as it's no longer needed. > * Update incorrect CNI references for the AF_XDP DP in the > documentation. > * Update the documentation to run a simple example with the > AF_XDP DP plugin in K8s. >=20 > v2: > * Rename sock_path to uds_path. > * Update documentation to reflect when CAP_BPF is needed. > * Fix testpmd arguments in the provided example for Pods. > * Use AF_XDP API to update the xskmap entry. >=20 > Signed-off-by: Maryam Tahhan > Reviewed-by: Ciara Loftus > --- > doc/guides/howto/af_xdp_cni.rst | 253 ---------------------- > doc/guides/howto/af_xdp_dp.rst | 278 > +++++++++++++++++++++++++ > doc/guides/howto/index.rst | 2 +- > doc/guides/nics/af_xdp.rst | 27 ++- > doc/guides/rel_notes/release_24_03.rst | 7 + > drivers/net/af_xdp/rte_eth_af_xdp.c | 100 +++++---- > 6 files changed, 352 insertions(+), 315 deletions(-) delete mode 100644 > doc/guides/howto/af_xdp_cni.rst create mode 100644 > doc/guides/howto/af_xdp_dp.rst >=20 > diff --git a/doc/guides/howto/af_xdp_cni.rst > b/doc/guides/howto/af_xdp_cni.rst deleted file mode 100644 index > a1a6d5b99c..0000000000 > --- a/doc/guides/howto/af_xdp_cni.rst > +++ /dev/null > @@ -1,253 +0,0 @@ > -.. SPDX-License-Identifier: BSD-3-Clause > - Copyright(c) 2023 Intel Corporation. > - > -Using a CNI with the AF_XDP driver > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > - > -Introduction > ------------- > - > -CNI, the Container Network Interface, is a technology for configuring - > container network interfaces -and which can be used to setup Kubernetes > networking. > -AF_XDP is a Linux socket Address Family that enables an XDP program -to > redirect packets to a memory buffer in userspace. > - > -This document explains how to enable the `AF_XDP Plugin for Kubernetes`_ > within -a DPDK application using the :doc:`../nics/af_xdp` to connect and= use > these technologies. > - > -.. _AF_XDP Plugin for Kubernetes: https://github.com/intel/afxdp-plugins= - > for-kubernetes > - > - > -Background > ----------- > - > -The standard :doc:`../nics/af_xdp` initialization process involves loadi= ng an > eBPF program -onto the kernel netdev to be used by the PMD. > -This operation requires root or escalated Linux privileges -and thus pre= vents > the PMD from working in an unprivileged container. > -The AF_XDP CNI plugin handles this situation -by providing a device plug= in > that performs the program loading. > - > -At a technical level the CNI opens a Unix Domain Socket and listens for = a > client -to make requests over that socket. > -A DPDK application acting as a client connects and initiates a configura= tion > "handshake". > -The client then receives a file descriptor which points to the XSKMAP - > associated with the loaded eBPF program. > -The XSKMAP is a BPF map of AF_XDP sockets (XSK). > -The client can then proceed with creating an AF_XDP socket -and insertin= g > that socket into the XSKMAP pointed to by the descriptor. > - > -The EAL vdev argument ``use_cni`` is used to indicate that the user wish= es - > to run the PMD in unprivileged mode and to receive the XSKMAP file > descriptor -from the CNI. > -When this flag is set, > -the ``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` libbpf flag -should be > used when creating the socket -to instruct libbpf not to load the default > libbpf program on the netdev. > -Instead the loading is handled by the CNI. > - > -.. note:: > - > - The Unix Domain Socket file path appear in the end user is > "/tmp/afxdp.sock". > - > - > -Prerequisites > -------------- > - > -Docker and container prerequisites: > - > -* Set up the device plugin > - as described in the instructions for `AF_XDP Plugin for Kubernetes`_. > - > -* The Docker image should contain the libbpf and libxdp libraries, > - which are dependencies for AF_XDP, > - and should include support for the ``ethtool`` command. > - > -* The Pod should have enabled the capabilities ``CAP_NET_RAW`` and > ``CAP_BPF`` > - for AF_XDP along with support for hugepages. > - > -* Increase locked memory limit so containers have enough memory for > packet buffers. > - For example: > - > - .. code-block:: console > - > - cat << EOF | sudo tee > /etc/systemd/system/containerd.service.d/limits.conf > - [Service] > - LimitMEMLOCK=3Dinfinity > - EOF > - > -* dpdk-testpmd application should have AF_XDP feature enabled. > - > - For further information see the docs for the: :doc:`../../nics/af_xdp`= . > - > - > -Example > -------- > - > -Howto run dpdk-testpmd with CNI plugin: > - > -* Clone the CNI plugin > - > - .. code-block:: console > - > - # git clone https://github.com/intel/afxdp-plugins-for-kubernetes.g= it > - > -* Build the CNI plugin > - > - .. code-block:: console > - > - # cd afxdp-plugins-for-kubernetes/ > - # make build > - > - .. note:: > - > - CNI plugin has a dependence on the config.json. > - > - Sample Config.json > - > - .. code-block:: json > - > - { > - "logLevel":"debug", > - "logFile":"afxdp-dp-e2e.log", > - "pools":[ > - { > - "name":"e2e", > - "mode":"primary", > - "timeout":30, > - "ethtoolCmds" : ["-L -device- combined 1"], > - "devices":[ > - { > - "name":"ens785f0" > - } > - ] > - } > - ] > - } > - > - For further reference please use the `config.json`_ > - > - .. _config.json: https://github.com/intel/afxdp-plugins-for- > kubernetes/blob/v0.0.2/test/e2e/config.json > - > -* Create the Network Attachment definition > - > - .. code-block:: console > - > - # kubectl create -f nad.yaml > - > - Sample nad.yml > - > - .. code-block:: yaml > - > - apiVersion: "k8s.cni.cncf.io/v1" > - kind: NetworkAttachmentDefinition > - metadata: > - name: afxdp-e2e-test > - annotations: > - k8s.v1.cni.cncf.io/resourceName: afxdp/e2e > - spec: > - config: '{ > - "cniVersion": "0.3.0", > - "type": "afxdp", > - "mode": "cdq", > - "logFile": "afxdp-cni-e2e.log", > - "logLevel": "debug", > - "ipam": { > - "type": "host-local", > - "subnet": "192.168.1.0/24", > - "rangeStart": "192.168.1.200", > - "rangeEnd": "192.168.1.216", > - "routes": [ > - { "dst": "0.0.0.0/0" } > - ], > - "gateway": "192.168.1.1" > - } > - }' > - > - For further reference please use the `nad.yaml`_ > - > - .. _nad.yaml: https://github.com/intel/afxdp-plugins-for- > kubernetes/blob/v0.0.2/test/e2e/nad.yaml > - > -* Build the Docker image > - > - .. code-block:: console > - > - # docker build -t afxdp-e2e-test -f Dockerfile . > - > - Sample Dockerfile: > - > - .. code-block:: console > - > - FROM ubuntu:20.04 > - RUN apt-get update -y > - RUN apt install build-essential libelf-dev -y > - RUN apt-get install iproute2 acl -y > - RUN apt install python3-pyelftools ethtool -y > - RUN apt install libnuma-dev libjansson-dev libpcap-dev net-tools -y > - RUN apt-get install clang llvm -y > - COPY ./libbpf.tar.gz /tmp > - RUN cd /tmp && tar -xvmf libbpf.tar.gz && cd libbpf/src && > make install > - COPY ./libxdp.tar.gz /tmp > - RUN cd /tmp && tar -xvmf libxdp.tar.gz && cd libxdp && mak= e > install > - > - .. note:: > - > - All the files that need to COPY-ed should be in the same directory = as the > Dockerfile > - > -* Run the Pod > - > - .. code-block:: console > - > - # kubectl create -f pod.yaml > - > - Sample pod.yaml: > - > - .. code-block:: yaml > - > - apiVersion: v1 > - kind: Pod > - metadata: > - name: afxdp-e2e-test > - annotations: > - k8s.v1.cni.cncf.io/networks: afxdp-e2e-test > - spec: > - containers: > - - name: afxdp > - image: afxdp-e2e-test:latest > - imagePullPolicy: Never > - env: > - - name: LD_LIBRARY_PATH > - value: /usr/lib64/:/usr/local/lib/ > - command: ["tail", "-f", "/dev/null"] > - securityContext: > - capabilities: > - add: > - - CAP_NET_RAW > - - CAP_BPF > - resources: > - requests: > - hugepages-2Mi: 2Gi > - memory: 2Gi > - afxdp/e2e: '1' > - limits: > - hugepages-2Mi: 2Gi > - memory: 2Gi > - afxdp/e2e: '1' > - > - For further reference please use the `pod.yaml`_ > - > - .. _pod.yaml: https://github.com/intel/afxdp-plugins-for- > kubernetes/blob/v0.0.2/test/e2e/pod-1c1d.yaml > - > -* Run DPDK with a command like the following: > - > - .. code-block:: console > - > - kubectl exec -i --container -- \ > - //dpdk-testpmd -l 0,1 --no-pci \ > - --vdev=3Dnet_af_xdp0,use_cni=3D1,iface=3D \ > - -- --no-mlockall --in-memory > - > -For further reference please use the `e2e`_ test case in `AF_XDP Plugin = for > Kubernetes`_ > - > - .. _e2e: https://github.com/intel/afxdp-plugins-for- > kubernetes/tree/v0.0.2/test/e2e > diff --git a/doc/guides/howto/af_xdp_dp.rst > b/doc/guides/howto/af_xdp_dp.rst new file mode 100644 index > 0000000000..7717d59224 > --- /dev/null > +++ b/doc/guides/howto/af_xdp_dp.rst > @@ -0,0 +1,278 @@ > +.. SPDX-License-Identifier: BSD-3-Clause > + Copyright(c) 2023 Intel Corporation. > + > +Using the AF_XDP Device Plugin with the AF_XDP driver > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > + > +Introduction > +------------ > + > +The `AF_XDP Device Plugin for Kubernetes`_ is a project that provisions > +and advertises interfaces (that can be used with AF_XDP) to Kubernetes. > +The project also includes a `CNI`_. > + > +AF_XDP is a Linux socket Address Family that enables an XDP program to > +redirect packets to a memory buffer in userspace. > + > +This document explains how to use the `AF_XDP Device Plugin for > +Kubernetes`_ with a DPDK :doc:`../nics/af_xdp` based application running= in > a Pod. > + > +.. _AF_XDP Device Plugin for Kubernetes: > +https://github.com/intel/afxdp-plugins-for-kubernetes > +.. _CNI: https://github.com/containernetworking/cni > + > +Background > +---------- > + > +The standard :doc:`../nics/af_xdp` initialization process involves > +loading an eBPF program onto the Kernel netdev to be used by the PMD. > +This operation requires root or escalated Linux privileges and prevents > +the PMD from working in an unprivileged container. The AF_XDP Device > +Plugin (DP) addresses this situation by providing an entity that > +manages eBPF program lifecycle for Pod interfaces that wish to use > +AF_XDP, this in turn allows the pod to be used without privilege escalat= ion. > + > +In order for the pod to run without privilege escalation, the AF_XDP DP > +creates a Unix Domain Socket (UDS) and listens for Pods to make > +requests for XSKMAP(s) File Descriptors (FDs) for interfaces in their > network namespace. > +In other words, the DPDK application running in the Pod connects to > +this UDS and initiates a "handshake" to retrieve the XSKMAP(s) FD(s). > +Upon a successful "handshake", the DPDK application receives the FD(s) > +for the XSKMAP(s) associated with the relevant netdevs. The DPDK > +application can then create the AF_XDP socket(s), and attach the socket(= s) > to the netdev queue(s) by inserting the socket(s) into the XSKMAP(s). > + > +The EAL vdev argument ``uds_path`` is used to indicate that the user > +wishes to run the AF_XDP PMD in unprivileged mode and to receive the > +XSKMAP FD from the AF_XDP DP. When this param is used, the > +``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` libbpf flag is used when > +creating the AF_XDP socket to instruct libbpf/libxdp not to load the > +default eBPF redirect program for AF_XDP on the netdev. Instead the > +lifecycle management of the eBPF program is handled by the AF_XDP DP. > + > +.. note:: > + > + The UDS file path inside the pod appears at > "/tmp/afxdp_dp//afxdp.sock". > + > +Prerequisites > +------------- > + > +Device Plugin and DPDK container prerequisites: > + > +* Create a DPDK container image. > + > +* Set up the device plugin and prepare the Pod Spec as described in > + the instructions for `AF_XDP Device Plugin for Kubernetes`_. > + > +* Increase locked memory limit so containers have enough memory for > packet buffers. > + For example: > + > + .. code-block:: console > + > + cat << EOF | sudo tee > /etc/systemd/system/containerd.service.d/limits.conf > + [Service] > + LimitMEMLOCK=3Dinfinity > + EOF > + > +* dpdk-testpmd application should have AF_XDP feature enabled. > + > + For further information see the docs for the: :doc:`../../nics/af_xdp`= . > + > + > +Example > +------- > + > +How to run dpdk-testpmd with the AF_XDP Device plugin: > + > +* Clone the AF_XDP Device plugin > + > + .. code-block:: console > + > + # git clone > + https://github.com/intel/afxdp-plugins-for-kubernetes.git > + > +* Build the AF_XDP Device plugin and the CNI > + > + .. code-block:: console > + > + # cd afxdp-plugins-for-kubernetes/ > + # make image > + > +* Make sure to modify the image used by the `daemonset.yml`_ file in > +the deployments directory with > + the following configuration: > + > + .. _daemonset.yml : > + https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/deploy > + ments/daemonset.yml > + > + .. code-block:: yaml > + > + image: afxdp-device-plugin:latest > + > + .. note:: > + > + This will select the AF_XDP DP image that was built locally. Detaile= d > configuration > + options can be found in the AF_XDP Device Plugin `readme`_ . > + > + .. _readme: > + https://github.com/intel/afxdp-plugins-for-kubernetes#readme > + > +* Deploy the AF_XDP Device Plugin and CNI > + > + .. code-block:: console > + > + # kubectl create -f deployments/daemonset.yml > + > +* Create a Network Attachment Definition (NAD) > + > + .. code-block:: console > + > + # kubectl create -f nad.yaml > + > + Sample nad.yml > + > + .. code-block:: yaml > + > + apiVersion: "k8s.cni.cncf.io/v1" > + kind: NetworkAttachmentDefinition > + metadata: > + name: afxdp-network > + annotations: > + k8s.v1.cni.cncf.io/resourceName: afxdp/myPool > + spec: > + config: '{ > + "cniVersion": "0.3.0", > + "type": "afxdp", > + "mode": "primary", > + "logFile": "afxdp-cni.log", > + "logLevel": "debug", > + "ethtoolCmds" : ["-N -device- rx-flow-hash udp4 fn", > + "-N -device- flow-type udp4 dst-port 2152 act= ion 22" > + ], > + "ipam": { > + "type": "host-local", > + "subnet": "192.168.1.0/24", > + "rangeStart": "192.168.1.200", > + "rangeEnd": "192.168.1.220", > + "routes": [ > + { "dst": "0.0.0.0/0" } > + ], > + "gateway": "192.168.1.1" > + } > + }' > + > + For further reference please use the example provided by the AF_XDP > + DP `nad.yaml`_ > + > + .. _nad.yaml: > + https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/exampl > + es/network-attachment-definition.yaml > + > +* Build a DPDK container image (using Docker) > + > + .. code-block:: console > + > + # docker build -t dpdk -f Dockerfile . > + > + Sample Dockerfile (should be placed in top level DPDK directory): > + > + .. code-block:: console > + > + FROM fedora:38 > + > + # Setup container to build DPDK applications > + RUN dnf -y upgrade && dnf -y install \ > + libbsd-devel \ > + numactl-libs \ > + libbpf-devel \ > + libbpf \ > + meson \ > + ninja-build \ > + libxdp-devel \ > + libxdp \ > + numactl-devel \ > + python3-pyelftools \ > + python38 \ > + iproute > + RUN dnf groupinstall -y 'Development Tools' > + > + # Create DPDK dir and copy over sources > + WORKDIR /dpdk > + COPY app app > + COPY builddir builddir > + COPY buildtools buildtools > + COPY config config > + COPY devtools devtools > + COPY drivers drivers > + COPY dts dts > + COPY examples examples > + COPY kernel kernel > + COPY lib lib > + COPY license license > + COPY MAINTAINERS MAINTAINERS > + COPY Makefile Makefile > + COPY meson.build meson.build > + COPY meson_options.txt meson_options.txt > + COPY usertools usertools > + COPY VERSION VERSION > + COPY ABI_VERSION ABI_VERSION > + COPY doc doc > + > + # Build DPDK > + RUN meson setup build > + RUN ninja -C build > + > + .. note:: > + > + Ensure the Dockerfile is placed in the top level DPDK directory. > + > +* Run the Pod > + > + .. code-block:: console > + > + # kubectl create -f pod.yaml > + > + Sample pod.yaml: > + > + .. code-block:: yaml > + > + apiVersion: v1 > + kind: Pod > + metadata: > + name: dpdk > + annotations: > + k8s.v1.cni.cncf.io/networks: afxdp-network > + spec: > + containers: > + - name: testpmd > + image: dpdk:latest > + command: ["tail", "-f", "/dev/null"] > + securityContext: > + capabilities: > + add: > + - NET_RAW > + - IPC_LOCK > + resources: > + requests: > + afxdp/myPool: '1' > + limits: > + hugepages-1Gi: 2Gi > + cpu: 2 > + memory: 256Mi > + afxdp/myPool: '1' > + volumeMounts: > + - name: hugepages > + mountPath: /dev/hugepages > + volumes: > + - name: hugepages > + emptyDir: > + medium: HugePages > + > + For further reference please use the `pod.yaml`_ > + > + .. _pod.yaml: > + https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/exampl > + es/pod-spec.yaml > + > +.. note:: > + > + For Kernel versions older than 5.19 `CAP_BPF` is also required in > + the container capabilities stanza. > + > +* Run DPDK with a command like the following: > + > + .. code-block:: console > + > + kubectl exec -i dpdk --container testpmd -- \ > + ./build/app/dpdk-testpmd -l 0-2 --no-pci --main-lcore=3D2 \ > + --vdev net_af_xdp,iface=3D name>,start_queue=3D22,queue_count=3D1,uds_path=3D/tmp/afxdp_dp/ ce-name>/afxdp.sock \ > + -- -i --a --nb-cores=3D2 --rxq=3D1 --txq=3D1 > + --forward-mode=3Dmacswap; > diff --git a/doc/guides/howto/index.rst b/doc/guides/howto/index.rst inde= x > 71a3381c36..a7692e8a97 100644 > --- a/doc/guides/howto/index.rst > +++ b/doc/guides/howto/index.rst > @@ -8,7 +8,7 @@ HowTo Guides > :maxdepth: 2 > :numbered: >=20 > - af_xdp_cni > + af_xdp_dp > lm_bond_virtio_sriov > lm_virtio_vhost_user > flow_bifurcation > diff --git a/doc/guides/nics/af_xdp.rst b/doc/guides/nics/af_xdp.rst inde= x > 1932525d4d..0edc84328d 100644 > --- a/doc/guides/nics/af_xdp.rst > +++ b/doc/guides/nics/af_xdp.rst > @@ -151,25 +151,32 @@ instead of zero copy mode (if available). >=20 > --vdev net_af_xdp,iface=3Dens786f1,force_copy=3D1 >=20 > -use_cni > -~~~~~~~ > +uds_path > +~~~~~~~~~ >=20 > -The EAL vdev argument ``use_cni`` is used to indicate that the user wish= es to > -enable the `AF_XDP Plugin for Kubernetes`_ within a DPDK application. > +The EAL vdev argument ``uds_path`` is used to indicate that the user > +wishes to use the `AF_XDP Plugin for Kubernetes`_ with a DPDK applicatio= n > running in a Pod. >=20 > .. _AF_XDP Plugin for Kubernetes: https://github.com/intel/afxdp-plugins= - > for-kubernetes >=20 > .. code-block:: console >=20 > - --vdev=3Dnet_af_xdp0,use_cni=3D1 > + > + --vdev=3Dnet_af_xdp0,uds_path=3D=3D/tmp/afxdp_dp/ name>/afxdp.sock >=20 > .. note:: >=20 > - When using `use_cni`_, both parameters `xdp_prog`_ and `busy_budget`_ > are disabled > - as both of these will be handled by the AF_XDP plugin. > - Since the DPDK application is running in limited privileges > - so enabling and disabling of the promiscuous mode through the DPDK > application > - is also not supported. > + The UDS ``afxdp.sock`` is available in the DPDK container through a > + volume mounted by the `AF_XDP Plugin for Kubernetes`_ at the path > + specified in the example above. > + > +.. note:: > + > + When using `uds_path`_, both parameters `xdp_prog`_ and > `busy_budget`_ are disabled > + as both of these will be handled by the AF_XDP Device plugin (if requ= ired). > + Since the pod/container is running with limited privileges enabling a= nd > disabling > + of promiscuous mode through the DPDK application is also not supporte= d. > + > +For more details please see: :doc:`../howto/af_xdp_dp` >=20 > Limitations > ----------- > diff --git a/doc/guides/rel_notes/release_24_03.rst > b/doc/guides/rel_notes/release_24_03.rst > index 6f8ad27808..606cdf6316 100644 > --- a/doc/guides/rel_notes/release_24_03.rst > +++ b/doc/guides/rel_notes/release_24_03.rst > @@ -55,6 +55,13 @@ New Features > Also, make sure to start the actual text at the margin. > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D >=20 > +* **Integration of AF_XDP PMD with AF_XDP Device Plugin** > + > + The EAL vdev argument for the AF_XDP PMD ``uds_path`` was added to > + allow Kubernetes Pods that which to use AF_XDP with DPDK to run with > + limited privileges. This flag indicates that the AF_XDP PMD will be > + used in unprivileged mode and will receive the XSKMAP FD from the > + AF_XDP Device Plugin. >=20 > Removed Items > ------------- > diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c > b/drivers/net/af_xdp/rte_eth_af_xdp.c > index 353c8688ec..db6724b9e5 100644 > --- a/drivers/net/af_xdp/rte_eth_af_xdp.c > +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c > @@ -88,7 +88,6 @@ RTE_LOG_REGISTER_DEFAULT(af_xdp_logtype, > NOTICE); > #define UDS_MAX_CMD_LEN 64 > #define UDS_MAX_CMD_RESP 128 > #define UDS_XSK_MAP_FD_MSG "/xsk_map_fd" > -#define UDS_SOCK "/tmp/afxdp.sock" > #define UDS_CONNECT_MSG "/connect" > #define UDS_HOST_OK_MSG "/host_ok" > #define UDS_HOST_NAK_MSG "/host_nak" > @@ -170,7 +169,7 @@ struct pmd_internals { > char prog_path[PATH_MAX]; > bool custom_prog_configured; > bool force_copy; > - bool use_cni; > + char uds_path[PATH_MAX]; > struct bpf_map *map; >=20 > struct rte_ether_addr eth_addr; > @@ -190,7 +189,7 @@ struct pmd_process_private { > #define ETH_AF_XDP_PROG_ARG "xdp_prog" > #define ETH_AF_XDP_BUDGET_ARG "busy_budget" > #define ETH_AF_XDP_FORCE_COPY_ARG "force_copy" > -#define ETH_AF_XDP_USE_CNI_ARG "use_cni" > +#define ETH_AF_XDP_USE_DP_UDS_PATH_ARG "uds_path" >=20 > static const char * const valid_arguments[] =3D { > ETH_AF_XDP_IFACE_ARG, > @@ -200,7 +199,7 @@ static const char * const valid_arguments[] =3D { > ETH_AF_XDP_PROG_ARG, > ETH_AF_XDP_BUDGET_ARG, > ETH_AF_XDP_FORCE_COPY_ARG, > - ETH_AF_XDP_USE_CNI_ARG, > + ETH_AF_XDP_USE_DP_UDS_PATH_ARG, > NULL > }; >=20 > @@ -1351,7 +1350,7 @@ configure_preferred_busy_poll(struct > pkt_rx_queue *rxq) } >=20 > static int > -init_uds_sock(struct sockaddr_un *server) > +init_uds_sock(struct sockaddr_un *server, const char *uds_path) > { > int sock; >=20 > @@ -1362,7 +1361,7 @@ init_uds_sock(struct sockaddr_un *server) > } >=20 > server->sun_family =3D AF_UNIX; > - strlcpy(server->sun_path, UDS_SOCK, sizeof(server->sun_path)); > + strlcpy(server->sun_path, uds_path, sizeof(server->sun_path)); >=20 > if (connect(sock, (struct sockaddr *)server, sizeof(struct > sockaddr_un)) < 0) { > close(sock); > @@ -1382,7 +1381,7 @@ struct msg_internal { }; >=20 > static int > -send_msg(int sock, char *request, int *fd) > +send_msg(int sock, char *request, int *fd, const char *uds_path) > { > int snd; > struct iovec iov; > @@ -1393,7 +1392,7 @@ send_msg(int sock, char *request, int *fd) >=20 > memset(&dst, 0, sizeof(dst)); > dst.sun_family =3D AF_UNIX; > - strlcpy(dst.sun_path, UDS_SOCK, sizeof(dst.sun_path)); > + strlcpy(dst.sun_path, uds_path, sizeof(dst.sun_path)); >=20 > /* Initialize message header structure */ > memset(&msgh, 0, sizeof(msgh)); > @@ -1470,8 +1469,8 @@ read_msg(int sock, char *response, struct > sockaddr_un *s, int *fd) } >=20 > static int > -make_request_cni(int sock, struct sockaddr_un *server, char *request, > - int *req_fd, char *response, int *out_fd) > +make_request_dp(int sock, struct sockaddr_un *server, char *request, > + int *req_fd, char *response, int *out_fd, const char > *uds_path) > { > int rval; >=20 > @@ -1483,7 +1482,7 @@ make_request_cni(int sock, struct sockaddr_un > *server, char *request, > if (req_fd =3D=3D NULL) > rval =3D write(sock, request, strlen(request)); > else > - rval =3D send_msg(sock, request, req_fd); > + rval =3D send_msg(sock, request, req_fd, uds_path); >=20 > if (rval < 0) { > AF_XDP_LOG(ERR, "Write error %s\n", strerror(errno)); @@ > -1507,7 +1506,7 @@ check_response(char *response, char *exp_resp, long > size) } >=20 > static int > -get_cni_fd(char *if_name) > +get_xskmap_fd(char *if_name, const char *uds_path) > { > char request[UDS_MAX_CMD_LEN], > response[UDS_MAX_CMD_RESP]; > char hostname[MAX_LONG_OPT_SZ], > exp_resp[UDS_MAX_CMD_RESP]; @@ -1520,14 +1519,14 @@ > get_cni_fd(char *if_name) > return -1; >=20 > memset(&server, 0, sizeof(server)); > - sock =3D init_uds_sock(&server); > + sock =3D init_uds_sock(&server, uds_path); > if (sock < 0) > return -1; >=20 > - /* Initiates handshake to CNI send: /connect,hostname */ > + /* Initiates handshake to AF_XDP Device Plugin send: > /connect,hostname > +*/ > snprintf(request, sizeof(request), "%s,%s", UDS_CONNECT_MSG, > hostname); > memset(response, 0, sizeof(response)); > - if (make_request_cni(sock, &server, request, NULL, response, > &out_fd) < 0) { > + if (make_request_dp(sock, &server, request, NULL, response, > &out_fd, > +uds_path) < 0) { > AF_XDP_LOG(ERR, "Error in processing cmd [%s]\n", > request); > goto err_close; > } > @@ -1541,7 +1540,7 @@ get_cni_fd(char *if_name) > /* Request for "/version" */ > strlcpy(request, UDS_VERSION_MSG, UDS_MAX_CMD_LEN); > memset(response, 0, sizeof(response)); > - if (make_request_cni(sock, &server, request, NULL, response, > &out_fd) < 0) { > + if (make_request_dp(sock, &server, request, NULL, response, > &out_fd, > +uds_path) < 0) { > AF_XDP_LOG(ERR, "Error in processing cmd [%s]\n", > request); > goto err_close; > } > @@ -1549,7 +1548,7 @@ get_cni_fd(char *if_name) > /* Request for file descriptor for netdev name*/ > snprintf(request, sizeof(request), "%s,%s", > UDS_XSK_MAP_FD_MSG, if_name); > memset(response, 0, sizeof(response)); > - if (make_request_cni(sock, &server, request, NULL, response, > &out_fd) < 0) { > + if (make_request_dp(sock, &server, request, NULL, response, > &out_fd, > +uds_path) < 0) { > AF_XDP_LOG(ERR, "Error in processing cmd [%s]\n", > request); > goto err_close; > } > @@ -1571,7 +1570,7 @@ get_cni_fd(char *if_name) > /* Initiate close connection */ > strlcpy(request, UDS_FIN_MSG, UDS_MAX_CMD_LEN); > memset(response, 0, sizeof(response)); > - if (make_request_cni(sock, &server, request, NULL, response, > &out_fd) < 0) { > + if (make_request_dp(sock, &server, request, NULL, response, > &out_fd, > +uds_path) < 0) { > AF_XDP_LOG(ERR, "Error in processing cmd [%s]\n", > request); > goto err_close; > } > @@ -1640,7 +1639,7 @@ xsk_configure(struct pmd_internals *internals, > struct pkt_rx_queue *rxq, #endif >=20 > /* Disable libbpf from loading XDP program */ > - if (internals->use_cni) > + if (strnlen(internals->uds_path, PATH_MAX)) > cfg.libbpf_flags |=3D > XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD; >=20 > if (strnlen(internals->prog_path, PATH_MAX)) { @@ -1694,18 > +1693,17 @@ xsk_configure(struct pmd_internals *internals, struct > pkt_rx_queue *rxq, > } > } >=20 > - if (internals->use_cni) { > - int err, fd, map_fd; > + if (strnlen(internals->uds_path, PATH_MAX)) { > + int err, map_fd; >=20 > - /* get socket fd from CNI plugin */ > - map_fd =3D get_cni_fd(internals->if_name); > + /* get socket fd from AF_XDP Device plugin */ > + map_fd =3D get_xskmap_fd(internals->if_name, internals- > >uds_path); > if (map_fd < 0) { > - AF_XDP_LOG(ERR, "Failed to receive CNI plugin > fd\n"); > + AF_XDP_LOG(ERR, "Failed to receive AF_XDP Device > plugin fd\n"); > goto out_xsk; > } > - /* get socket fd */ > - fd =3D xsk_socket__fd(rxq->xsk); > - err =3D bpf_map_update_elem(map_fd, &rxq- > >xsk_queue_idx, &fd, 0); > + > + err =3D xsk_socket__update_xskmap(rxq->xsk, map_fd); > if (err) { > AF_XDP_LOG(ERR, "Failed to insert unprivileged xsk > in map.\n"); > goto out_xsk; > @@ -1881,13 +1879,13 @@ static const struct eth_dev_ops ops =3D { > .get_monitor_addr =3D eth_get_monitor_addr, }; >=20 > -/* CNI option works in unprivileged container environment > - * and ethernet device functionality will be reduced. So > - * additional customiszed eth_dev_ops struct is needed > - * for cni. Promiscuous enable and disable functionality > - * is removed. > - **/ > -static const struct eth_dev_ops ops_cni =3D { > +/* AF_XDP Device Plugin option works in unprivileged > + * container environment and ethernet device functionality > + * will be reduced. So additional customized eth_dev_ops > + * struct is needed for the AF_XDP Device Plugin. Promiscuous > + * enable and disable functionality is removed. > + */ > +static const struct eth_dev_ops ops_afxdp_dp =3D { > .dev_start =3D eth_dev_start, > .dev_stop =3D eth_dev_stop, > .dev_close =3D eth_dev_close, > @@ -1957,7 +1955,7 @@ parse_name_arg(const char *key __rte_unused, >=20 > /** parse xdp prog argument */ > static int > -parse_prog_arg(const char *key __rte_unused, > +parse_path_arg(const char *key __rte_unused, > const char *value, void *extra_args) { > char *path =3D extra_args; > @@ -2023,7 +2021,7 @@ xdp_get_channels_info(const char *if_name, int > *max_queues, static int parse_parameters(struct rte_kvargs *kvlist, cha= r > *if_name, int *start_queue, > int *queue_cnt, int *shared_umem, char *prog_path, > - int *busy_budget, int *force_copy, int *use_cni) > + int *busy_budget, int *force_copy, char *uds_path) > { > int ret; >=20 > @@ -2050,7 +2048,7 @@ parse_parameters(struct rte_kvargs *kvlist, char > *if_name, int *start_queue, > goto free_kvlist; >=20 > ret =3D rte_kvargs_process(kvlist, ETH_AF_XDP_PROG_ARG, > - &parse_prog_arg, prog_path); > + &parse_path_arg, prog_path); > if (ret < 0) > goto free_kvlist; >=20 > @@ -2064,8 +2062,8 @@ parse_parameters(struct rte_kvargs *kvlist, char > *if_name, int *start_queue, > if (ret < 0) > goto free_kvlist; >=20 > - ret =3D rte_kvargs_process(kvlist, ETH_AF_XDP_USE_CNI_ARG, > - &parse_integer_arg, use_cni); > + ret =3D rte_kvargs_process(kvlist, > ETH_AF_XDP_USE_DP_UDS_PATH_ARG, > + &parse_path_arg, uds_path); > if (ret < 0) > goto free_kvlist; >=20 > @@ -2108,7 +2106,7 @@ static struct rte_eth_dev * init_internals(struct > rte_vdev_device *dev, const char *if_name, > int start_queue_idx, int queue_cnt, int shared_umem, > const char *prog_path, int busy_budget, int force_copy, > - int use_cni) > + const char *uds_path) > { > const char *name =3D rte_vdev_device_name(dev); > const unsigned int numa_node =3D dev->device.numa_node; @@ - > 2137,7 +2135,7 @@ init_internals(struct rte_vdev_device *dev, const char > *if_name, #endif > internals->shared_umem =3D shared_umem; > internals->force_copy =3D force_copy; > - internals->use_cni =3D use_cni; > + strlcpy(internals->uds_path, uds_path, PATH_MAX); >=20 > if (xdp_get_channels_info(if_name, &internals->max_queue_cnt, > &internals->combined_queue_cnt)) { @@ - > 2196,10 +2194,10 @@ init_internals(struct rte_vdev_device *dev, const cha= r > *if_name, > eth_dev->data->dev_link =3D pmd_link; > eth_dev->data->mac_addrs =3D &internals->eth_addr; > eth_dev->data->dev_flags |=3D > RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; > - if (!internals->use_cni) > + if (!strnlen(internals->uds_path, PATH_MAX)) > eth_dev->dev_ops =3D &ops; > else > - eth_dev->dev_ops =3D &ops_cni; > + eth_dev->dev_ops =3D &ops_afxdp_dp; >=20 > eth_dev->rx_pkt_burst =3D eth_af_xdp_rx; > eth_dev->tx_pkt_burst =3D eth_af_xdp_tx; @@ -2327,7 +2325,7 @@ > rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) > char prog_path[PATH_MAX] =3D {'\0'}; > int busy_budget =3D -1, ret; > int force_copy =3D 0; > - int use_cni =3D 0; > + char uds_path[PATH_MAX] =3D {'\0'}; > struct rte_eth_dev *eth_dev =3D NULL; > const char *name =3D rte_vdev_device_name(dev); >=20 > @@ -2370,20 +2368,20 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device > *dev) >=20 > if (parse_parameters(kvlist, if_name, &xsk_start_queue_idx, > &xsk_queue_cnt, &shared_umem, prog_path, > - &busy_budget, &force_copy, &use_cni) < 0) { > + &busy_budget, &force_copy, uds_path) < 0) > { > AF_XDP_LOG(ERR, "Invalid kvargs value\n"); > return -EINVAL; > } >=20 > - if (use_cni && busy_budget > 0) { > + if (strnlen(uds_path, PATH_MAX) && busy_budget > 0) { > AF_XDP_LOG(ERR, "When '%s' parameter is used, '%s' > parameter is not valid\n", > - ETH_AF_XDP_USE_CNI_ARG, > ETH_AF_XDP_BUDGET_ARG); > + ETH_AF_XDP_USE_DP_UDS_PATH_ARG, > ETH_AF_XDP_BUDGET_ARG); > return -EINVAL; > } >=20 > - if (use_cni && strnlen(prog_path, PATH_MAX)) { > + if (strnlen(uds_path, PATH_MAX) && strnlen(prog_path, > PATH_MAX)) { > AF_XDP_LOG(ERR, "When '%s' parameter is used, '%s' > parameter is not valid\n", > - ETH_AF_XDP_USE_CNI_ARG, > ETH_AF_XDP_PROG_ARG); > + ETH_AF_XDP_USE_DP_UDS_PATH_ARG, > ETH_AF_XDP_PROG_ARG); > return -EINVAL; > } >=20 > @@ -2410,7 +2408,7 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device > *dev) >=20 > eth_dev =3D init_internals(dev, if_name, xsk_start_queue_idx, > xsk_queue_cnt, shared_umem, prog_path, > - busy_budget, force_copy, use_cni); > + busy_budget, force_copy, uds_path); > if (eth_dev =3D=3D NULL) { > AF_XDP_LOG(ERR, "Failed to init internals\n"); > return -1; > @@ -2471,4 +2469,4 @@ > RTE_PMD_REGISTER_PARAM_STRING(net_af_xdp, > "xdp_prog=3D " > "busy_budget=3D " > "force_copy=3D " > - "use_cni=3D "); > + "uds_path=3D "); > -- > 2.41.0