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 67A0743186; Tue, 17 Oct 2023 07:48:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B064642D66; Tue, 17 Oct 2023 07:47:12 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2110.outbound.protection.outlook.com [40.107.244.110]) by mails.dpdk.org (Postfix) with ESMTP id F1F6342D66 for ; Tue, 17 Oct 2023 07:47:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HnM+m6Ft6i3gpnyP39xziplIDc+P2vbxYlZ117JZET0M86o6RYjAQb3rqdffCFSfisIUNS9EYlZ3Wz64b/iBlqPJIA/YNgVP4zmh9Q3Eo8JtbP7MHzL0PQVfI5gxtx30+3tUyZBMhW0tNDP0Ykb0yrMf6P0GGngFe3lss8qb/5j8nj6T7V5LRzKKxx21G/FiOrRmbaE/qCdbVGsm/9PwHUTKotTU2udkEvYTI4AaoimDrXAjBex3X2FUNW7vqtu5USlQW3eM5eZ/qlqd5vTxPm1MJaMyVL/JosgOIgMTIL6AVA5t9Et8dGTwwBl0x22fvD8n2FPeJUwWNj+eXHqDTA== 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=7o2cFy4rIypdWxZm+ueiKs8obohKXirAMUwS2FczWOg=; b=UUP4ftQTCzNfU6pbvaVzF5ZV53dQTBQwkiycJraAK7PFTLVGX9BAxZNYZjNE/6X0oZb0803etwHU34zFZuQk7fJNKXRKdpQ2cPb/DpAJGbbMVMlWG2kmFVTIJ2r6qTO15Tdw7t1NVHYdLsrUcCxUvg6GGPFvSUUIEBk71RhHCO0T/i5SU5bPMblXE9hE/TORDFOzlSBmlgQgZk2HaPqOCw0TYJZZGpMdx19vGJQd6TUTud1wGU/ZzUQCy+L3or0Vpa+Veuu+aJFtaIoxM6Q1GrSj2WpPdn3iC5qW+jHFTiJDB/pfnvOkgdiPgvbFeQLHdh9a7zF3RWZ+5k5fvtbZjQ== 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=7o2cFy4rIypdWxZm+ueiKs8obohKXirAMUwS2FczWOg=; b=pLXfTJRkLUvLXWoy/FvavWshNRQiyVHK4ZOb1zKVIbVTqxmXnjNwRcCe5YlcwadaucBiIP7BjF1iXQVvTAXaSHl1boIHtgRR4EjgQ2WPLx5z1YP8XRot4okELRzCiNYAsRljs5JuWnQ1jNDC2gZKWVbR85gPiD9Sf14y9+axAmk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct 2023 05:47:10 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023 05:47:10 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH 19/25] drivers: add the basic framework of vDPA PMD Date: Tue, 17 Oct 2023 13:45:39 +0800 Message-Id: <20231017054545.1692509-20-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231017054545.1692509-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: PH7PR17CA0069.namprd17.prod.outlook.com (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|MW5PR13MB5904:EE_ X-MS-Office365-Filtering-Correlation-Id: 178b38e6-c453-4aa4-9dbd-08dbced480f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bKihugK0LkbDXvNX1b+l7iQIOls/YYMnfcaf8NZGiNVZR0ILWfL7leo+jR/kEDuLesyjnW+L8yP5bYXiNeiVaX5c8tsAD4YCPtStPTAlF83xzpyPXfG3xMPijoFSlPImVR3KnU6D6e6C/l+nwLCoDWLukP4fNRxuTepLrb2kB21Tjv+uFay/IHcFYx+d/JWksscnF3TZ76oaG4AX1UVglDlCld9YbhxGwmT2KJhurnIj47qOxNi7t+HnTeEIY4yJntmUrl/pqqRBTjm+ny06CyxelaKsqex2+Qa6UuyB87Blfkv9bYDxRT4IrAEN3ynZvQoLpjGtlmdSwQAkfc+2I0yP3a4x2lTE8wPvVuiBFb0ijC247o2JnbQXVeJMXIbf/P+dUJg+pVrqAQ341M6WHUCxUZoTXCGeU0+xp0FoGaG2QeUUm4i0jS3ydxxifu1YDRaqNoK5vff9g40cjIy7ZROX0Jnh/PIMXQfdfILOF3wO2OwWF/Jq5BpYlsfOqLCZC3IM9ms4D5mWWJyfXnSIp5cJQuOXzrVAUAPOj/51/6krDAiTBCP52p/r8QmY4Vn0TfaTsOmhvOjBhZm/oMj8ucTqFFvwkv7i0bCoLG4VOSKC9VMhU1q11Nfe5nHWup46watfUAHTCNBM9ti5+Yu9yEJ2bbsGTrdVM18x4X1qgsE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(366004)(376002)(39830400003)(346002)(396003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(5660300002)(8936002)(8676002)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6666004)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?t1500Jhy2E25ApBd4NDbFZ3nhQiELkUWYpx3NkKril6ahLdJwwsmEe/M52/2?= =?us-ascii?Q?lvWvjJaIRfieSgxtFEHcizd5yduyzyEAuWqL/2gG46j+rEdxlI5HqsKLRrx4?= =?us-ascii?Q?HC3vVNrw2TN0fpfL4NJ73kyVwxkyd86ylDA+n6fHGImm+VhOug7GUbM7MbWy?= =?us-ascii?Q?vqT1DEjGTqBVHplEeL3WtT0D7mkbr3WoZgmh0118XUa9psToTrr6gzYFMaAl?= =?us-ascii?Q?o1CLGJDs6wYO2syipatv/se88EKI9fWhOB0X4jkoHVXmCBT3401VpNQysfH3?= =?us-ascii?Q?uFaZzQ1KTzNAhlpDAA9uqhkKfOoRL4+VKfOeg91UC9Mwj41lr2E3BagjFmnw?= =?us-ascii?Q?ikS5IkF1Hrq834TXKeSYujUuX8y/nnAIVs0TmcX30dGWV2ZnOPPGuFm0tT2R?= =?us-ascii?Q?DaL9H78jDA56EurXAZsHRjA8jfUaQEJD2JOuSXnwQ577nYFU838dWoS6ZBKK?= =?us-ascii?Q?BPODCBnv6PoKpODrKLXIwc3r9H/QueQPVzJZIgaj+sCuzhsWytGzEl7ajSwd?= =?us-ascii?Q?K7h04JSoM/gj8wBYz61tYIPWJLGjV0MT9BMd/ZPVRleJxGEF4LYNY+oOG4+E?= =?us-ascii?Q?UcwsboNTLK2PcxeHFFy8JaE3DMfE1ZJ8SgloWveTEldoHlh4uXh84UXjv7GW?= =?us-ascii?Q?pOgzomK1Jjwfm85iWjriDBOCgauGMGuA2w65H161cvlY7AorT9vpLkyi4n7r?= =?us-ascii?Q?zfE5vd5S2kQUTkDM3mmtiZbmTjnBHpDP1qZf8eGNjyEk0Ywk3bEFHLumc743?= =?us-ascii?Q?cPMg/rOrgGZEK7fDRjbDMoVEYae6jHH2Xi6jPiRfnQzhmzQDHmc1Vss8gGyc?= =?us-ascii?Q?Cpc+7SihSe1/CYYJh5B4DKUZTG096eWfr4Hn+QsjQUKR7VGx276S/e68WC7c?= =?us-ascii?Q?KaRwbK4Ft65QNiUSn9DsvYcG+m2EWavVG52MdFz0iNa3q3I6dh1SjVtDnQCS?= =?us-ascii?Q?3FqgIzivZ7sh3fahTaDE1ANjF5JK76ILT32EkdeUD8FlXosgstqtHPLcQSjo?= =?us-ascii?Q?2dGMTQ8Nw6MIOZiB5k6SXK6bIBwpPUaKzUzemhHtefpQbb5u3hB5PQSBXZBn?= =?us-ascii?Q?5g+Jsrp8GnKMsboy/iwx0xJjL5zMIDCM4fizBN83ydQFabW2HL28kwBDaL+8?= =?us-ascii?Q?ECIZFA8G082IWVl4fkjNvNoHGOlpGIVpNH+2sxHqRvcbsnwFVHHcskQcDUfi?= =?us-ascii?Q?m7f1nzvgEcpbNnJuXAIZyvBVeGZTznc1cELKb7iioDODyH3o8t92MyeAzv4E?= =?us-ascii?Q?7XXbCjgEq14vlm2Rs/Quz58GBKCYTR69DKAFagg85gMEoRZKhPF/Mz0yZNDl?= =?us-ascii?Q?X0wOT7gd1S3TeGDGCQppYvSvwSqFq5JqLn2laAoMw8ibQSG5RdK7RY6GFjW0?= =?us-ascii?Q?+lZymeJtICHBgnneCsYZeNBQoeS0GhWEuxfMmNw4pr0SUNx1iQQulfztfvSU?= =?us-ascii?Q?B5DDNTzOzoYSmnUg86JcpHZrO+EggMuvvial8qQuyaPX7vQP/oa83ZSwW2eX?= =?us-ascii?Q?7f5dKVh5sREwnOx5c11C77UA6J3MpKFJvdnoMQ2yByHwz65wXA59gSNWeBJE?= =?us-ascii?Q?6SzuvIIAqxs6Ab06aJKl7MzZnE4KD9iCH8cQ0tmACr6beTai1ccbAyUUCQDn?= =?us-ascii?Q?TQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 178b38e6-c453-4aa4-9dbd-08dbced480f2 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 05:47:10.2061 (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: VLBgGZasrAGSLEjI1BByu9zcvl0Dp5NmBdX9mEBAdtQMRitijSfhy8WbYf95xoEDDNcrsaSk2cYD33vJQsuBBz0UrtgISUeLAF6nLPzB7R4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5904 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 | 7 ++ drivers/vdpa/nfp/nfp_vdpa.c | 153 ++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+) 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 1aa8dd4bbd..c73f4888a9 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 b17866e157..e1cc244578 100644 --- a/drivers/vdpa/nfp/meson.build +++ b/drivers/vdpa/nfp/meson.build @@ -12,5 +12,12 @@ if not dpdk_conf.has('RTE_LIB_VHOST') endif sources = files( + 'nfp_vdpa.c', 'nfp_vdpa_log.c', ) + +deps += ['common_nfp'] + +if not dpdk_conf.has('RTE_COMMON_NFP') + error('Missing internal dependency "common/nfp"') +endif 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"); -- 2.39.1