Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/125852/?format=api
{ "id": 125852, "url": "http://patches.dpdk.org/api/patches/125852/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230407060152.16335-4-nipun.gupta@amd.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230407060152.16335-4-nipun.gupta@amd.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230407060152.16335-4-nipun.gupta@amd.com", "date": "2023-04-07T06:01:49", "name": "[3/6] bus/cdx: add support for MSI", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e3726db9a7bb7849666812d93f62e92ac3229bec", "submitter": { "id": 2928, "url": "http://patches.dpdk.org/api/people/2928/?format=api", "name": "Gupta, Nipun", "email": "nipun.gupta@amd.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230407060152.16335-4-nipun.gupta@amd.com/mbox/", "series": [ { "id": 27640, "url": "http://patches.dpdk.org/api/series/27640/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=27640", "date": "2023-04-07T06:01:46", "name": "add support for CDX bus", "version": 1, "mbox": "http://patches.dpdk.org/series/27640/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/125852/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/125852/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 731FB428E2;\n\tFri, 7 Apr 2023 08:03:15 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 66BF440EDE;\n\tFri, 7 Apr 2023 08:03:15 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2067.outbound.protection.outlook.com [40.107.244.67])\n by mails.dpdk.org (Postfix) with ESMTP id F1BD740EDE\n for <dev@dpdk.org>; Fri, 7 Apr 2023 08:03:13 +0200 (CEST)", "from MW4PR03CA0343.namprd03.prod.outlook.com (2603:10b6:303:dc::18)\n by MW3PR12MB4569.namprd12.prod.outlook.com (2603:10b6:303:57::11)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Fri, 7 Apr\n 2023 06:03:11 +0000", "from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com\n (2603:10b6:303:dc:cafe::23) by MW4PR03CA0343.outlook.office365.com\n (2603:10b6:303:dc::18) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.22 via Frontend\n Transport; Fri, 7 Apr 2023 06:03:11 +0000", "from SATLEXMB03.amd.com (165.204.84.17) by\n CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.20.6277.31 via Frontend Transport; Fri, 7 Apr 2023 06:03:10 +0000", "from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com\n (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 7 Apr\n 2023 01:02:35 -0500", "from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com\n (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 7 Apr\n 2023 01:02:34 -0500", "from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com\n (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via\n Frontend Transport; Fri, 7 Apr 2023 01:02:32 -0500" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=FXGQrgU2Awwv3tECUs6sz5DtrNnJK0gcyHgl76bNH6RAiUEoe3xWuUT2/PgGAmodSDWllYvVvJ+KYy9s7253uJZWGOK2g2/9d72Rvt/Om8V2dpk3zqiAEZ0bAuAernMVeobHg1IFsog5pN2HVumn1uyTFmxNlGvDbCvPtIEAIZ1axb6ZsHkB10JEsUf3Ht8P2lMKizwBV9N0WPURLGLqn1TV0tnfMI25iTae+quUCjj6AheVw6WE/ioUwSTeiOODwi90P1/7yhsIsHfbCYRUOlzmY6tmTNl1Jhoz95NTnSNf6Icezhubc79Jn912SlDBWZTX2Z2nrmF31gsLVeYqyA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=wdx7F7xP1soEiOHJBEIWbyojy1dCDg4wQnYekUlthNo=;\n b=barXpP/kPGEFrdCuocRZm7blIcgBr6pOaa2oxiY4u/Qv7i1ov6yuPUBS2wONld8jHmbPkXCq9Gsc2v4ry7PwngXOjAnW7dRYMWcnTWf2O21Yjq5UCbTx1Co6bHj42XrK3mum36aNweXaXxA4KWQByuZ23VtRke0tT9YSeiT44lruZ/Fa6m9FCADXxIAtekCVkJ2IBm4b+nf7oigCISHuGgwOkoXHtiMIOTT7BlsArd00Klklbb+59QHjPgKt6dIj55tKdzCWTG0XfFbV0CJRabKXrWYn2UJshG27htT8GypqLAEbnG/HyhwRRLm/2ffD1lF9jC1Q11tT2cBEJ8Ukig==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass\n (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=wdx7F7xP1soEiOHJBEIWbyojy1dCDg4wQnYekUlthNo=;\n b=O3tdv28KQWK0pm5aLDPQ2Ii470RPs7EsTiYRNLrEwmA3OG6piCFFn9cwGNizb97OWAYfc+cPHoHL4NplpvDRFz4904H08Pku1twpVxU7fqQGOyTSS3uXUD/MeL9QBmgc0J7S+cn5ZW4mJctjTn2ozetTfDtGe9CKqTG0O656JMQ=", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 165.204.84.17)\n smtp.mailfrom=amd.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=amd.com;", "Received-SPF": "Pass (protection.outlook.com: domain of amd.com designates\n 165.204.84.17 as permitted sender) receiver=protection.outlook.com;\n client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C", "From": "Nipun Gupta <nipun.gupta@amd.com>", "To": "<dev@dpdk.org>, <thomas@monjalon.net>, <david.marchand@redhat.com>", "CC": "<ferruh.yigit@amd.com>, <harpreet.anand@amd.com>,\n <nikhil.agarwal@amd.com>, Nipun Gupta <nipun.gupta@amd.com>", "Subject": "[PATCH 3/6] bus/cdx: add support for MSI", "Date": "Fri, 7 Apr 2023 11:31:49 +0530", "Message-ID": "<20230407060152.16335-4-nipun.gupta@amd.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20230407060152.16335-1-nipun.gupta@amd.com>", "References": "<20230124140746.594066-1-nipun.gupta@amd.com>\n <20230407060152.16335-1-nipun.gupta@amd.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "CO1NAM11FT044:EE_|MW3PR12MB4569:EE_", "X-MS-Office365-Filtering-Correlation-Id": "fabaf5ba-4102-4930-4a15-08db372dc456", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n nTMKM1a2zahkFxs3HwjBIb1vTO7JnphZ6qv6z2HOpZ/O2i9Ar3LCZOBE7eXDtX+EZSnac6j7A1lSKXMvMjyv3vfHoQURI6VbWE1+OyYrSr5vdCnsL7z3uIRYeQPdXTuirei/p765OCMHK0eKxZJaqCA2f3ZaYkLtJAvLucqr1ayM9fZ6XfXk9JZgxVxd7kmsSVgCAYWeLqNDz24xbcKaOXoX7TB9J10zZbxb8XzXYakUHHuq2p5T4wy0Gw0DZZTRapC4yh6BUu7e37syIyPvjTFDT0yLhBlna/2L4I4NFq2EG5l/c+hBhgSdtpCHPCSOg0dC3CHEGEuG/F1mNvERTsEs/uo6XSPg2umPoJ/o9E82y5Cp6VF/aQ8Xp6LnD+NGnf2S/2JjZSq5MJy2EmpQr7CnzYuYMXcb86e53mWxey1r9Skaf6rlvHwC8qm8fPvodskvNgzc7gz3C27z9667Afd5GvGr8ZQD15ppQTeYmXWPhStmjiYXSJFpJX20NAEd/oBAlSNr8Y6w0SqFXii6B0PoU1bwOUuSuoZQ41zMeuNTeTMUAgoFNwqvroB3lT1EgDGQJOZ/ooS+HAxGwyagooFbFvOfnhCZPvuXl72m5lHFCzy4+G9b/gs9EaE7GF46J7a/wcYZ4hFcNeywU2Y7D3Pod1ayNTkTO3dA6/aTAPaanDr05DOm1BylPG5wr6Nuc0Ta2nWvWWNnS/JlSjKmwcvKW30k1FNkus5wrLHwI0w=", "X-Forefront-Antispam-Report": "CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:;\n IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE;\n SFS:(13230028)(4636009)(136003)(396003)(346002)(39860400002)(376002)(451199021)(46966006)(36840700001)(40470700004)(36860700001)(54906003)(110136005)(82740400003)(356005)(81166007)(82310400005)(426003)(336012)(2616005)(47076005)(316002)(83380400001)(478600001)(186003)(86362001)(4326008)(8676002)(26005)(2906002)(70206006)(70586007)(1076003)(6666004)(44832011)(36756003)(30864003)(5660300002)(40460700003)(40480700001)(8936002)(41300700001)(36900700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "amd.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "07 Apr 2023 06:03:10.8540 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n fabaf5ba-4102-4930-4a15-08db372dc456", "X-MS-Exchange-CrossTenant-Id": "3dd8961f-e488-4e60-8e11-a82d994e183d", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17];\n Helo=[SATLEXMB03.amd.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n CO1NAM11FT044.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW3PR12MB4569", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "MSI's are exposed to the devices using VFIO (vfio-cdx). This\npatch uses the same to add support for MSI for the devices on\nthe cdx bus.\n\nSigned-off-by: Nipun Gupta <nipun.gupta@amd.com>\n---\n drivers/bus/cdx/cdx.c | 11 ++\n drivers/bus/cdx/cdx_vfio.c | 182 ++++++++++++++++++++++++-\n drivers/bus/cdx/rte_bus_cdx.h | 25 ++++\n drivers/bus/cdx/version.map | 2 +\n lib/eal/common/eal_common_interrupts.c | 21 +++\n lib/eal/common/eal_interrupts.h | 1 +\n lib/eal/include/rte_interrupts.h | 32 +++++\n lib/eal/version.map | 2 +\n 8 files changed, 274 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c\nindex fa6bfe3bc2..9732a32eb1 100644\n--- a/drivers/bus/cdx/cdx.c\n+++ b/drivers/bus/cdx/cdx.c\n@@ -225,6 +225,15 @@ cdx_scan_one(const char *dirname, const char *dev_name)\n \t\tgoto err;\n \t}\n \n+\t/* Allocate interrupt instance for cdx device */\n+\tdev->intr_handle =\n+\t\trte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE);\n+\tif (dev->intr_handle == NULL) {\n+\t\tCDX_BUS_ERR(\"Failed to create interrupt instance for %s\\n\",\n+\t\t\tdev->device.name);\n+\t\treturn -ENOMEM;\n+\t}\n+\n \t/*\n \t * Check if device is bound to 'vfio-cdx' driver, so that user-space\n \t * can gracefully access the device.\n@@ -416,6 +425,8 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr,\n \treturn ret;\n \n error_probe:\n+\trte_intr_instance_free(dev->intr_handle);\n+\tdev->intr_handle = NULL;\n \tcdx_vfio_unmap_resource(dev);\n error_map_device:\n \treturn ret;\ndiff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c\nindex a53137c416..93c2ad0221 100644\n--- a/drivers/bus/cdx/cdx_vfio.c\n+++ b/drivers/bus/cdx/cdx_vfio.c\n@@ -60,6 +60,10 @@ struct mapped_cdx_resource {\n /** mapped cdx device list */\n TAILQ_HEAD(mapped_cdx_res_list, mapped_cdx_resource);\n \n+/* irq set buffer length for MSI interrupts */\n+#define MSI_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \\\n+\t\t\t sizeof(int) * (RTE_MAX_RXTX_INTR_VEC_ID + 1))\n+\n static struct rte_tailq_elem cdx_vfio_tailq = {\n \t.name = \"VFIO_CDX_RESOURCE_LIST\",\n };\n@@ -108,6 +112,27 @@ cdx_vfio_unmap_resource_primary(struct rte_cdx_device *dev)\n \tchar cdx_addr[PATH_MAX] = {0};\n \tstruct mapped_cdx_resource *vfio_res = NULL;\n \tstruct mapped_cdx_res_list *vfio_res_list;\n+\tint ret, vfio_dev_fd;\n+\n+\tif (rte_intr_fd_get(dev->intr_handle) < 0)\n+\t\treturn -1;\n+\n+\tif (close(rte_intr_fd_get(dev->intr_handle)) < 0) {\n+\t\tCDX_BUS_ERR(\"Error when closing eventfd file descriptor for %s\",\n+\t\t\tdev->device.name);\n+\t\treturn -1;\n+\t}\n+\n+\tvfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);\n+\tif (vfio_dev_fd < 0)\n+\t\treturn -1;\n+\n+\tret = rte_vfio_release_device(rte_cdx_get_sysfs_path(), dev->device.name,\n+\t\t\t\t vfio_dev_fd);\n+\tif (ret < 0) {\n+\t\tCDX_BUS_ERR(\"Cannot release VFIO device\");\n+\t\treturn ret;\n+\t}\n \n \tvfio_res_list =\n \t\tRTE_TAILQ_CAST(cdx_vfio_tailq.head, mapped_cdx_res_list);\n@@ -130,6 +155,18 @@ cdx_vfio_unmap_resource_secondary(struct rte_cdx_device *dev)\n {\n \tstruct mapped_cdx_resource *vfio_res = NULL;\n \tstruct mapped_cdx_res_list *vfio_res_list;\n+\tint ret, vfio_dev_fd;\n+\n+\tvfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);\n+\tif (vfio_dev_fd < 0)\n+\t\treturn -1;\n+\n+\tret = rte_vfio_release_device(rte_cdx_get_sysfs_path(), dev->device.name,\n+\t\t\t\t vfio_dev_fd);\n+\tif (ret < 0) {\n+\t\tCDX_BUS_ERR(\"Cannot release VFIO device\");\n+\t\treturn ret;\n+\t}\n \n \tvfio_res_list =\n \t\tRTE_TAILQ_CAST(cdx_vfio_tailq.head, mapped_cdx_res_list);\n@@ -154,9 +191,80 @@ cdx_vfio_unmap_resource(struct rte_cdx_device *dev)\n \t\treturn cdx_vfio_unmap_resource_secondary(dev);\n }\n \n+/* set up interrupt support (but not enable interrupts) */\n static int\n-cdx_rte_vfio_setup_device(int vfio_dev_fd)\n+cdx_vfio_setup_interrupts(struct rte_cdx_device *dev, int vfio_dev_fd,\n+\t\tint num_irqs)\n {\n+\tint i, ret;\n+\n+\tif (num_irqs == 0)\n+\t\treturn 0;\n+\n+\t/* start from MSI interrupt type */\n+\tfor (i = 0; i < num_irqs; i++) {\n+\t\tstruct vfio_irq_info irq = { .argsz = sizeof(irq) };\n+\t\tint fd = -1;\n+\n+\t\tirq.index = i;\n+\n+\t\tret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);\n+\t\tif (ret < 0) {\n+\t\t\tCDX_BUS_ERR(\"Cannot get VFIO IRQ info, error %i (%s)\",\n+\t\t\t\terrno, strerror(errno));\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\t/* if this vector cannot be used with eventfd, fail if we explicitly\n+\t\t * specified interrupt type, otherwise continue\n+\t\t */\n+\t\tif ((irq.flags & VFIO_IRQ_INFO_EVENTFD) == 0)\n+\t\t\tcontinue;\n+\n+\t\tif (rte_intr_irq_count_set(dev->intr_handle, irq.count))\n+\t\t\treturn -1;\n+\n+\t\t/* Reallocate the efds and elist fields of intr_handle based\n+\t\t * on CDX device MSI size.\n+\t\t */\n+\t\tif ((uint32_t)rte_intr_nb_intr_get(dev->intr_handle) < irq.count &&\n+\t\t\t\trte_intr_event_list_update(dev->intr_handle, irq.count))\n+\t\t\treturn -1;\n+\n+\t\t/* set up an eventfd for interrupts */\n+\t\tfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);\n+\t\tif (fd < 0) {\n+\t\t\tCDX_BUS_ERR(\"Cannot set up eventfd, error %i (%s)\",\n+\t\t\t\terrno, strerror(errno));\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tif (rte_intr_fd_set(dev->intr_handle, fd))\n+\t\t\treturn -1;\n+\n+\t\t/* DPDK CDX bus currently supports only MSI-X */\n+\t\tif (rte_intr_type_set(dev->intr_handle, RTE_INTR_HANDLE_VFIO_MSIX))\n+\t\t\treturn -1;\n+\n+\t\tif (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))\n+\t\t\treturn -1;\n+\n+\t\treturn 0;\n+\t}\n+\n+\t/* if we're here, we haven't found a suitable interrupt vector */\n+\treturn -1;\n+}\n+\n+static int\n+cdx_rte_vfio_setup_device(struct rte_cdx_device *dev, int vfio_dev_fd,\n+\t\tint num_irqs)\n+{\n+\tif (cdx_vfio_setup_interrupts(dev, vfio_dev_fd, num_irqs) != 0) {\n+\t\tCDX_BUS_ERR(\"Error setting up interrupts!\");\n+\t\treturn -1;\n+\t}\n+\n \t/*\n \t * Reset the device. If the device is not capable of resetting,\n \t * then it updates errno as EINVAL.\n@@ -271,6 +379,9 @@ cdx_vfio_map_resource_primary(struct rte_cdx_device *dev)\n \tstruct cdx_map *maps;\n \tint vfio_dev_fd, i, ret;\n \n+\tif (rte_intr_fd_set(dev->intr_handle, -1))\n+\t\treturn -1;\n+\n \tret = rte_vfio_setup_device(rte_cdx_get_sysfs_path(), dev_name,\n \t\t\t\t &vfio_dev_fd, &device_info);\n \tif (ret)\n@@ -336,7 +447,7 @@ cdx_vfio_map_resource_primary(struct rte_cdx_device *dev)\n \t\tfree(reg);\n \t}\n \n-\tif (cdx_rte_vfio_setup_device(vfio_dev_fd) < 0) {\n+\tif (cdx_rte_vfio_setup_device(dev, vfio_dev_fd, device_info.num_irqs) < 0) {\n \t\tCDX_BUS_ERR(\"%s setup device failed\", dev_name);\n \t\tgoto err_vfio_res;\n \t}\n@@ -366,6 +477,9 @@ cdx_vfio_map_resource_secondary(struct rte_cdx_device *dev)\n \tconst char *dev_name = dev->device.name;\n \tstruct cdx_map *maps;\n \n+\tif (rte_intr_fd_set(dev->intr_handle, -1))\n+\t\treturn -1;\n+\n \t/* if we're in a secondary process, just find our tailq entry */\n \tTAILQ_FOREACH(vfio_res, vfio_res_list, next) {\n \t\tif (strcmp(vfio_res->name, dev_name))\n@@ -399,6 +513,10 @@ cdx_vfio_map_resource_secondary(struct rte_cdx_device *dev)\n \t\tdev->mem_resource[i].len = maps[i].size;\n \t}\n \n+\t/* we need save vfio_dev_fd, so it can be used during release */\n+\tif (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))\n+\t\tgoto err_vfio_dev_fd;\n+\n \treturn 0;\n err_vfio_dev_fd:\n \trte_vfio_release_device(rte_cdx_get_sysfs_path(),\n@@ -418,3 +536,63 @@ cdx_vfio_map_resource(struct rte_cdx_device *dev)\n \telse\n \t\treturn cdx_vfio_map_resource_secondary(dev);\n }\n+\n+int\n+rte_cdx_vfio_intr_enable(const struct rte_intr_handle *intr_handle)\n+{\n+\tchar irq_set_buf[MSI_IRQ_SET_BUF_LEN];\n+\tstruct vfio_irq_set *irq_set;\n+\tint *fd_ptr, vfio_dev_fd, i;\n+\tint ret;\n+\n+\tirq_set = (struct vfio_irq_set *) irq_set_buf;\n+\tirq_set->count = rte_intr_irq_count_get(intr_handle);\n+\tirq_set->argsz = sizeof(struct vfio_irq_set) +\n+\t\t\t (sizeof(int) * irq_set->count);\n+\n+\tirq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;\n+\tirq_set->index = 0;\n+\tirq_set->start = 0;\n+\tfd_ptr = (int *) &irq_set->data;\n+\n+\tfor (i = 0; i < rte_intr_nb_efd_get(intr_handle); i++)\n+\t\tfd_ptr[i] = rte_intr_efds_index_get(intr_handle, i);\n+\n+\tvfio_dev_fd = rte_intr_dev_fd_get(intr_handle);\n+\tret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n+\n+\tif (ret) {\n+\t\tCDX_BUS_ERR(\"Error enabling MSI interrupts for fd %d\",\n+\t\t\trte_intr_fd_get(intr_handle));\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/* disable MSI interrupts */\n+int\n+rte_cdx_vfio_intr_disable(const struct rte_intr_handle *intr_handle)\n+{\n+\tstruct vfio_irq_set *irq_set;\n+\tchar irq_set_buf[MSI_IRQ_SET_BUF_LEN];\n+\tint len, ret, vfio_dev_fd;\n+\n+\tlen = sizeof(struct vfio_irq_set);\n+\n+\tirq_set = (struct vfio_irq_set *) irq_set_buf;\n+\tirq_set->argsz = len;\n+\tirq_set->count = 0;\n+\tirq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;\n+\tirq_set->index = 0;\n+\tirq_set->start = 0;\n+\n+\tvfio_dev_fd = rte_intr_dev_fd_get(intr_handle);\n+\tret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n+\n+\tif (ret)\n+\t\tCDX_BUS_ERR(\"Error disabling MSI interrupts for fd %d\",\n+\t\t\trte_intr_fd_get(intr_handle));\n+\n+\treturn ret;\n+}\ndiff --git a/drivers/bus/cdx/rte_bus_cdx.h b/drivers/bus/cdx/rte_bus_cdx.h\nindex 2ebe2a0dcc..a6170347dd 100644\n--- a/drivers/bus/cdx/rte_bus_cdx.h\n+++ b/drivers/bus/cdx/rte_bus_cdx.h\n@@ -81,6 +81,7 @@ struct rte_cdx_device {\n \tstruct rte_cdx_id id;\t\t\t/**< CDX ID. */\n \tstruct rte_mem_resource mem_resource[CDX_MAX_RESOURCE];\n \t\t\t\t\t\t/**< CDX Memory Resource */\n+\tstruct rte_intr_handle *intr_handle;\t/**< Interrupt handle */\n };\n \n /**\n@@ -181,6 +182,30 @@ void rte_cdx_unmap_device(struct rte_cdx_device *dev);\n __rte_experimental\n void rte_cdx_dump(FILE *f);\n \n+/**\n+ * Enables VFIO Interrupts for CDX bus devices.\n+ *\n+ * @param intr_handle\n+ * Pointer to the interrupt handle.\n+ *\n+ * @return\n+ * 0 on success, -1 on error.\n+ */\n+__rte_internal\n+int rte_cdx_vfio_intr_enable(const struct rte_intr_handle *intr_handle);\n+\n+/**\n+ * Disable VFIO Interrupts for CDX bus devices.\n+ *\n+ * @param intr_handle\n+ * Pointer to the interrupt handle.\n+ *\n+ * @return\n+ * 0 on success, -1 on error.\n+ */\n+__rte_internal\n+int rte_cdx_vfio_intr_disable(const struct rte_intr_handle *intr_handle);\n+\n /**\n * Register a CDX driver.\n *\ndiff --git a/drivers/bus/cdx/version.map b/drivers/bus/cdx/version.map\nindex 4e8dd24f91..b35bf8481f 100644\n--- a/drivers/bus/cdx/version.map\n+++ b/drivers/bus/cdx/version.map\n@@ -14,6 +14,8 @@ INTERNAL {\n \trte_cdx_register;\n \trte_cdx_unmap_device;\n \trte_cdx_unregister;\n+\trte_cdx_vfio_intr_disable;\n+\trte_cdx_vfio_intr_enable;\n \n \tlocal: *;\n };\ndiff --git a/lib/eal/common/eal_common_interrupts.c b/lib/eal/common/eal_common_interrupts.c\nindex 97b64fed58..a0167d9ad4 100644\n--- a/lib/eal/common/eal_common_interrupts.c\n+++ b/lib/eal/common/eal_common_interrupts.c\n@@ -398,6 +398,27 @@ int rte_intr_elist_index_set(struct rte_intr_handle *intr_handle,\n \treturn -rte_errno;\n }\n \n+int rte_intr_irq_count_set(struct rte_intr_handle *intr_handle,\n+\tint irq_count)\n+{\n+\tCHECK_VALID_INTR_HANDLE(intr_handle);\n+\n+\tintr_handle->irq_count = irq_count;\n+\n+\treturn 0;\n+fail:\n+\treturn -rte_errno;\n+}\n+\n+int rte_intr_irq_count_get(const struct rte_intr_handle *intr_handle)\n+{\n+\tCHECK_VALID_INTR_HANDLE(intr_handle);\n+\n+\treturn intr_handle->irq_count;\n+fail:\n+\treturn -rte_errno;\n+}\n+\n int rte_intr_vec_list_alloc(struct rte_intr_handle *intr_handle,\n \tconst char *name, int size)\n {\ndiff --git a/lib/eal/common/eal_interrupts.h b/lib/eal/common/eal_interrupts.h\nindex 482781b862..237f471a76 100644\n--- a/lib/eal/common/eal_interrupts.h\n+++ b/lib/eal/common/eal_interrupts.h\n@@ -16,6 +16,7 @@ struct rte_intr_handle {\n \t};\n \tuint32_t alloc_flags;\t/**< flags passed at allocation */\n \tenum rte_intr_handle_type type; /**< handle type */\n+\tuint32_t irq_count;\t\t/**< IRQ count provided via VFIO */\n \tuint32_t max_intr; /**< max interrupt requested */\n \tuint32_t nb_efd; /**< number of available efd(event fd) */\n \tuint8_t efd_counter_size; /**< size of efd counter, used for vdev */\ndiff --git a/lib/eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h\nindex 487e3c8875..bc477a483f 100644\n--- a/lib/eal/include/rte_interrupts.h\n+++ b/lib/eal/include/rte_interrupts.h\n@@ -506,6 +506,38 @@ __rte_internal\n int\n rte_intr_max_intr_get(const struct rte_intr_handle *intr_handle);\n \n+/**\n+ * @internal\n+ * Set the irq count field of interrupt handle with user\n+ * provided irq count value.\n+ *\n+ * @param intr_handle\n+ * pointer to the interrupt handle.\n+ * @param irq_count\n+ * IRQ count\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value and rte_errno is set.\n+ */\n+__rte_internal\n+int\n+rte_intr_irq_count_set(struct rte_intr_handle *intr_handle, int irq_count);\n+\n+/**\n+ * @internal\n+ * Returns the irq count field of the given interrupt handle instance.\n+ *\n+ * @param intr_handle\n+ * pointer to the interrupt handle.\n+ *\n+ * @return\n+ * - On success, ir count.\n+ * - On failure, a negative value and rte_errno is set.\n+ */\n+__rte_internal\n+int rte_intr_irq_count_get(const struct rte_intr_handle *intr_handle);\n+\n /**\n * @internal\n * Set the number of event fd field of interrupt handle\ndiff --git a/lib/eal/version.map b/lib/eal/version.map\nindex 6d6978f108..14bf7ade77 100644\n--- a/lib/eal/version.map\n+++ b/lib/eal/version.map\n@@ -458,6 +458,8 @@ INTERNAL {\n \trte_intr_instance_dup;\n \trte_intr_instance_windows_handle_get;\n \trte_intr_instance_windows_handle_set;\n+\trte_intr_irq_count_get;\n+\trte_intr_irq_count_set;\n \trte_intr_max_intr_get;\n \trte_intr_max_intr_set;\n \trte_intr_nb_efd_get;\n", "prefixes": [ "3/6" ] }