Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 56302,
    "url": "https://patches.dpdk.org/api/patches/56302/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1562762020-8259-1-git-send-email-david.marchand@redhat.com/",
    "project": {
        "id": 1,
        "url": "https://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": "<1562762020-8259-1-git-send-email-david.marchand@redhat.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1562762020-8259-1-git-send-email-david.marchand@redhat.com",
    "date": "2019-07-10T12:33:40",
    "name": "vfio: fix interrupts race condition",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "e5f9f460969119b3f9a22e34d29d778be7da313b",
    "submitter": {
        "id": 1173,
        "url": "https://patches.dpdk.org/api/people/1173/?format=api",
        "name": "David Marchand",
        "email": "david.marchand@redhat.com"
    },
    "delegate": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1562762020-8259-1-git-send-email-david.marchand@redhat.com/mbox/",
    "series": [
        {
            "id": 5431,
            "url": "https://patches.dpdk.org/api/series/5431/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5431",
            "date": "2019-07-10T12:33:40",
            "name": "vfio: fix interrupts race condition",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/5431/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/56302/comments/",
    "check": "fail",
    "checks": "https://patches.dpdk.org/api/patches/56302/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 8348C2AB;\n\tWed, 10 Jul 2019 14:34:15 +0200 (CEST)",
            "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id 527901D7;\n\tWed, 10 Jul 2019 14:34:13 +0200 (CEST)",
            "from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 119193D95A;\n\tWed, 10 Jul 2019 12:34:12 +0000 (UTC)",
            "from dmarchan.remote.csb (ovpn-204-39.brq.redhat.com\n\t[10.40.204.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 65B9BB23E1;\n\tWed, 10 Jul 2019 12:33:50 +0000 (UTC)"
        ],
        "From": "David Marchand <david.marchand@redhat.com>",
        "To": "dev@dpdk.org",
        "Cc": "anatoly.burakov@intel.com, alex.williamson@redhat.com,\n\tmaxime.coquelin@redhat.com, thomas@monjalon.net,\n\tstephen@networkplumber.org, igor.russkikh@aquantia.com,\n\tpavel.belous@aquantia.com, allain.legacy@windriver.com,\n\tmatt.peters@windriver.com, ravi1.kumar@amd.com, rmody@marvell.com,\n\tshshaikh@marvell.com, ajit.khaparde@broadcom.com,\n\tsomnath.kotur@broadcom.com, hemant.agrawal@nxp.com,\n\tshreyansh.jain@nxp.com, \n\twenzhuo.lu@intel.com, mw@semihalf.com, mk@semihalf.com,\n\tgtzalik@amazon.com, \n\tevgenys@amazon.com, johndale@cisco.com, hyonkim@cisco.com,\n\tqi.z.zhang@intel.com, xiao.w.wang@intel.com, xuanziyang2@huawei.com, \n\tcloud.wangxiaoyun@huawei.com, zhouguoyang@huawei.com,\n\tbeilei.xing@intel.com, jingjing.wu@intel.com, qiming.yang@intel.com, \n\tkonstantin.ananyev@intel.com, alejandro.lucero@netronome.com,\n\tarybchenko@solarflare.com, tiwei.bie@intel.com, zhihong.wang@intel.com,\n\tyongwang@vmware.com, stable@dpdk.org",
        "Date": "Wed, 10 Jul 2019 14:33:40 +0200",
        "Message-Id": "<1562762020-8259-1-git-send-email-david.marchand@redhat.com>",
        "In-Reply-To": "<1562071706-11009-1-git-send-email-david.marchand@redhat.com>",
        "References": "<1562071706-11009-1-git-send-email-david.marchand@redhat.com>",
        "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12",
        "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]); Wed, 10 Jul 2019 12:34:12 +0000 (UTC)",
        "Subject": "[dpdk-dev] [PATCH] vfio: fix interrupts race condition",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Populating the eventfd in rte_intr_enable in each request to vfio\ntriggers a reconfiguration of the interrupt handler on the kernel side.\nThe problem is that rte_intr_enable is often used to re-enable masked\ninterrupts from drivers interrupt handlers.\n\nThis reconfiguration leaves a window during which a device could send\nan interrupt and then the kernel logs this (unsolicited from the kernel\npoint of view) interrupt:\n[158764.159833] do_IRQ: 9.34 No irq handler for vector\n\nVFIO api makes it possible to set the fd at setup time.\nMake use of this and then we only need to ask for masking/unmasking\nlegacy interrupts and we have nothing to do for MSI/MSIX.\n\n\"rxtx\" interrupts are left untouched but are most likely subject to the\nsame issue.\n\nFixes: 5c782b3928b8 (\"vfio: interrupts\")\nCc: stable@dpdk.org\n\nReported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1654824\nSigned-off-by: David Marchand <david.marchand@redhat.com>\nTested-by: Shahed Shaikh <shshaikh@marvell.com>\n---\n drivers/bus/pci/linux/pci_vfio.c          |  78 ++++++------\n lib/librte_eal/linux/eal/eal_interrupts.c | 197 +++++++-----------------------\n 2 files changed, 86 insertions(+), 189 deletions(-)",
    "diff": "diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c\nindex 1ceb1c0..ee31239 100644\n--- a/drivers/bus/pci/linux/pci_vfio.c\n+++ b/drivers/bus/pci/linux/pci_vfio.c\n@@ -187,8 +187,11 @@\n static int\n pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)\n {\n-\tint i, ret, intr_idx;\n+\tchar irq_set_buf[sizeof(struct vfio_irq_set) + sizeof(int)];\n+\tstruct vfio_irq_set *irq_set;\n \tenum rte_intr_mode intr_mode;\n+\tint i, ret, intr_idx;\n+\tint fd;\n \n \t/* default to invalid index */\n \tintr_idx = VFIO_PCI_NUM_IRQS;\n@@ -220,7 +223,6 @@\n \t/* start from MSI-X interrupt type */\n \tfor (i = VFIO_PCI_MSIX_IRQ_INDEX; i >= 0; i--) {\n \t\tstruct vfio_irq_info irq = { .argsz = sizeof(irq) };\n-\t\tint fd = -1;\n \n \t\t/* skip interrupt modes we don't want */\n \t\tif (intr_mode != RTE_INTR_MODE_NONE &&\n@@ -236,51 +238,51 @@\n \t\t\treturn -1;\n \t\t}\n \n+\t\t/* found a usable interrupt mode */\n+\t\tif ((irq.flags & VFIO_IRQ_INFO_EVENTFD) != 0)\n+\t\t\tbreak;\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\tif ((irq.flags & VFIO_IRQ_INFO_EVENTFD) == 0) {\n-\t\t\tif (intr_mode != RTE_INTR_MODE_NONE) {\n-\t\t\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\t\t\t\"  interrupt vector does not support eventfd!\\n\");\n-\t\t\t\treturn -1;\n-\t\t\t} else\n-\t\t\t\tcontinue;\n-\t\t}\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\tRTE_LOG(ERR, EAL, \"  cannot set up eventfd, \"\n-\t\t\t\t\t\"error %i (%s)\\n\", errno, strerror(errno));\n+\t\tif (intr_mode != RTE_INTR_MODE_NONE) {\n+\t\t\tRTE_LOG(ERR, EAL, \"  interrupt vector does not support eventfd!\\n\");\n \t\t\treturn -1;\n \t\t}\n+\t}\n \n-\t\tdev->intr_handle.fd = fd;\n-\t\tdev->intr_handle.vfio_dev_fd = vfio_dev_fd;\n+\tif (i < 0)\n+\t\treturn -1;\n \n-\t\tswitch (i) {\n-\t\tcase VFIO_PCI_MSIX_IRQ_INDEX:\n-\t\t\tintr_mode = RTE_INTR_MODE_MSIX;\n-\t\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_MSIX;\n-\t\t\tbreak;\n-\t\tcase VFIO_PCI_MSI_IRQ_INDEX:\n-\t\t\tintr_mode = RTE_INTR_MODE_MSI;\n-\t\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_MSI;\n-\t\t\tbreak;\n-\t\tcase VFIO_PCI_INTX_IRQ_INDEX:\n-\t\t\tintr_mode = RTE_INTR_MODE_LEGACY;\n-\t\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_LEGACY;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tRTE_LOG(ERR, EAL, \"  unknown interrupt type!\\n\");\n-\t\t\treturn -1;\n-\t\t}\n+\tfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);\n+\tif (fd < 0) {\n+\t\tRTE_LOG(ERR, EAL, \"  cannot set up eventfd, error %i (%s)\\n\",\n+\t\t\terrno, strerror(errno));\n+\t\treturn -1;\n+\t}\n \n-\t\treturn 0;\n+\tirq_set = (struct vfio_irq_set *)irq_set_buf;\n+\tirq_set->argsz = sizeof(irq_set_buf);\n+\tirq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD|VFIO_IRQ_SET_ACTION_TRIGGER;\n+\tirq_set->index = i;\n+\tirq_set->start = 0;\n+\tirq_set->count = 1;\n+\tmemcpy(&irq_set->data, &fd, sizeof(int));\n+\tif (ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set) < 0) {\n+\t\tRTE_LOG(ERR, EAL, \"  error configuring interrupt\\n\");\n+\t\tclose(fd);\n+\t\treturn -1;\n \t}\n \n-\t/* if we're here, we haven't found a suitable interrupt vector */\n-\treturn -1;\n+\tdev->intr_handle.fd = fd;\n+\tdev->intr_handle.vfio_dev_fd = vfio_dev_fd;\n+\tif (i == VFIO_PCI_MSIX_IRQ_INDEX)\n+\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_MSIX;\n+\telse if (i == VFIO_PCI_MSI_IRQ_INDEX)\n+\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_MSI;\n+\telse if (i == VFIO_PCI_INTX_IRQ_INDEX)\n+\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_LEGACY;\n+\n+\treturn 0;\n }\n \n #ifdef HAVE_VFIO_DEV_REQ_INTERFACE\ndiff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c\nindex 79ad5e8..27976b3 100644\n--- a/lib/librte_eal/linux/eal/eal_interrupts.c\n+++ b/lib/librte_eal/linux/eal/eal_interrupts.c\n@@ -109,42 +109,19 @@ struct rte_intr_source {\n \n /* enable legacy (INTx) interrupts */\n static int\n-vfio_enable_intx(const struct rte_intr_handle *intr_handle) {\n-\tstruct vfio_irq_set *irq_set;\n-\tchar irq_set_buf[IRQ_SET_BUF_LEN];\n-\tint len, ret;\n-\tint *fd_ptr;\n-\n-\tlen = sizeof(irq_set_buf);\n-\n-\t/* enable INTx */\n-\tirq_set = (struct vfio_irq_set *) irq_set_buf;\n-\tirq_set->argsz = len;\n-\tirq_set->count = 1;\n-\tirq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;\n-\tirq_set->index = VFIO_PCI_INTX_IRQ_INDEX;\n-\tirq_set->start = 0;\n-\tfd_ptr = (int *) &irq_set->data;\n-\t*fd_ptr = intr_handle->fd;\n-\n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n-\n-\tif (ret) {\n-\t\tRTE_LOG(ERR, EAL, \"Error enabling INTx interrupts for fd %d\\n\",\n-\t\t\t\t\t\tintr_handle->fd);\n-\t\treturn -1;\n-\t}\n+vfio_enable_intx(const struct rte_intr_handle *intr_handle)\n+{\n+\tstruct vfio_irq_set irq_set;\n+\tint ret;\n \n-\t/* unmask INTx after enabling */\n-\tmemset(irq_set, 0, len);\n-\tlen = sizeof(struct vfio_irq_set);\n-\tirq_set->argsz = len;\n-\tirq_set->count = 1;\n-\tirq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_UNMASK;\n-\tirq_set->index = VFIO_PCI_INTX_IRQ_INDEX;\n-\tirq_set->start = 0;\n+\t/* unmask INTx */\n+\tirq_set.argsz = sizeof(irq_set);\n+\tirq_set.flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_UNMASK;\n+\tirq_set.index = VFIO_PCI_INTX_IRQ_INDEX;\n+\tirq_set.start = 0;\n+\tirq_set.count = 1;\n \n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n+\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, &irq_set);\n \n \tif (ret) {\n \t\tRTE_LOG(ERR, EAL, \"Error unmasking INTx interrupts for fd %d\\n\",\n@@ -156,128 +133,51 @@ struct rte_intr_source {\n \n /* disable legacy (INTx) interrupts */\n static int\n-vfio_disable_intx(const struct rte_intr_handle *intr_handle) {\n-\tstruct vfio_irq_set *irq_set;\n-\tchar irq_set_buf[IRQ_SET_BUF_LEN];\n-\tint len, ret;\n-\n-\tlen = sizeof(struct vfio_irq_set);\n+vfio_disable_intx(const struct rte_intr_handle *intr_handle)\n+{\n+\tstruct vfio_irq_set irq_set;\n+\tint ret;\n \n-\t/* mask interrupts before disabling */\n-\tirq_set = (struct vfio_irq_set *) irq_set_buf;\n-\tirq_set->argsz = len;\n-\tirq_set->count = 1;\n-\tirq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_MASK;\n-\tirq_set->index = VFIO_PCI_INTX_IRQ_INDEX;\n-\tirq_set->start = 0;\n+\t/* mask interrupts */\n+\tirq_set.argsz = sizeof(irq_set);\n+\tirq_set.flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_MASK;\n+\tirq_set.index = VFIO_PCI_INTX_IRQ_INDEX;\n+\tirq_set.start = 0;\n+\tirq_set.count = 1;\n \n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n+\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, &irq_set);\n \n \tif (ret) {\n \t\tRTE_LOG(ERR, EAL, \"Error masking INTx interrupts for fd %d\\n\",\n \t\t\t\t\t\tintr_handle->fd);\n \t\treturn -1;\n \t}\n-\n-\t/* disable INTx*/\n-\tmemset(irq_set, 0, len);\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 = VFIO_PCI_INTX_IRQ_INDEX;\n-\tirq_set->start = 0;\n-\n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n-\n-\tif (ret) {\n-\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"Error disabling INTx interrupts for fd %d\\n\", intr_handle->fd);\n-\t\treturn -1;\n-\t}\n-\treturn 0;\n-}\n-\n-/* enable MSI interrupts */\n-static int\n-vfio_enable_msi(const struct rte_intr_handle *intr_handle) {\n-\tint len, ret;\n-\tchar irq_set_buf[IRQ_SET_BUF_LEN];\n-\tstruct vfio_irq_set *irq_set;\n-\tint *fd_ptr;\n-\n-\tlen = sizeof(irq_set_buf);\n-\n-\tirq_set = (struct vfio_irq_set *) irq_set_buf;\n-\tirq_set->argsz = len;\n-\tirq_set->count = 1;\n-\tirq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;\n-\tirq_set->index = VFIO_PCI_MSI_IRQ_INDEX;\n-\tirq_set->start = 0;\n-\tfd_ptr = (int *) &irq_set->data;\n-\t*fd_ptr = intr_handle->fd;\n-\n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n-\n-\tif (ret) {\n-\t\tRTE_LOG(ERR, EAL, \"Error enabling MSI interrupts for fd %d\\n\",\n-\t\t\t\t\t\tintr_handle->fd);\n-\t\treturn -1;\n-\t}\n \treturn 0;\n }\n \n-/* disable MSI interrupts */\n-static int\n-vfio_disable_msi(const struct rte_intr_handle *intr_handle) {\n-\tstruct vfio_irq_set *irq_set;\n-\tchar irq_set_buf[IRQ_SET_BUF_LEN];\n-\tint len, ret;\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 = VFIO_PCI_MSI_IRQ_INDEX;\n-\tirq_set->start = 0;\n-\n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n-\n-\tif (ret)\n-\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"Error disabling MSI interrupts for fd %d\\n\", intr_handle->fd);\n-\n-\treturn ret;\n-}\n-\n /* enable MSI-X interrupts */\n static int\n-vfio_enable_msix(const struct rte_intr_handle *intr_handle) {\n-\tint len, ret;\n+vfio_enable_msix(const struct rte_intr_handle *intr_handle)\n+{\n \tchar irq_set_buf[MSIX_IRQ_SET_BUF_LEN];\n \tstruct vfio_irq_set *irq_set;\n-\tint *fd_ptr;\n+\tint len, ret;\n+\n+\tif (intr_handle->nb_efd == 0)\n+\t\treturn 0;\n \n \tlen = sizeof(irq_set_buf);\n \n \tirq_set = (struct vfio_irq_set *) irq_set_buf;\n \tirq_set->argsz = len;\n-\t/* 0 < irq_set->count < RTE_MAX_RXTX_INTR_VEC_ID + 1 */\n-\tirq_set->count = intr_handle->max_intr ?\n-\t\t(intr_handle->max_intr > RTE_MAX_RXTX_INTR_VEC_ID + 1 ?\n-\t\tRTE_MAX_RXTX_INTR_VEC_ID + 1 : intr_handle->max_intr) : 1;\n \tirq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;\n \tirq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;\n-\tirq_set->start = 0;\n-\tfd_ptr = (int *) &irq_set->data;\n-\t/* INTR vector offset 0 reserve for non-efds mapping */\n-\tfd_ptr[RTE_INTR_VEC_ZERO_OFFSET] = intr_handle->fd;\n-\tmemcpy(&fd_ptr[RTE_INTR_VEC_RXTX_OFFSET], intr_handle->efds,\n-\t\tsizeof(*intr_handle->efds) * intr_handle->nb_efd);\n+\tirq_set->start = RTE_INTR_VEC_RXTX_OFFSET;\n+\tirq_set->count = intr_handle->nb_efd;\n+\tmemcpy(&irq_set->data, intr_handle->efds,\n+\t       sizeof(*intr_handle->efds) * intr_handle->nb_efd);\n \n \tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n-\n \tif (ret) {\n \t\tRTE_LOG(ERR, EAL, \"Error enabling MSI-X interrupts for fd %d\\n\",\n \t\t\t\t\t\tintr_handle->fd);\n@@ -289,22 +189,21 @@ struct rte_intr_source {\n \n /* disable MSI-X interrupts */\n static int\n-vfio_disable_msix(const struct rte_intr_handle *intr_handle) {\n-\tstruct vfio_irq_set *irq_set;\n-\tchar irq_set_buf[MSIX_IRQ_SET_BUF_LEN];\n-\tint len, ret;\n-\n-\tlen = sizeof(struct vfio_irq_set);\n+vfio_disable_msix(const struct rte_intr_handle *intr_handle)\n+{\n+\tstruct vfio_irq_set irq_set;\n+\tint ret;\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 = VFIO_PCI_MSIX_IRQ_INDEX;\n-\tirq_set->start = 0;\n+\tif (intr_handle->nb_efd == 0)\n+\t\treturn 0;\n \n-\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n+\tirq_set.argsz = sizeof(irq_set);\n+\tirq_set.flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;\n+\tirq_set.index = VFIO_PCI_MSIX_IRQ_INDEX;\n+\tirq_set.start = RTE_INTR_VEC_RXTX_OFFSET;\n+\tirq_set.count = intr_handle->nb_efd;\n \n+\tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, &irq_set);\n \tif (ret)\n \t\tRTE_LOG(ERR, EAL,\n \t\t\t\"Error disabling MSI-X interrupts for fd %d\\n\", intr_handle->fd);\n@@ -665,9 +564,7 @@ struct rte_intr_source {\n \t\t\treturn -1;\n \t\tbreak;\n \tcase RTE_INTR_HANDLE_VFIO_MSI:\n-\t\tif (vfio_enable_msi(intr_handle))\n-\t\t\treturn -1;\n-\t\tbreak;\n+\t\treturn 0;\n \tcase RTE_INTR_HANDLE_VFIO_LEGACY:\n \t\tif (vfio_enable_intx(intr_handle))\n \t\t\treturn -1;\n@@ -721,9 +618,7 @@ struct rte_intr_source {\n \t\t\treturn -1;\n \t\tbreak;\n \tcase RTE_INTR_HANDLE_VFIO_MSI:\n-\t\tif (vfio_disable_msi(intr_handle))\n-\t\t\treturn -1;\n-\t\tbreak;\n+\t\treturn 0;\n \tcase RTE_INTR_HANDLE_VFIO_LEGACY:\n \t\tif (vfio_disable_intx(intr_handle))\n \t\t\treturn -1;\n",
    "prefixes": []
}