From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0047.outbound.protection.outlook.com [104.47.0.47]) by dpdk.org (Postfix) with ESMTP id CD2737CFC for ; Thu, 4 Jan 2018 16:44:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=bS51Gh99iFwY1/wWiTdqRRLq4C+0MXpiFwTKJallrGc=; b=mBsCuvmwFRDZl97yvXz7RKljWCwh/lZUQZwGCLdLBR25iE98oVPKljIAf2F6oOZigA3q7lx2Ggdh6y//zv9od2xxjDPR+6jIht5flfRjoyb/B5kME9AdOWlFnXGV6qu0+rDIPE11pj2n99h2eqj7UkKH5JHQSsgfJjLb2L6I7qg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from mellanox.com (37.142.13.130) by HE1PR05MB3211.eurprd05.prod.outlook.com (2603:10a6:7:36::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Thu, 4 Jan 2018 15:44:52 +0000 From: Moti Haimovsky To: pascal.mazon@6wind.com, ferruh.yigit@intel.com Cc: dev@dpdk.org, Moti Haimovsky Date: Thu, 4 Jan 2018 17:44:30 +0200 Message-Id: <1515080670-178604-1-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1511186362-72289-1-git-send-email-motih@mellanox.com> References: <1511186362-72289-1-git-send-email-motih@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: AM5PR0502CA0017.eurprd05.prod.outlook.com (2603:10a6:203:91::27) To HE1PR05MB3211.eurprd05.prod.outlook.com (2603:10a6:7:36::33) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5cc529b6-5edc-4bbe-08ff-08d5538a18ed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060); SRVR:HE1PR05MB3211; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3211; 3:+6DJq/3AzlRiaKfzglt55mbmbg8n6E95uOypIOpJ7gI9hTXiEXHPqgbsm5jcf7T/G5DTPIyWandCKgmoI2R0suGjy/hh5Jmj9dXU/8lj+tjmiBKF2d8T49Qw4333frfiW4b9a3edPinbWq/ICPBG9HkPlNus4N7t5x6BdVEBEZCoC2EvWsFC8i/JDYtH1E+e3jrfLVnJEZ+8CZIZfZZFZtChQPUKVJ3D0ou0eqSghsXi7d2nw3X8wxFH02fOI7Rw; 25:QSuVeKymbjwkcSsUzey38HlKY97wQanocYyosZcf/zW6SXbZEsTf7eX6por8Budknoju7mjAloQCabD7GqxqcbemM1t1WNFY8PSyRu9+ic3Txym02faYFWZz+pl90PKb7FbNg2goSpzGblxtv8bZ0R6Q/B4kSnC/vXBgrROa3vtVWqcZFvzdUJP/G0xmp1Nfd8oBEKshiEFaKm8tVv97VH+fWoI9dlpBIREmDOIuViYzZnPV1xkhsXGCOvajMsf7ryHaTO4pjxOXiJXbWh1aiRpoHz0rSFb6HLFM/DbM8QsWEuQSW5KGAReguRgV3OSxSG1gajRPHQQWySu1lk9SgQ==; 31:R9S3Enqm5qY31jf2hLKKGKyJyyqeKmlX/pwfCNrqLPZn5WvQkc+bxPF6mZzUMA31T1ju/HpFXh26HAx5bKa2eA9AN5OYm78aXBP8rfAsFbQxVxYaKEFAHFnIELAMFu8X+PXHCj3pIh7lLUQgkjqTIT/Wj6sTXu6Q2me/t5dFQGk1Wi98A8B7CuiIKoC+nDVQYrM6v8sThuWXOC1nca9tzVzoLwqbQQpIWUd303odFRI= X-MS-TrafficTypeDiagnostic: HE1PR05MB3211: X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3211; 20:cv60t3LCADuvEJ3eCtKCs6sRibdbbyKuRYqOPLBZFioVFpSfO1KfdHp+Gt8cCVtKlk35biPqdeTe+Piyjwfrp8T96lybvghl3ABvV3hfe5dGOqkSQ9urxWhGfzGH1auHNGlYgI18pmow6N3GwmIhL1U0vlRE+ShcrDNJ2htCCCm1klglBtjxQvs1gw/Fj62XVqoYSIIz2DChAkMNrXCSWQyjuA5piS4RXsbSLOKnQqc5pXiujoTYScrULNduqFHCwQLvJrC+ADZ9ZHtCg7bA11Gaze5uuUn22ywAmhDfA4KC7F1OgWyBkR0iCkOgCHLS+XZc5UZz5it5tRxdCaAUHmOGoSXfAVz/nsdVUuICVVgKcs9w1tdDfW9isFuIp+JKs/HNP7lC5X1NB+DFw8wLtEZVsGG1jSMT5nR6xtTr1GWgkdcaPIIhyC/7yQ22tGyNQtp9aT30g+1f3dErJSxcCd6tHhnjzL+xQX6oBYY0APu+gskV1KHLCcN2BBtxVSCT; 4:k4DaZZK/jZCWoHB+sZ3Kmbj+ES8PHl2oda6Y8TSOd5MCIyHqmdpvM2YWdksoXak4DrIQRYQNTpu2fsnyeUjtvCOFIAuNZKNIp8mgTFL5SBG0SLUWdh8S/HYQr/n3WvlHI6tH4bEEia5IVG4D/2EJtYI+5WXlOTRAjKpT/ogKlg2E6n611TtEuJvuOA4w7rLOBpICXcTYlDY0w2do7xXyJ60jljPL7PkFeexH1VxDQyhguTWswagHLYYcVY0i+Z3yxkbTgs49WjIwVOl88689os6FCCLO1r5rXqEFuWhgE4adZknivaO3YUwwJKHytdQ5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(278428928389397); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3231023)(944501075)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041268)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR05MB3211; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR05MB3211; X-Forefront-PRVS: 054231DC40 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(39380400002)(346002)(366004)(376002)(199004)(189003)(50226002)(2950100002)(4720700003)(5660300001)(7736002)(81166006)(16586007)(316002)(8676002)(4326008)(36756003)(8936002)(305945005)(6666003)(575784001)(33026002)(478600001)(86362001)(68736007)(47776003)(81156014)(69596002)(16526018)(53936002)(386003)(7696005)(51416003)(6116002)(66066001)(2906002)(59450400001)(3846002)(50466002)(76176011)(52116002)(107886003)(55016002)(21086003)(25786009)(48376002)(105586002)(106356001)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3211; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB3211; 23:zKUt5xKMcr19ms+hezdaDxF9R4GvyjTyPf0DQfY+m?= =?us-ascii?Q?jVmPsnSeGGPdGFINzUW4NZvetFVdXOfuRM15SBCPVVFejidOS1G+1B/5o3m2?= =?us-ascii?Q?7tTLTedGGQjBkq9LVQGCXm4QL3+p3F9NscIApJxchhwpoQ7kPWHwUjTfXt0L?= =?us-ascii?Q?pbiYNlbulXtZLf/V9zmFuburBkYwYpGRj2l+XPb8rssoeOpomw5lO+PHkYL1?= =?us-ascii?Q?UYmQppQsL3RGEOu84t1meIUqqVIKn4SlyNxzhnJL7VqM29X6Q+un6GNosNRF?= =?us-ascii?Q?XdP5ssiPkEMXmJ+0+4w25F+AOew9ZIoWpCJFZLL7olgDI1AweQ8gAISG+Q6U?= =?us-ascii?Q?YRpKSIFvJmfo/CCAaz1mi+kazBluezaPJaCtGbP3A2iFX/Q8Xl146z4sueT0?= =?us-ascii?Q?/Y/HqJevE4R8lP1oUvxAyrcMffpj0mkHAIYMbXQB3YTUKXLpdP25VDL/oQW2?= =?us-ascii?Q?cnt0OhcKCRzE1fgD8UD4Ut42pabiMbwBKXdzXpHXzS4QaRoWyqYQ/p7RPEof?= =?us-ascii?Q?eY/Rf50Oijfkvao2ab+MkVRF1ZfuAlarpwWOdiURRbKUQnRIkJk2TuRPp++q?= =?us-ascii?Q?3PpUwDuG67qV7cyEVoNvWK6eO+1XOcmvjN1MsMx+H10Rqu0+A9R+2Rh7H5Vj?= =?us-ascii?Q?CIFi5gvqaiN4D5PI4CiGu86wyQVnuB6k4kIMB3u9zseIR2x94RpcQWIeE/kw?= =?us-ascii?Q?vHFL1cNW230Y1Of1jxqyJ/dgcN+eDLpLKkug/xQ7vdXnBZqNXZNZAZl2O12E?= =?us-ascii?Q?w/6sNai/RWBlcMJ81WDbPBo/eVCMiO2LCCx3NjQLgZJZ0oXt/83k2bqR39+d?= =?us-ascii?Q?Gxd/jKmd2gpWSloQCkuCKc2PPXp1Y1PTJqVfq1p9+UNd3diE1i7cx1IZxk7L?= =?us-ascii?Q?cIDnOTkC2F5zKBW3FCvQwhp7Df1aMYbbPKmRcGz0Ys+hRuP5cCHesNhE5frL?= =?us-ascii?Q?YAwVhrwfqrSBH7Uo8+hmR/X9uNHQjIiwgsP0IyFc/LCkEjjWAYA1PdBQHARv?= =?us-ascii?Q?4LQzmJJHPkNcsPPz9Uw4przdoeuz5ZF/mqTeBE8+MOWvmCNlns0W4L+xHD49?= =?us-ascii?Q?wYi3jAfBk4Jc57Vv8TjRbFe39rKJj6s1zYhFwwwPEeTYexef3hSEKHwRaCTB?= =?us-ascii?Q?rk9uP68xuAdocuumnqXB/f/wnMJ1GYAZM/UMnoWevI8MkegJojRdWe5I8hfS?= =?us-ascii?Q?DvUIA8KugOl/msLhU1gCWvM4JvgPnfIlI+Y?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3211; 6:qluzxect12RLQ1wA4LSzybeLeiigToKn2CO0v7rf+qcY34pAMuCHDtHmCHdogbJqx/lx3YZdDaidRjk/BoxUU/KktgdRBaVcP/jVFlCC7gGYHWQCgpYBuTndL8tdQDSYjOA10TIeDsavtrTU4+84Ccf3aZjKvCCIv5VOxqphdC+p3Lc3CAsobCOITaEx76hN6h6gGCs7eLlPyCkxQiFoB4CmQZFrx3J/cDODT8ID666sbDm5ntw29avSYgYDh20MR9w1h0Kkura60g2T6BjNytMixjH4oZQD1cA7TcIMzDpcyD8rQOxSDvbUwJXj3SwnW+uvzeNm22Ctsr8fWKeXAmKpy2YT+yGHcY3Xb06A3NY=; 5:Hx0Di3Y1qO6VGzJNUyO+j5NjSnf5eX4YMq0fq78fmUW8V+E9IDZ3SYyR8Di1VMds6R3tuJUXwV1O1aTpCuRKjIw5HDJOgwEgSwp0PUopWCcmunBBe/1cNqOrapYeA1V6sHpTXlYP/HJvafrKamkHY5bzvhpFPc+/c5Fcfry1avA=; 24:QF++IktcnBjDCS6LTAOI/NVRNJWHyakxZNA3zTvfh7QOoVp1/fW9w0pFFdz2KUL6twUwO8rqps3ZtEsbB4s3Se1ouYJrXJM1+fv3OXKTPsg=; 7:7tg6AC/jjaDpMw0aA8fwyRTTFKM93SjVNUEqUCVCLb6Frm+iDUAIciF35Mph+tMKn5kk7/vC1XLNY+SA4lgUo9gBavFrvatf9DxeFd/Wfg5dyPURZgpSKL2SM/vlq7Ys/BTEWozyRgrHwb9kXBDBC+oLCSFU9wvKKTFLmlzcfUhN2kyN4O/dgzHoqVhKQKZAxK5SCcHM2K7fErWekMa0KyOuzCzvRWq2m5+D7lYTgmOR/6ExK/44XkQPvpR3tqd5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2018 15:44:52.5322 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5cc529b6-5edc-4bbe-08ff-08d5538a18ed X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3211 Subject: [dpdk-dev] [PATCH v3] net/tap: add Rx interrupts 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: Thu, 04 Jan 2018 15:44:56 -0000 This patch adds support for registering and waiting for Rx interrupts. This allows applications to wait for Rx events from the PMD using the DPDK rte_epoll subsystem. Signed-off-by: Moti Haimovsky --- V3: Fixed coding style warnings. V2: Modifications according to inputs from Pascal Mazon * Removed unneeded counter limit check. --- doc/guides/nics/features/tap.ini | 1 + drivers/net/tap/Makefile | 1 + drivers/net/tap/rte_eth_tap.c | 17 ++++- drivers/net/tap/rte_eth_tap.h | 4 ++ drivers/net/tap/tap_intr.c | 138 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 drivers/net/tap/tap_intr.c diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini index f0e893d..8bc5187 100644 --- a/doc/guides/nics/features/tap.ini +++ b/doc/guides/nics/features/tap.ini @@ -7,6 +7,7 @@ Speed capabilities = P Link status = Y Link status event = Y +Rx interrupt = Y Jumbo frame = Y Promiscuous mode = Y Allmulticast mode = Y diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile index 405b49e..6636b77 100644 --- a/drivers/net/tap/Makefile +++ b/drivers/net/tap/Makefile @@ -54,6 +54,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += rte_eth_tap.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_flow.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_netlink.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_tcmsgs.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_intr.c include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 6b27679..7e6de68 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1127,7 +1127,7 @@ enum ioctl_mode { } static int -tap_intr_handle_set(struct rte_eth_dev *dev, int set) +tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) { struct pmd_internals *pmd = dev->data->dev_private; @@ -1152,6 +1152,20 @@ enum ioctl_mode { tap_dev_intr_handler, dev); } +static int +tap_intr_handle_set(struct rte_eth_dev *dev, int set) +{ + int err; + + err = tap_lsc_intr_handle_set(dev, set); + if (err) + return err; + err = tap_rx_intr_vec_set(dev, set); + if (err && set) + tap_lsc_intr_handle_set(dev, 0); + return err; +} + static const uint32_t* tap_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused) { @@ -1284,6 +1298,7 @@ enum ioctl_mode { pmd->intr_handle.type = RTE_INTR_HANDLE_EXT; pmd->intr_handle.fd = -1; + dev->intr_handle = &pmd->intr_handle; /* Presetup the fds to -1 as being not valid */ for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index 829f32f..fccc4b8 100644 --- a/drivers/net/tap/rte_eth_tap.h +++ b/drivers/net/tap/rte_eth_tap.h @@ -98,4 +98,8 @@ struct pmd_internals { struct rte_intr_handle intr_handle; /* LSC interrupt handle. */ }; +/* tap_intr.c */ + +int tap_rx_intr_vec_set(struct rte_eth_dev *dev, int set); + #endif /* _RTE_ETH_TAP_H_ */ diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c new file mode 100644 index 0000000..914c395 --- /dev/null +++ b/drivers/net/tap/tap_intr.c @@ -0,0 +1,138 @@ +/*- + * BSD LICENSE + * + * Copyright 2017 Mellanox + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file + * Interrupts handling for tap driver. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + + +/** + * Unregister Rx interrupts free the queue interrupt vector. + * + * @param dev + * Pointer to the tap rte_eth_dev structure. + */ +static void +tap_rx_intr_vec_uninstall(struct rte_eth_dev *dev) +{ + struct pmd_internals *pmd = dev->data->dev_private; + struct rte_intr_handle *intr_handle = &pmd->intr_handle; + + rte_intr_free_epoll_fd(intr_handle); + free(intr_handle->intr_vec); + intr_handle->intr_vec = NULL; + intr_handle->nb_efd = 0; +} + +/** + * Allocate Rx queue interrupt vector and register Rx interrupts. + * + * @param dev + * Pointer to the tap rte_eth_dev device structure. + * + * @return + * 0 on success, negative errno value otherwise and rte_errno is set. + */ +static int +tap_rx_intr_vec_install(struct rte_eth_dev *dev) +{ + struct pmd_internals *pmd = dev->data->dev_private; + unsigned int rxqs_n = pmd->dev->data->nb_rx_queues; + struct rte_intr_handle *intr_handle = &pmd->intr_handle; + unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID); + unsigned int i; + unsigned int count = 0; + + if (!dev->data->dev_conf.intr_conf.rxq) + return 0; + intr_handle->intr_vec = malloc(sizeof(intr_handle->intr_vec[rxqs_n])); + if (intr_handle->intr_vec == NULL) { + rte_errno = ENOMEM; + RTE_LOG(ERR, PMD, + "failed to allocate memory for interrupt vector," + " Rx interrupts will not be supported"); + return -rte_errno; + } + for (i = 0; i < n; i++) { + struct rx_queue *rxq = pmd->dev->data->rx_queues[i]; + + /* Skip queues that cannot request interrupts. */ + if (!rxq || rxq->fd <= 0) { + /* Use invalid intr_vec[] index to disable entry. */ + intr_handle->intr_vec[i] = + RTE_INTR_VEC_RXTX_OFFSET + + RTE_MAX_RXTX_INTR_VEC_ID; + continue; + } + intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + count; + intr_handle->efds[count] = rxq->fd; + count++; + } + if (!count) + tap_rx_intr_vec_uninstall(dev); + else + intr_handle->nb_efd = count; + return 0; +} + +/** + * Register or unregister the Rx interrupts. + * + * @param dev + * Pointer to the tap rte_eth_dev device structure. + * @param set + * should the operation be register or unregister the interrupts. + * + * @return + * 0 on success, negative errno value otherwise and rte_errno is set. + */ +int +tap_rx_intr_vec_set(struct rte_eth_dev *dev, int set) +{ + tap_rx_intr_vec_uninstall(dev); + if (set) + return tap_rx_intr_vec_install(dev); + return 0; +} -- 1.8.3.1