Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8646/?format=api
{ "id": 8646, "url": "https://patches.dpdk.org/api/patches/8646/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1446626740-28824-2-git-send-email-cunming.liang@intel.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": "<1446626740-28824-2-git-send-email-cunming.liang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446626740-28824-2-git-send-email-cunming.liang@intel.com", "date": "2015-11-04T08:45:28", "name": "[dpdk-dev,v4,01/13] eal: vfio map misc intr to vector zero", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fe94668f00e8a111143d342b54b8150286a1b34c", "submitter": { "id": 46, "url": "https://patches.dpdk.org/api/people/46/?format=api", "name": "Cunming Liang", "email": "cunming.liang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1446626740-28824-2-git-send-email-cunming.liang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8646/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8646/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id B8FB4919F;\n\tWed, 4 Nov 2015 09:45:53 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 894A39198\n\tfor <dev@dpdk.org>; Wed, 4 Nov 2015 09:45:52 +0100 (CET)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP; 04 Nov 2015 00:45:51 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga001.jf.intel.com with ESMTP; 04 Nov 2015 00:45:52 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id tA48jmja004352;\n\tWed, 4 Nov 2015 16:45:48 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid tA48jiWi028882; Wed, 4 Nov 2015 16:45:46 +0800", "(from cliang18@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tA48jioR028878; \n\tWed, 4 Nov 2015 16:45:44 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,242,1444719600\"; d=\"scan'208\";a=\"811396733\"", "From": "Cunming Liang <cunming.liang@intel.com>", "To": "dev@dpdk.org", "Date": "Wed, 4 Nov 2015 16:45:28 +0800", "Message-Id": "<1446626740-28824-2-git-send-email-cunming.liang@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1446626740-28824-1-git-send-email-cunming.liang@intel.com>", "References": "<1446617263-7448-1-git-send-email-cunming.liang@intel.com>\n\t<1446626740-28824-1-git-send-email-cunming.liang@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 01/13] eal: vfio map misc intr to vector zero", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "During VFIO_DEVICE_SET_IRQS, the previous order is {Q0_fd, ... Qn_fd, misc_fd}.\nThe vector number of misc is indeterminable which is ugly to some NIC(e.g. i40e, fm10k).\nThe patch adjusts the order in {misc_fd, Q0_fd, ... Qn_fd}, always reserve the first vector to misc interrupt.\n\nv3 changes:\n - rename MISC_VEC_ID to RTE_INTR_VEC_ZERO_OFFSET\n - rename RX_VEC_START to RTE_INTR_VEC_RXTX_OFFSET\n - add macro definition in bsd header file\n\nSigned-off-by: Cunming Liang <cunming.liang@intel.com>\n---\n .../bsdapp/eal/include/exec-env/rte_interrupts.h | 3 +++\n lib/librte_eal/linuxapp/eal/eal_interrupts.c | 19 +++++++++++++------\n .../linuxapp/eal/include/exec-env/rte_interrupts.h | 2 ++\n 3 files changed, 18 insertions(+), 6 deletions(-)", "diff": "diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h\nindex 88d4ae1..05bb484 100644\n--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h\n+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h\n@@ -38,6 +38,9 @@\n #ifndef _RTE_BSDAPP_INTERRUPTS_H_\n #define _RTE_BSDAPP_INTERRUPTS_H_\n \n+#define RTE_INTR_VEC_ZERO_OFFSET 0\n+#define RTE_INTR_VEC_RXTX_OFFSET 1\n+\n enum rte_intr_handle_type {\n \tRTE_INTR_HANDLE_UNKNOWN = 0,\n \tRTE_INTR_HANDLE_UIO, /**< uio device handle */\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c\nindex a4b9506..8758239 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c\n@@ -301,8 +301,10 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {\n \tirq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;\n \tirq_set->start = 0;\n \tfd_ptr = (int *) &irq_set->data;\n-\tmemcpy(fd_ptr, intr_handle->efds, sizeof(intr_handle->efds));\n-\tfd_ptr[intr_handle->max_intr - 1] = intr_handle->fd;\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 \n \tret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n \n@@ -1083,10 +1085,14 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,\n \tstruct rte_epoll_event *rev;\n \tstruct rte_epoll_data *epdata;\n \tint epfd_op;\n+\tunsigned int efd_idx;\n \tint rc = 0;\n \n+\tefd_idx = (vec >= RTE_INTR_VEC_RXTX_OFFSET) ?\n+\t\t(vec - RTE_INTR_VEC_RXTX_OFFSET) : vec;\n+\n \tif (!intr_handle || intr_handle->nb_efd == 0 ||\n-\t vec >= intr_handle->nb_efd) {\n+\t efd_idx >= intr_handle->nb_efd) {\n \t\tRTE_LOG(ERR, EAL, \"Wrong intr vector number.\\n\");\n \t\treturn -EPERM;\n \t}\n@@ -1094,7 +1100,7 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,\n \tswitch (op) {\n \tcase RTE_INTR_EVENT_ADD:\n \t\tepfd_op = EPOLL_CTL_ADD;\n-\t\trev = &intr_handle->elist[vec];\n+\t\trev = &intr_handle->elist[efd_idx];\n \t\tif (rev->status != RTE_EPOLL_INVALID) {\n \t\t\tRTE_LOG(INFO, EAL, \"Event already been added.\\n\");\n \t\t\treturn -EEXIST;\n@@ -1106,7 +1112,8 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,\n \t\tepdata->data = data;\n \t\tepdata->cb_fun = (rte_intr_event_cb_t)eal_intr_proc_rxtx_intr;\n \t\tepdata->cb_arg = (void *)intr_handle;\n-\t\trc = rte_epoll_ctl(epfd, epfd_op, intr_handle->efds[vec], rev);\n+\t\trc = rte_epoll_ctl(epfd, epfd_op,\n+\t\t\t\t intr_handle->efds[efd_idx], rev);\n \t\tif (!rc)\n \t\t\tRTE_LOG(DEBUG, EAL,\n \t\t\t\t\"efd %d associated with vec %d added on epfd %d\"\n@@ -1116,7 +1123,7 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,\n \t\tbreak;\n \tcase RTE_INTR_EVENT_DEL:\n \t\tepfd_op = EPOLL_CTL_DEL;\n-\t\trev = &intr_handle->elist[vec];\n+\t\trev = &intr_handle->elist[efd_idx];\n \t\tif (rev->status == RTE_EPOLL_INVALID) {\n \t\t\tRTE_LOG(INFO, EAL, \"Event does not exist.\\n\");\n \t\t\treturn -EPERM;\ndiff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h\nindex b095b86..8da81e7 100644\n--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h\n+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h\n@@ -39,6 +39,8 @@\n #define _RTE_LINUXAPP_INTERRUPTS_H_\n \n #define RTE_MAX_RXTX_INTR_VEC_ID 32\n+#define RTE_INTR_VEC_ZERO_OFFSET 0\n+#define RTE_INTR_VEC_RXTX_OFFSET 1\n \n enum rte_intr_handle_type {\n \tRTE_INTR_HANDLE_UNKNOWN = 0,\n", "prefixes": [ "dpdk-dev", "v4", "01/13" ] }