From patchwork Fri Oct 27 02:59:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133462 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 40ABF4320F; Fri, 27 Oct 2023 05:03:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8802242E57; Fri, 27 Oct 2023 05:01:14 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2118.outbound.protection.outlook.com [40.107.244.118]) by mails.dpdk.org (Postfix) with ESMTP id 44D4B42E27 for ; Fri, 27 Oct 2023 05:01:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RKRg43K73SsSf6AkAoXxTxWn3GJg7BCRzgzJzAAhiYHpCdgLpJXK9dk4kzNB0sXytmfWPFXhbL17eJbb5NhpPsccMbMQAAl0KWGfM2zrNPhn//zbchW7WjZQiS0pWnYbCYL0tr8cliqUZZ2G0/jJqNPmO0lLiGf8EDh51dL1Gh3Zp1Lk2wHWcXVyTvki2Oy9o7kvFTUXuqZ7E88aMw/DWdUeC0foQEj94oX6bmAW2g4XCztHnVkF2/sTY2MHIrhcDhR+3GyAKKxMyQ+sbkSbS0qNXvgSCNoBlbez9c00rrnEaeGuvT5ZQBauYWj3S3oKWY7tBrkYsbQoYPrT08eCIg== 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=yOGvlioRLuuyiF3PvoqM9dx/VgwtqOmWT2SFrI/Pe0E=; b=SAydAbze5rPcbd+8aUJmfhb7OPfQF/N9pUUpFMk4BWEGBZpNsrDBX+ZaVHl7DsSbDC8kpUvsPw/zfX+UF8cvYIbvExUx9LKyYCQX+6mYGvsizMn+rfi5/SNt0cyyLN88XK1CB8VbBouwlrtShvF8MmqkQAMqxxrkDpJczDUKlmxgwPvB/hSBTY4dUrU3VpnObqgwbuMgErfRhJDncyCjMOlSIGveMKfsrTTOPE9H33GnOs5Kg/ROfbS9gv6+2dPU4bj9l3vk89XY1mH1WExEdvRO+4EJ8vRRITdrxwN1c0WSRs0H5osEkhu7e4s8OLWUAvr0QqI4aYVkvPwJ1GT59g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yOGvlioRLuuyiF3PvoqM9dx/VgwtqOmWT2SFrI/Pe0E=; b=E37+Cfppw7c7Or9dCntBoGmbicLAIBwreRuv5dBz1T47VRsBFYcpetb9v0nUiGdu9+srS+fQ/GoGqmLTtBhpouqjeBQlU2VHIxbDsJ932tz/5zQ8t8qoPIYYfJfgiDMs6B6HXcliIvKMzKxTMHuPkMbPLmetgfHUmRZfwPDpgpw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Fri, 27 Oct 2023 03:01:01 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023 03:01:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH v4 19/24] vdpa/nfp: add basic framework Date: Fri, 27 Oct 2023 10:59:56 +0800 Message-Id: <20231027030001.602639-20-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: c4291af7-d173-443a-abec-08dbd698f39c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PAbKsTIZqQm56HIIWeqPlPBpVfv0mJIa/V4vt2jkChiUKdgP47af//6dwt9tI5v+rTuEPe9bPKifBqRUsAy9M3AQRRctOPOvduQ6eeUIye52XZNeD8fIGwoP48/MXGo1IbQkT4ntMVXnjg/M4a0Wa4VKPrBTU86v3jF8RvNeoBpm2EqUE9+wdeY81QW/JcYCLIOKdkOhGUyJXy7gMCf2qT51hU/+oHG9L/hyJmueSkVMPHYg7l8zs2ahUBnAeZakYHjX4+w2X9NQQGHzmdx1MOmtwb1Cw3bTTpKKALYe7OTgb9+V7d5mmxuNortdnWScJp5EFcfSoZr1JTvp7NoxYN5qtgO4K6zz2zRGlPCm9rmVd68DsXmkoeN09GZvOctcbynK3ltaaDGAWtHEhexntyFGUQKTy4uX20DJvNJuuTjEOpmQW7Pf6Wsii5VBIdiR+YJx7WRexyRaz/DihjabbSUqQEO0ayKZZNtC8jejOvNlB61OhNoqDeI5FhzdCyPxpU57dt2h2YB3dqXvGvLZyUBnoF2xU1sRtag7JWpnW94r5Ecc/umhZIuIMGrEjOyL0K0tAVRxl8kAMf8lP9wUH/vCaDPCAqQ2Wt7MujvDf2zPSXUVFpLmnUaCBZpffDWGrlyAoBJ3vHs4LX0zo1Wm7fE2J7tIwZLuHp7VKfqpgh4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(136003)(366004)(346002)(376002)(39840400004)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38350700005)(83380400001)(4326008)(52116002)(2906002)(38100700002)(107886003)(44832011)(8936002)(26005)(2616005)(1076003)(36756003)(8676002)(54906003)(6666004)(5660300002)(66476007)(6916009)(6506007)(316002)(6486002)(6512007)(41300700001)(66556008)(66946007)(86362001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4pGqQFpTjys+jlFxVqHDD3WPSuZiNNQWpHWiEt3V65xBeUX95n3YptoX/9vOokUhYcOlb73JBFqMKkwRY1o/CII1old7qH9IOGZ2V83FiDaBjAyNSmMbXbQCYhBVRcadB7tdAcuYOGtt5m8e2yqDgRbdeZpCZ2FkkYHd3H8RB8XVN/RH3PyXJligurr7dNw/QZNpHKWAxl/qg+uBBxsMVgNgXpnHUg4BRHslF3nK8QK3d9Ls4D8+i6vmiK7/o/gcmGcln5fYuQW3CdIkrJReNsoVXrmkoWcEo9ANgS2LWYnnhaO6UnS1AvS/1lCYS5raV5FPT+L8yOcAs8UqQq7K0T6b5Pk9lhvAFlIudiB6pa3peZ2jHocnesqy3oT+j3h3Et/9Rek8QTa2yVBDqlzNUL/GKyu+jKRisdgik32Ri6hfme+a0hn9C6bIyZ0spt3qHJHns3gnoLwzZ7CR2hIfZn0CHsgIedsGq3IWdwDdfotWoGc6NO3vLkfNZN7t5ASljPNvP63jppFzfYRxDTTnEuWc3HGZQNKXFFmpB82TC7sr31FXkSBirdAwmQHCs2GMfdNSAh7VVX40zGPc4MU7TxBz/JxPpqTMTQAU+e5MX4yUM1/NCddDEEBmIi2EGTRZ9yeXikSSQTfZmwYWPbRpXU2AfWSsMWre9g/hjmodFYBmOMiLNftP41GOfCr6rCY0FsE6rzySZaxGy4xW9311etkegxuCkOXqDHDmqDWhbdRjLFu2MKE+Thm0yt3pxc55G1ofHiCLmBSbbTM9iqyoH7mM6yI99Ss7bYSbDhUEwWZR8g+oAqtDQ2L9LwrwhDwLaUNDhE1qqwoS/p0ejEpJXR702MphpSjVELk7uSZ2Ky0qeI9rxc4XhAltlbGp0U+XXXY+7hwJUEiRrdT+VRqzHifKIgCNKwtAZGoIWEgpqTDGilQdLqiEMED/ucbyd3fVVjgZ9Bybx4BwyL9358W5vNmc3N55OPeKMdKbIaansltdLaq1vQiAnKr55g+KYIBJunwxF3trRFYzb2mt8u3tS18emyqTOEv17IdKDS578PPw7rGiCJ9i4c8JH4ZbolM8clMMEL55ZETgo0CvwYBst22wxQcrNs/Upsv5+3MflON3XxdvsUyk+0+okC7xn76F6hzrd0WqtUkxFzkc+I+dVukL+rCewVxuC5cVJpOD4b3cydzcykLSMK+45PDUgTWqikCdwRM1VSOhGw/9PJndQ6e4EbTeGOqQaBTQH/1/xqMqxhlV3JgWSGl1i59mMCaZ6ZdpTZl7lXvwvWdLc2Zb6yP7XoZq+xi3MRnfRguzYl7D2dL+N9E7Vd0Rls41Y6PfS1crCOd8e3qyTXqMS6kBGdg4UkINO+KEvleTseiWqO9NHfUHSqJr7UFC8DgiRLWcwVRQ8PLd39/Dxg5WP89t5TaCuQCFw065cSMeQ9xcvfDew6PwP1mHdWeLpww8KsKYm/n9aFLNIzyH3ez1eXrkmYaeKtYwOncYwziGYTJJcktDmfgdCX2If8j8yY3BFuCCfcEn7aIDLeJtNjNuqXyhrnlrBAkx5OPzouOqXf766/UMlJAe36ky5KVLNSlRD6jU/o6nxKnpibdRTfXhl+x/Eg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4291af7-d173-443a-abec-08dbd698f39c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:01:01.6255 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UbnEQ9UEBbRZw9WKA9NuovoR93jWKl/8NlbEbfmjc0q4LH2teZdSlnOw2JeUK04BnstmrJSODlYcWD9vVQr/sufy8RclKpGSmO4PX+/W+0s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 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 Add the basic framework of vDPA PMD. Signed-off-by: Chaoyong He Signed-off-by: Shujing Dong Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/common/nfp/nfp_common_pci.c | 1 + drivers/common/nfp/nfp_common_pci.h | 1 + drivers/vdpa/nfp/meson.build | 3 +- drivers/vdpa/nfp/nfp_vdpa.c | 153 ++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 drivers/vdpa/nfp/nfp_vdpa.c diff --git a/drivers/common/nfp/nfp_common_pci.c b/drivers/common/nfp/nfp_common_pci.c index 65f189b05e..723035d0f7 100644 --- a/drivers/common/nfp/nfp_common_pci.c +++ b/drivers/common/nfp/nfp_common_pci.c @@ -32,6 +32,7 @@ static const struct { enum nfp_class drv_class; } nfp_classes[] = { { .name = "eth", .drv_class = NFP_CLASS_ETH }, + { .name = "vdpa", .drv_class = NFP_CLASS_VDPA }, }; static enum nfp_class diff --git a/drivers/common/nfp/nfp_common_pci.h b/drivers/common/nfp/nfp_common_pci.h index 21465fca68..80c027c3a5 100644 --- a/drivers/common/nfp/nfp_common_pci.h +++ b/drivers/common/nfp/nfp_common_pci.h @@ -16,6 +16,7 @@ typedef int (nfp_class_driver_remove_t)(struct rte_pci_device *dev); enum nfp_class { NFP_CLASS_ETH, + NFP_CLASS_VDPA, NFP_CLASS_INVALID, }; diff --git a/drivers/vdpa/nfp/meson.build b/drivers/vdpa/nfp/meson.build index 5eff240055..79a0364917 100644 --- a/drivers/vdpa/nfp/meson.build +++ b/drivers/vdpa/nfp/meson.build @@ -7,7 +7,8 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') endif sources = files( + 'nfp_vdpa.c', 'nfp_vdpa_log.c', ) -deps += ['vhost'] +deps += ['vhost', 'common_nfp'] diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c new file mode 100644 index 0000000000..ef4ae4946a --- /dev/null +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -0,0 +1,153 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2023 Corigine, Inc. + * All rights reserved. + */ + +#include + +#include +#include +#include + +#include "nfp_vdpa_log.h" + +#define NFP_VDPA_DRIVER_NAME nfp_vdpa + +struct nfp_vdpa_dev { + struct rte_pci_device *pci_dev; + struct rte_vdpa_device *vdev; +}; + +struct nfp_vdpa_dev_node { + TAILQ_ENTRY(nfp_vdpa_dev_node) next; + struct nfp_vdpa_dev *device; +}; + +TAILQ_HEAD(vdpa_dev_list_head, nfp_vdpa_dev_node); + +static struct vdpa_dev_list_head vdpa_dev_list = + TAILQ_HEAD_INITIALIZER(vdpa_dev_list); + +static pthread_mutex_t vdpa_list_lock = PTHREAD_MUTEX_INITIALIZER; + +static struct nfp_vdpa_dev_node * +nfp_vdpa_find_node_by_pdev(struct rte_pci_device *pdev) +{ + bool found = false; + struct nfp_vdpa_dev_node *node; + + pthread_mutex_lock(&vdpa_list_lock); + + TAILQ_FOREACH(node, &vdpa_dev_list, next) { + if (pdev == node->device->pci_dev) { + found = true; + break; + } + } + + pthread_mutex_unlock(&vdpa_list_lock); + + if (found) + return node; + + return NULL; +} + +struct rte_vdpa_dev_ops nfp_vdpa_ops = { +}; + +static int +nfp_vdpa_pci_probe(struct rte_pci_device *pci_dev) +{ + struct nfp_vdpa_dev *device; + struct nfp_vdpa_dev_node *node; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + node = calloc(1, sizeof(*node)); + if (node == NULL) + return -ENOMEM; + + device = calloc(1, sizeof(*device)); + if (device == NULL) + goto free_node; + + device->pci_dev = pci_dev; + + device->vdev = rte_vdpa_register_device(&pci_dev->device, &nfp_vdpa_ops); + if (device->vdev == NULL) { + DRV_VDPA_LOG(ERR, "Failed to register device %s", pci_dev->name); + goto free_device; + } + + node->device = device; + pthread_mutex_lock(&vdpa_list_lock); + TAILQ_INSERT_TAIL(&vdpa_dev_list, node, next); + pthread_mutex_unlock(&vdpa_list_lock); + + return 0; + +free_device: + free(device); +free_node: + free(node); + + return -1; +} + +static int +nfp_vdpa_pci_remove(struct rte_pci_device *pci_dev) +{ + struct nfp_vdpa_dev *device; + struct nfp_vdpa_dev_node *node; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + node = nfp_vdpa_find_node_by_pdev(pci_dev); + if (node == NULL) { + DRV_VDPA_LOG(ERR, "Invalid device: %s", pci_dev->name); + return -ENODEV; + } + + device = node->device; + + pthread_mutex_lock(&vdpa_list_lock); + TAILQ_REMOVE(&vdpa_dev_list, node, next); + pthread_mutex_unlock(&vdpa_list_lock); + + rte_vdpa_unregister_device(device->vdev); + + free(device); + free(node); + + return 0; +} + +static const struct rte_pci_id pci_id_nfp_vdpa_map[] = { + { + RTE_PCI_DEVICE(PCI_VENDOR_ID_NETRONOME, + PCI_DEVICE_ID_NFP6000_VF_NIC) + }, + { + .vendor_id = 0, + }, +}; + +static struct nfp_class_driver nfp_vdpa = { + .drv_class = NFP_CLASS_VDPA, + .name = RTE_STR(NFP_VDPA_DRIVER_NAME), + .id_table = pci_id_nfp_vdpa_map, + .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC, + .probe = nfp_vdpa_pci_probe, + .remove = nfp_vdpa_pci_remove, +}; + +RTE_INIT(nfp_vdpa_init) +{ + nfp_class_driver_register(&nfp_vdpa); +} + +RTE_PMD_REGISTER_PCI_TABLE(NFP_VDPA_DRIVER_NAME, pci_id_nfp_vdpa_map); +RTE_PMD_REGISTER_KMOD_DEP(NFP_VDPA_DRIVER_NAME, "* vfio-pci");