From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 731FB428E2;
Fri, 7 Apr 2023 08:03:15 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 66BF440EDE;
Fri, 7 Apr 2023 08:03:15 +0200 (CEST)
Received: from NAM12-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam12on2067.outbound.protection.outlook.com [40.107.244.67])
by mails.dpdk.org (Postfix) with ESMTP id F1BD740EDE
for <dev@dpdk.org>; Fri, 7 Apr 2023 08:03:13 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=FXGQrgU2Awwv3tECUs6sz5DtrNnJK0gcyHgl76bNH6RAiUEoe3xWuUT2/PgGAmodSDWllYvVvJ+KYy9s7253uJZWGOK2g2/9d72Rvt/Om8V2dpk3zqiAEZ0bAuAernMVeobHg1IFsog5pN2HVumn1uyTFmxNlGvDbCvPtIEAIZ1axb6ZsHkB10JEsUf3Ht8P2lMKizwBV9N0WPURLGLqn1TV0tnfMI25iTae+quUCjj6AheVw6WE/ioUwSTeiOODwi90P1/7yhsIsHfbCYRUOlzmY6tmTNl1Jhoz95NTnSNf6Icezhubc79Jn912SlDBWZTX2Z2nrmF31gsLVeYqyA==
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=wdx7F7xP1soEiOHJBEIWbyojy1dCDg4wQnYekUlthNo=;
b=barXpP/kPGEFrdCuocRZm7blIcgBr6pOaa2oxiY4u/Qv7i1ov6yuPUBS2wONld8jHmbPkXCq9Gsc2v4ry7PwngXOjAnW7dRYMWcnTWf2O21Yjq5UCbTx1Co6bHj42XrK3mum36aNweXaXxA4KWQByuZ23VtRke0tT9YSeiT44lruZ/Fa6m9FCADXxIAtekCVkJ2IBm4b+nf7oigCISHuGgwOkoXHtiMIOTT7BlsArd00Klklbb+59QHjPgKt6dIj55tKdzCWTG0XfFbV0CJRabKXrWYn2UJshG27htT8GypqLAEbnG/HyhwRRLm/2ffD1lF9jC1Q11tT2cBEJ8Ukig==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass
(p=quarantine sp=quarantine pct=100) action=none header.from=amd.com;
dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=wdx7F7xP1soEiOHJBEIWbyojy1dCDg4wQnYekUlthNo=;
b=O3tdv28KQWK0pm5aLDPQ2Ii470RPs7EsTiYRNLrEwmA3OG6piCFFn9cwGNizb97OWAYfc+cPHoHL4NplpvDRFz4904H08Pku1twpVxU7fqQGOyTSS3uXUD/MeL9QBmgc0J7S+cn5ZW4mJctjTn2ozetTfDtGe9CKqTG0O656JMQ=
Received: from MW4PR03CA0343.namprd03.prod.outlook.com (2603:10b6:303:dc::18)
by MW3PR12MB4569.namprd12.prod.outlook.com (2603:10b6:303:57::11)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Fri, 7 Apr
2023 06:03:11 +0000
Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com
(2603:10b6:303:dc:cafe::23) by MW4PR03CA0343.outlook.office365.com
(2603:10b6:303:dc::18) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.22 via Frontend
Transport; Fri, 7 Apr 2023 06:03:11 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17)
smtp.mailfrom=amd.com; dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=amd.com;
Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
165.204.84.17 as permitted sender) receiver=protection.outlook.com;
client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C
Received: from SATLEXMB03.amd.com (165.204.84.17) by
CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.20.6277.31 via Frontend Transport; Fri, 7 Apr 2023 06:03:10 +0000
Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com
(10.181.40.144) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 7 Apr
2023 01:02:35 -0500
Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com
(10.181.40.147) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 7 Apr
2023 01:02:34 -0500
Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com
(10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via
Frontend Transport; Fri, 7 Apr 2023 01:02:32 -0500
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>,
<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>
<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: 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:;
IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE;
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);
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: fabaf5ba-4102-4930-4a15-08db372dc456
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17];
Helo=[SATLEXMB03.amd.com]
X-MS-Exchange-CrossTenant-AuthSource: 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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
MSI's are exposed to the devices using VFIO (vfio-cdx). This
patch uses the same to add support for MSI for the devices on
the cdx bus.
Signed-off-by: Nipun Gupta <nipun.gupta@amd.com>
---
drivers/bus/cdx/cdx.c | 11 ++
drivers/bus/cdx/cdx_vfio.c | 182 ++++++++++++++++++++++++-
drivers/bus/cdx/rte_bus_cdx.h | 25 ++++
drivers/bus/cdx/version.map | 2 +
lib/eal/common/eal_common_interrupts.c | 21 +++
lib/eal/common/eal_interrupts.h | 1 +
lib/eal/include/rte_interrupts.h | 32 +++++
lib/eal/version.map | 2 +
8 files changed, 274 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c
index fa6bfe3bc2..9732a32eb1 100644
--- a/drivers/bus/cdx/cdx.c
+++ b/drivers/bus/cdx/cdx.c
@@ -225,6 +225,15 @@ cdx_scan_one(const char *dirname, const char *dev_name)
goto err;
}
+ /* Allocate interrupt instance for cdx device */
+ dev->intr_handle =
+ rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE);
+ if (dev->intr_handle == NULL) {
+ CDX_BUS_ERR("Failed to create interrupt instance for %s\n",
+ dev->device.name);
+ return -ENOMEM;
+ }
+
/*
* Check if device is bound to 'vfio-cdx' driver, so that user-space
* can gracefully access the device.
@@ -416,6 +425,8 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr,
return ret;
error_probe:
+ rte_intr_instance_free(dev->intr_handle);
+ dev->intr_handle = NULL;
cdx_vfio_unmap_resource(dev);
error_map_device:
return ret;
diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c
index a53137c416..93c2ad0221 100644
--- a/drivers/bus/cdx/cdx_vfio.c
+++ b/drivers/bus/cdx/cdx_vfio.c
@@ -60,6 +60,10 @@ struct mapped_cdx_resource {
/** mapped cdx device list */
TAILQ_HEAD(mapped_cdx_res_list, mapped_cdx_resource);
+/* irq set buffer length for MSI interrupts */
+#define MSI_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
+ sizeof(int) * (RTE_MAX_RXTX_INTR_VEC_ID + 1))
+
static struct rte_tailq_elem cdx_vfio_tailq = {
.name = "VFIO_CDX_RESOURCE_LIST",
};
@@ -108,6 +112,27 @@ cdx_vfio_unmap_resource_primary(struct rte_cdx_device *dev)
char cdx_addr[PATH_MAX] = {0};
struct mapped_cdx_resource *vfio_res = NULL;
struct mapped_cdx_res_list *vfio_res_list;
+ int ret, vfio_dev_fd;
+
+ if (rte_intr_fd_get(dev->intr_handle) < 0)
+ return -1;
+
+ if (close(rte_intr_fd_get(dev->intr_handle)) < 0) {
+ CDX_BUS_ERR("Error when closing eventfd file descriptor for %s",
+ dev->device.name);
+ return -1;
+ }
+
+ vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+ if (vfio_dev_fd < 0)
+ return -1;
+
+ ret = rte_vfio_release_device(rte_cdx_get_sysfs_path(), dev->device.name,
+ vfio_dev_fd);
+ if (ret < 0) {
+ CDX_BUS_ERR("Cannot release VFIO device");
+ return ret;
+ }
vfio_res_list =
RTE_TAILQ_CAST(cdx_vfio_tailq.head, mapped_cdx_res_list);
@@ -130,6 +155,18 @@ cdx_vfio_unmap_resource_secondary(struct rte_cdx_device *dev)
{
struct mapped_cdx_resource *vfio_res = NULL;
struct mapped_cdx_res_list *vfio_res_list;
+ int ret, vfio_dev_fd;
+
+ vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+ if (vfio_dev_fd < 0)
+ return -1;
+
+ ret = rte_vfio_release_device(rte_cdx_get_sysfs_path(), dev->device.name,
+ vfio_dev_fd);
+ if (ret < 0) {
+ CDX_BUS_ERR("Cannot release VFIO device");
+ return ret;
+ }
vfio_res_list =
RTE_TAILQ_CAST(cdx_vfio_tailq.head, mapped_cdx_res_list);
@@ -154,9 +191,80 @@ cdx_vfio_unmap_resource(struct rte_cdx_device *dev)
return cdx_vfio_unmap_resource_secondary(dev);
}
+/* set up interrupt support (but not enable interrupts) */
static int
-cdx_rte_vfio_setup_device(int vfio_dev_fd)
+cdx_vfio_setup_interrupts(struct rte_cdx_device *dev, int vfio_dev_fd,
+ int num_irqs)
{
+ int i, ret;
+
+ if (num_irqs == 0)
+ return 0;
+
+ /* start from MSI interrupt type */
+ for (i = 0; i < num_irqs; i++) {
+ struct vfio_irq_info irq = { .argsz = sizeof(irq) };
+ int fd = -1;
+
+ irq.index = i;
+
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);
+ if (ret < 0) {
+ CDX_BUS_ERR("Cannot get VFIO IRQ info, error %i (%s)",
+ errno, strerror(errno));
+ return -1;
+ }
+
+ /* if this vector cannot be used with eventfd, fail if we explicitly
+ * specified interrupt type, otherwise continue
+ */
+ if ((irq.flags & VFIO_IRQ_INFO_EVENTFD) == 0)
+ continue;
+
+ if (rte_intr_irq_count_set(dev->intr_handle, irq.count))
+ return -1;
+
+ /* Reallocate the efds and elist fields of intr_handle based
+ * on CDX device MSI size.
+ */
+ if ((uint32_t)rte_intr_nb_intr_get(dev->intr_handle) < irq.count &&
+ rte_intr_event_list_update(dev->intr_handle, irq.count))
+ return -1;
+
+ /* set up an eventfd for interrupts */
+ fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+ if (fd < 0) {
+ CDX_BUS_ERR("Cannot set up eventfd, error %i (%s)",
+ errno, strerror(errno));
+ return -1;
+ }
+
+ if (rte_intr_fd_set(dev->intr_handle, fd))
+ return -1;
+
+ /* DPDK CDX bus currently supports only MSI-X */
+ if (rte_intr_type_set(dev->intr_handle, RTE_INTR_HANDLE_VFIO_MSIX))
+ return -1;
+
+ if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))
+ return -1;
+
+ return 0;
+ }
+
+ /* if we're here, we haven't found a suitable interrupt vector */
+ return -1;
+}
+
+static int
+cdx_rte_vfio_setup_device(struct rte_cdx_device *dev, int vfio_dev_fd,
+ int num_irqs)
+{
+ if (cdx_vfio_setup_interrupts(dev, vfio_dev_fd, num_irqs) != 0) {
+ CDX_BUS_ERR("Error setting up interrupts!");
+ return -1;
+ }
+
/*
* Reset the device. If the device is not capable of resetting,
* then it updates errno as EINVAL.
@@ -271,6 +379,9 @@ cdx_vfio_map_resource_primary(struct rte_cdx_device *dev)
struct cdx_map *maps;
int vfio_dev_fd, i, ret;
+ if (rte_intr_fd_set(dev->intr_handle, -1))
+ return -1;
+
ret = rte_vfio_setup_device(rte_cdx_get_sysfs_path(), dev_name,
&vfio_dev_fd, &device_info);
if (ret)
@@ -336,7 +447,7 @@ cdx_vfio_map_resource_primary(struct rte_cdx_device *dev)
free(reg);
}
- if (cdx_rte_vfio_setup_device(vfio_dev_fd) < 0) {
+ if (cdx_rte_vfio_setup_device(dev, vfio_dev_fd, device_info.num_irqs) < 0) {
CDX_BUS_ERR("%s setup device failed", dev_name);
goto err_vfio_res;
}
@@ -366,6 +477,9 @@ cdx_vfio_map_resource_secondary(struct rte_cdx_device *dev)
const char *dev_name = dev->device.name;
struct cdx_map *maps;
+ if (rte_intr_fd_set(dev->intr_handle, -1))
+ return -1;
+
/* if we're in a secondary process, just find our tailq entry */
TAILQ_FOREACH(vfio_res, vfio_res_list, next) {
if (strcmp(vfio_res->name, dev_name))
@@ -399,6 +513,10 @@ cdx_vfio_map_resource_secondary(struct rte_cdx_device *dev)
dev->mem_resource[i].len = maps[i].size;
}
+ /* we need save vfio_dev_fd, so it can be used during release */
+ if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))
+ goto err_vfio_dev_fd;
+
return 0;
err_vfio_dev_fd:
rte_vfio_release_device(rte_cdx_get_sysfs_path(),
@@ -418,3 +536,63 @@ cdx_vfio_map_resource(struct rte_cdx_device *dev)
else
return cdx_vfio_map_resource_secondary(dev);
}
+
+int
+rte_cdx_vfio_intr_enable(const struct rte_intr_handle *intr_handle)
+{
+ char irq_set_buf[MSI_IRQ_SET_BUF_LEN];
+ struct vfio_irq_set *irq_set;
+ int *fd_ptr, vfio_dev_fd, i;
+ int ret;
+
+ irq_set = (struct vfio_irq_set *) irq_set_buf;
+ irq_set->count = rte_intr_irq_count_get(intr_handle);
+ irq_set->argsz = sizeof(struct vfio_irq_set) +
+ (sizeof(int) * irq_set->count);
+
+ irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = 0;
+ irq_set->start = 0;
+ fd_ptr = (int *) &irq_set->data;
+
+ for (i = 0; i < rte_intr_nb_efd_get(intr_handle); i++)
+ fd_ptr[i] = rte_intr_efds_index_get(intr_handle, i);
+
+ vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+
+ if (ret) {
+ CDX_BUS_ERR("Error enabling MSI interrupts for fd %d",
+ rte_intr_fd_get(intr_handle));
+ return -1;
+ }
+
+ return 0;
+}
+
+/* disable MSI interrupts */
+int
+rte_cdx_vfio_intr_disable(const struct rte_intr_handle *intr_handle)
+{
+ struct vfio_irq_set *irq_set;
+ char irq_set_buf[MSI_IRQ_SET_BUF_LEN];
+ int len, ret, vfio_dev_fd;
+
+ len = sizeof(struct vfio_irq_set);
+
+ irq_set = (struct vfio_irq_set *) irq_set_buf;
+ irq_set->argsz = len;
+ irq_set->count = 0;
+ irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = 0;
+ irq_set->start = 0;
+
+ vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+
+ if (ret)
+ CDX_BUS_ERR("Error disabling MSI interrupts for fd %d",
+ rte_intr_fd_get(intr_handle));
+
+ return ret;
+}
diff --git a/drivers/bus/cdx/rte_bus_cdx.h b/drivers/bus/cdx/rte_bus_cdx.h
index 2ebe2a0dcc..a6170347dd 100644
--- a/drivers/bus/cdx/rte_bus_cdx.h
+++ b/drivers/bus/cdx/rte_bus_cdx.h
@@ -81,6 +81,7 @@ struct rte_cdx_device {
struct rte_cdx_id id; /**< CDX ID. */
struct rte_mem_resource mem_resource[CDX_MAX_RESOURCE];
/**< CDX Memory Resource */
+ struct rte_intr_handle *intr_handle; /**< Interrupt handle */
};
/**
@@ -181,6 +182,30 @@ void rte_cdx_unmap_device(struct rte_cdx_device *dev);
__rte_experimental
void rte_cdx_dump(FILE *f);
+/**
+ * Enables VFIO Interrupts for CDX bus devices.
+ *
+ * @param intr_handle
+ * Pointer to the interrupt handle.
+ *
+ * @return
+ * 0 on success, -1 on error.
+ */
+__rte_internal
+int rte_cdx_vfio_intr_enable(const struct rte_intr_handle *intr_handle);
+
+/**
+ * Disable VFIO Interrupts for CDX bus devices.
+ *
+ * @param intr_handle
+ * Pointer to the interrupt handle.
+ *
+ * @return
+ * 0 on success, -1 on error.
+ */
+__rte_internal
+int rte_cdx_vfio_intr_disable(const struct rte_intr_handle *intr_handle);
+
/**
* Register a CDX driver.
*
diff --git a/drivers/bus/cdx/version.map b/drivers/bus/cdx/version.map
index 4e8dd24f91..b35bf8481f 100644
--- a/drivers/bus/cdx/version.map
+++ b/drivers/bus/cdx/version.map
@@ -14,6 +14,8 @@ INTERNAL {
rte_cdx_register;
rte_cdx_unmap_device;
rte_cdx_unregister;
+ rte_cdx_vfio_intr_disable;
+ rte_cdx_vfio_intr_enable;
local: *;
};
diff --git a/lib/eal/common/eal_common_interrupts.c b/lib/eal/common/eal_common_interrupts.c
index 97b64fed58..a0167d9ad4 100644
--- a/lib/eal/common/eal_common_interrupts.c
+++ b/lib/eal/common/eal_common_interrupts.c
@@ -398,6 +398,27 @@ int rte_intr_elist_index_set(struct rte_intr_handle *intr_handle,
return -rte_errno;
}
+int rte_intr_irq_count_set(struct rte_intr_handle *intr_handle,
+ int irq_count)
+{
+ CHECK_VALID_INTR_HANDLE(intr_handle);
+
+ intr_handle->irq_count = irq_count;
+
+ return 0;
+fail:
+ return -rte_errno;
+}
+
+int rte_intr_irq_count_get(const struct rte_intr_handle *intr_handle)
+{
+ CHECK_VALID_INTR_HANDLE(intr_handle);
+
+ return intr_handle->irq_count;
+fail:
+ return -rte_errno;
+}
+
int rte_intr_vec_list_alloc(struct rte_intr_handle *intr_handle,
const char *name, int size)
{
diff --git a/lib/eal/common/eal_interrupts.h b/lib/eal/common/eal_interrupts.h
index 482781b862..237f471a76 100644
--- a/lib/eal/common/eal_interrupts.h
+++ b/lib/eal/common/eal_interrupts.h
@@ -16,6 +16,7 @@ struct rte_intr_handle {
};
uint32_t alloc_flags; /**< flags passed at allocation */
enum rte_intr_handle_type type; /**< handle type */
+ uint32_t irq_count; /**< IRQ count provided via VFIO */
uint32_t max_intr; /**< max interrupt requested */
uint32_t nb_efd; /**< number of available efd(event fd) */
uint8_t efd_counter_size; /**< size of efd counter, used for vdev */
diff --git a/lib/eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h
index 487e3c8875..bc477a483f 100644
--- a/lib/eal/include/rte_interrupts.h
+++ b/lib/eal/include/rte_interrupts.h
@@ -506,6 +506,38 @@ __rte_internal
int
rte_intr_max_intr_get(const struct rte_intr_handle *intr_handle);
+/**
+ * @internal
+ * Set the irq count field of interrupt handle with user
+ * provided irq count value.
+ *
+ * @param intr_handle
+ * pointer to the interrupt handle.
+ * @param irq_count
+ * IRQ count
+ *
+ * @return
+ * - On success, zero.
+ * - On failure, a negative value and rte_errno is set.
+ */
+__rte_internal
+int
+rte_intr_irq_count_set(struct rte_intr_handle *intr_handle, int irq_count);
+
+/**
+ * @internal
+ * Returns the irq count field of the given interrupt handle instance.
+ *
+ * @param intr_handle
+ * pointer to the interrupt handle.
+ *
+ * @return
+ * - On success, ir count.
+ * - On failure, a negative value and rte_errno is set.
+ */
+__rte_internal
+int rte_intr_irq_count_get(const struct rte_intr_handle *intr_handle);
+
/**
* @internal
* Set the number of event fd field of interrupt handle
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 6d6978f108..14bf7ade77 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -458,6 +458,8 @@ INTERNAL {
rte_intr_instance_dup;
rte_intr_instance_windows_handle_get;
rte_intr_instance_windows_handle_set;
+ rte_intr_irq_count_get;
+ rte_intr_irq_count_set;
rte_intr_max_intr_get;
rte_intr_max_intr_set;
rte_intr_nb_efd_get;
--
2.17.1