From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id E921A3777 for ; Tue, 14 Mar 2017 14:13:17 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from shahafs@mellanox.com) with ESMTPS (AES256-SHA encrypted); 14 Mar 2017 15:03:32 +0200 Received: from arch009.mtl.labs.mlnx (arch009.mtl.labs.mlnx [10.7.12.209]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v2ED3WDi025801; Tue, 14 Mar 2017 15:03:32 +0200 Received: from arch009.mtl.labs.mlnx (localhost [127.0.0.1]) by arch009.mtl.labs.mlnx (8.14.7/8.14.7) with ESMTP id v2ED3WCg026334; Tue, 14 Mar 2017 15:03:32 +0200 Received: (from root@localhost) by arch009.mtl.labs.mlnx (8.14.7/8.14.7/Submit) id v2ED3WFS026333; Tue, 14 Mar 2017 15:03:32 +0200 From: Shahaf Shuler To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, ferruh.yigit@intel.com Cc: dev@dpdk.org Date: Tue, 14 Mar 2017 15:03:08 +0200 Message-Id: <1489496589-26177-2-git-send-email-shahafs@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1489496589-26177-1-git-send-email-shahafs@mellanox.com> References: <1486562252-15307-1-git-send-email-shahafs@mellanox.com> <1489496589-26177-1-git-send-email-shahafs@mellanox.com> Subject: [dpdk-dev] [PATCH v2 1/2] eal/linux: support external Rx interrupt X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Mar 2017 13:13:18 -0000 Prior to this patch only UIO/VFIO interrupt handlers types were supported. This patch adds support for the external interrupt handler type, allowing external drivers to set their own fds with specific interrupt handlers. Signed-off-by: Shahaf Shuler --- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 33 ++++++++++++++-------- .../linuxapp/eal/include/exec-env/rte_interrupts.h | 9 ++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 7 +++++ 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c index 92a19cb..c19eb8c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c +++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c @@ -939,6 +939,8 @@ static __attribute__((noreturn)) void * bytes_read = sizeof(buf.vfio_intr_count); break; #endif + case RTE_INTR_HANDLE_EXT: + return; default: bytes_read = 1; RTE_LOG(INFO, EAL, "unexpected intr type\n"); @@ -1167,6 +1169,24 @@ static __attribute__((noreturn)) void * return rc; } +void +rte_intr_free_epoll_fd(struct rte_intr_handle *intr_handle) +{ + uint32_t i; + struct rte_epoll_event *rev; + + for (i = 0; i < intr_handle->nb_efd; i++) { + rev = &intr_handle->elist[i]; + if (rev->status == RTE_EPOLL_INVALID) + continue; + if (rte_epoll_ctl(rev->epfd, EPOLL_CTL_DEL, rev->fd, rev)) { + /* force free if the entry valid */ + eal_epoll_data_safe_free(rev); + rev->status = RTE_EPOLL_INVALID; + } + } +} + int rte_intr_efd_enable(struct rte_intr_handle *intr_handle, uint32_t nb_efd) { @@ -1202,19 +1222,8 @@ static __attribute__((noreturn)) void * rte_intr_efd_disable(struct rte_intr_handle *intr_handle) { uint32_t i; - struct rte_epoll_event *rev; - - for (i = 0; i < intr_handle->nb_efd; i++) { - rev = &intr_handle->elist[i]; - if (rev->status == RTE_EPOLL_INVALID) - continue; - if (rte_epoll_ctl(rev->epfd, EPOLL_CTL_DEL, rev->fd, rev)) { - /* force free if the entry valid */ - eal_epoll_data_safe_free(rev); - rev->status = RTE_EPOLL_INVALID; - } - } + rte_intr_free_epoll_fd(intr_handle); if (intr_handle->max_intr > intr_handle->nb_efd) { for (i = 0; i < intr_handle->nb_efd; i++) close(intr_handle->efds[i]); diff --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 index d459bf4..735d307 100644 --- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h @@ -171,6 +171,15 @@ struct rte_intr_handle { int epfd, int op, unsigned int vec, void *data); /** + * It deletes registered eventfds. + * + * @param intr_handle + * Pointer to the interrupt handle. + */ +void +rte_intr_free_epoll_fd(struct rte_intr_handle *intr_handle); + +/** * It enables the packet I/O interrupt event if it's necessary. * It creates event fd for each interrupt vector when MSIX is used, * otherwise it multiplexes a single event fd. diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 9c134b4..905d8de 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -186,3 +186,10 @@ DPDK_17.02 { rte_bus_unregister; } DPDK_16.11; + +DPDK_17.05 { + global: + + rte_intr_free_epoll_fd; + +} DPDK_17.02; -- 1.8.3.1