From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0043.outbound.protection.outlook.com [104.47.1.43]) by dpdk.org (Postfix) with ESMTP id 95CE3A84C for ; Wed, 24 Jan 2018 17:12:25 +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=KderSdE6codw5M337XHwBbNwzJu6CZuytu3n7voaAZw=; b=v08hSSSM9UoOReJuXuYfBxRlpcPSvE+qJLwGQ4nufNMsVirwsY0Gw5iHhq6+aE/HLLk1XJH9wrhtYZrLH59206J2Es8ALRyH5JBPNZU9Dyt/LA3bFzZKL1B2hi355mFVpPCoUICByidrueYXWLH54QoM/HBbwuanZJn+MumvLD4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from mellanox.com (37.142.13.130) by DB6PR05MB3205.eurprd05.prod.outlook.com (2603:10a6:6:1a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Wed, 24 Jan 2018 16:12:23 +0000 From: Moti Haimovsky To: gaetan.rivet@6wind.com, ferruh.yigit@intel.com Cc: dev@dpdk.org, Moti Haimovsky Date: Wed, 24 Jan 2018 18:12:07 +0200 Message-Id: <1516810328-39383-3-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516810328-39383-1-git-send-email-motih@mellanox.com> References: <1516733000-1850-3-git-send-email-motih@mellanox.com> <1516810328-39383-1-git-send-email-motih@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: DB6PR0402CA0003.eurprd04.prod.outlook.com (2603:10a6:4:91::13) To DB6PR05MB3205.eurprd05.prod.outlook.com (2603:10a6:6:1a::31) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ddc83a0-9250-4fd6-4656-08d56345416f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:DB6PR05MB3205; X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3205; 3:K794N9obCxJ5/ZwPWqJs9yxVI6HA8XBToIEp3cieFlWoEcOYTSVGb8Yg/2prCgSAVpPTmhFMlUV8+ZJon1qG5VZ3LSOZFkfZ9O1ZRmFQMU9pHXB8tGjRG/hziwVXCW2MvHKHRHFw9D2QzbetMTHRxK3EcLgM6AsmJUlag8ZRpA9/ZqGdZyiFo2UcndW/Qf8EB6I3Omb9ve70ZiL8ZzVYYcEmn1ZD6img2vR0rNyRGUJjGoERukMGYibAqnTawb8U; 25:B2mH7ov79gzASW6aF1g3cfGOn3IK6EbsVVpxzmHtslSHPJhuBPRciovO3pMCM+tUTZVuFw51TrcJP/Uo+n9mHPJAnzjgfvvkaEDYxw7uPoaix8ctVF+12CGL/yIP4WmhTG6DpocllZwhQbV7TeuAOl+6Pj7H+2HlbNFoHn/r6/WoCPc17NFdCjhMpv7EBhyzCj7MbqSDXcIrKXqjVvZ9MXlMfEE3Tu0lFkFeq5UnhpVdDZj3sDqXIwysQcmRWr8ZZE8ThYUoBJ2W2ALan/aCxie6U4T4bdhkJli1+CJNSoZPYFN4fhD94mk+Ohz8cC2DQ+dizKJb+jY1lQG50U9gJg==; 31:8CcRpq3ndO8WceCcR/QI9sNOEHaNR/PwahmJ7pGNVmaTVpRXs4e/uYCRwcB+Z40j0NklHJ/59ldREzRGNzdiUsPchVBXQbuxi6e71wf+1yhIrJFQCHnJvho6tR+GBz/P0GfAhoR5M8JvZbPyMqRbem2XBrAugSIx6gbVIUvVMCPZVw5PPCXo97SKcydDfplJZDYmr5YQN2qNmYRtNpJec0th2HnzXMUNdsepf0tIFVw= X-MS-TrafficTypeDiagnostic: DB6PR05MB3205: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3205; 20:+xbFg2IFvIGEEkTph9IBB64sJhI4O7DIKyzNPRZ5ntU08u3MvQ/pbGQmRpXU1CkWAkQtZO2gtp7NyWE4z6VqTTjX9tHL9mrG746PH/HaxPMf6Nf0v/HeeyL3amGRvOVCOOgsA9Hig7K2lkFAZ9u+McVl4VdgGvFeJS92YFhWG4ZRuFSNDFiaBwRWqrNG0xP6xTvWSUeJBJCJJQJUFwak/CuAyAgOpry9iO6soeZYRcTUJdwRSgeiOJ5O+7vdLqcJ+qIv7Yxg9e2qRfLmLPFkOUu6+c2+fWMRLGabp2OZVe/maF8wGrfmxS2OVl1ZHZDYrKfR6zMamHuOA7CjLWX9ZJKoZZgl39z87Ym7uzQWeaCsudzYdmyMMusHVNyn4frK1FftjwU9PcpFKtfpdy3tH/Wi8I45WxamFlchivP2MBkfe+Ygem/rxroukDuTS8v1i1u8U+QuLt9zGWDebUBmKFrIsyba69O77Slf4t1uGxnuHH0Uv/Jheb4NONK8D79k; 4:apc0RwheEwlRKU55FGM6Fvo+Jrvl5h+uWhWlAg/t4OUt4r+Bp9KuwuiVMInxrRR2fALwjpZsx0+KY1zfskZAa+2Gt9HssUnXUZOXoDbeQgFPWmoIomdz9TtZS5R0HufMdhqXl+2xj1KTFIneJJbWfSvr6VKS8sRhpvYYK9vMc3yqXR8hNN3zFD2foGe/mrx0/dED7rNEKkJ7Hw2WPr6uralYipelmJRYgsIGY/SoAP/DHbHfLgUk6+zXI9TvK62Lx/t6ZMF5YoneVheLHVVlXw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3231023)(2400081)(944501161)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR05MB3205; BCL:0; PCL:0; RULEID:; SRVR:DB6PR05MB3205; X-Forefront-PRVS: 056297E276 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39860400002)(39380400002)(396003)(199004)(189003)(47776003)(4326008)(2906002)(66066001)(316002)(106356001)(50466002)(48376002)(7736002)(21086003)(25786009)(69596002)(6116002)(3846002)(305945005)(107886003)(478600001)(5660300001)(76176011)(50226002)(386003)(68736007)(8936002)(26005)(59450400001)(97736004)(16526018)(53936002)(36756003)(105586002)(4720700003)(6666003)(86362001)(33026002)(575784001)(8676002)(51416003)(16586007)(52116002)(81166006)(81156014)(7696005)(55016002)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR05MB3205; 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; DB6PR05MB3205; 23:FwA0YSZxJ7y5sXzxi3trW2N3rMGDa7sxd2eCjkYMF?= =?us-ascii?Q?d9lZS6vZqWYlSWcjP/5RAI+HhhEVDiT5d1hP8vZbBRfjVubxSIfLCZ/40JIv?= =?us-ascii?Q?nHkgfUX6p1KQBxy7H+9DznN1t35NgKFKagH4Z0Dpt2If8RVp83HPQ032OlUv?= =?us-ascii?Q?jP8JW11g34421B9DhmX7CBkvZsyIc3KhCyJNkIqnnpmc6vu8rqFcisx4/4I4?= =?us-ascii?Q?eBQr37Dtycb7jmy+OlINyVAKTmrv0YtsrwyzsAOq5xpcaT0qf2sGBMmCMfOf?= =?us-ascii?Q?+93Iqge8biKHx279eq+w0jTZsfv/m25eiLgvQVEtrmfsfQWKycgUVksuerKS?= =?us-ascii?Q?w0DnYwIfevygxJf2fmQdmOQKe/ejGz2/IxaMqJMyuuCw50vuG7VOBv6EbkE5?= =?us-ascii?Q?gmWEgo04gxPpimFB11TZXkTX5DbV7MJDxL1+fy0g7m3srHrmGJhPLcgyjg5X?= =?us-ascii?Q?xBlGy8Q/KADt38SqWFRd4qrRNfOgrqBXyFvt8vXLcsUmXldhrQceP2os6NfL?= =?us-ascii?Q?W/KGZXg1TXXXY0hm9EYywJuQUGmgwgi7p+BaW4MQjMZSz/EHf5sZV7kbC3RK?= =?us-ascii?Q?aZVPSuVVXKHa/inpXocDkiIv2OdwtsEhVdNV6i8zyHLaPZnRAbXUqvFKYLh1?= =?us-ascii?Q?60RusRJ9z52GdV4iBK1gb9GI51BxKRXBaWA+gy0QqheZj3vVcKJh2tk/2PIL?= =?us-ascii?Q?d3MvxdYHxwWu6vNCBpuvMYsyBFct9Z/XOe4b9j+d5eP5gmdxN4Qj7CTs2kZS?= =?us-ascii?Q?JEARISvlAoQ+/OSzupEErULo8k7iUMFwaV5aUI4tPn2EQj/JYGXCf4bX9QUi?= =?us-ascii?Q?nUz89yZfeIow49scr27rdVF+3IcVTgeKdPjndNaSmpmmqDQ5jFV+6OkvD71i?= =?us-ascii?Q?LZY6E3zMz9/f0dybBblJhiYiLwrzzp8Hq9ooJiXqHYtzBNnnY8xY6354Jo9X?= =?us-ascii?Q?5l9JyQ1tH2/GgFHJYHP1byjsDKgk7fO9U05cHNkKwzZq/SlqW+lVIHYNfToU?= =?us-ascii?Q?TLm3lYW119V3WsCfkf1no/Pxhqyb4Pjgkp4fgq7SltvVD+Ul2zwVHGnR/jei?= =?us-ascii?Q?52l2uTHYDX4gwEJ82UaEu4Myozl/35JdzGtg67q0KtBmoUB4hZaUS0x+RAJC?= =?us-ascii?Q?grDs6KbfVwU1EBsUXXlJLDIPdAuyFqqvvk4pzOyYtBMM1WA5/BHXRMpgp1hf?= =?us-ascii?Q?6OH1IwcQTL95wDWoFyolmlHFUCV0FQ4Iz40?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3205; 6:LkIKnO48BbY9LjQ7Si/VXuNBZN/u0wQoLpP/xuQYnI+jMRsgoVi2NJ5rB4I259uMRnB/ewvdG7nfxTLf1csc4HmHkdq705X5qMV2la2/4OWz1rWV/sSYZFAcc5H8zxG4qWFGTA8Z/GqRN48C6+3gbbkMfmLeBw6HPqvvPN8UGlMUD4qyPY2XYLFwojgqIqb7VVjl66SGKQ7xh0GewYhnwJnqFNvujUqSGppIRKggUmKEUDd7rNT0f26zWNbY++PL2vcOLTrNr5Xpd08/9cdxNmsCvoqgoKnEbFflWqEzqZ9Z66WIavO5eem4++yywkpXs1L8lV2LINKrtwLXLR/GP1j4RlWDOwdI4rJajbO4q0U=; 5:vHqzC1Jidm43WXjwoY3TYmZHpm4vkNdTqqxWeTdbZEGxRX6o14QS/wTTz0RDW0Vujg98NwtJBk16jFpa7Gu28N8qH6jgjkzZlBVIrApZXqEWTbaWh82AKsVm2IOcGqRolvARjpvBDWwDUgJosYSzB8waE095JP2igI6XvpT9cQM=; 24:e5Chx/Ou2HJX57dS1AakQe2VcA2SbZZzRKL8p8uclTChNbYOZgj4t3j0OwrXej4SldFhi5QP+oTsssWqicXd9C8MzyVqVFCXYTt/UI0zNKs=; 7:u/x5xLoILGR3xWxAXWiaN5MerdzsyJxSxWRHaxrk2YAdORUcJD/nqVa+kOoEUg6wSqqJAKrScYcPPn7ogTyPl5RFa5IDTVS6y50onMPVlGMSNqgL4bl2OC1J/T3IV0qxj8FJCKdtcDEE6he5CM/Lovmabu4x9t3KWLeU+apHo/JJ8cGVXXG5nCXcBMep0AraUrFsd8bszBvmjYgft2gVX2fUltp0f0uUFC/B98PCeABkvcsaoP9gSaf7PmsjVskX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2018 16:12:23.7310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ddc83a0-9250-4fd6-4656-08d56345416f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR05MB3205 Subject: [dpdk-dev] [PATCH v6 2/3] net/failsafe: slaves Rx interrupts registration 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: Wed, 24 Jan 2018 16:12:25 -0000 This commit adds the following functionality to failsafe PMD: * Register and unregister slaves Rx interrupts. * Enable and Disable slaves Rx interrupts. The interrupts events generated by the slaves are not handled in this commit. Signed-off-by: Moti Haimovsky --- V6: Added a wrapper around epoll_create1 since it is not supported in FreeBSD. See: 1516193643-130838-1-git-send-email-motih@mellanox.com V5: Initial version of this patch in accordance to inputs from Gaetan Rivet in reply to 1516354344-13495-2-git-send-email-motih@mellanox.com --- drivers/net/failsafe/Makefile | 5 + drivers/net/failsafe/failsafe_epoll.h | 10 ++ drivers/net/failsafe/failsafe_epoll_bsdapp.c | 19 +++ drivers/net/failsafe/failsafe_epoll_linuxapp.c | 18 +++ drivers/net/failsafe/failsafe_ether.c | 1 + drivers/net/failsafe/failsafe_intr.c | 198 +++++++++++++++++++++++++ drivers/net/failsafe/failsafe_ops.c | 36 ++++- drivers/net/failsafe/failsafe_private.h | 16 ++ 8 files changed, 301 insertions(+), 2 deletions(-) create mode 100644 drivers/net/failsafe/failsafe_epoll.h create mode 100644 drivers/net/failsafe/failsafe_epoll_bsdapp.c create mode 100644 drivers/net/failsafe/failsafe_epoll_linuxapp.c diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile index 91a734b..4e6a983 100644 --- a/drivers/net/failsafe/Makefile +++ b/drivers/net/failsafe/Makefile @@ -47,6 +47,11 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_epoll_linuxapp.c +else +SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_epoll_bsdapp.c +endif # No exported include files diff --git a/drivers/net/failsafe/failsafe_epoll.h b/drivers/net/failsafe/failsafe_epoll.h new file mode 100644 index 0000000..8e6a1ec --- /dev/null +++ b/drivers/net/failsafe/failsafe_epoll.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 Mellanox Technologies, Ltd. + */ + +#ifndef _RTE_ETH_FAILSAFE_EPOLL_H_ +#define _RTE_ETH_FAILSAFE_EPOLL_H_ + +int failsafe_epoll_create1(int flags); + +#endif /* _RTE_ETH_FAILSAFE_EPOLL_H_*/ diff --git a/drivers/net/failsafe/failsafe_epoll_bsdapp.c b/drivers/net/failsafe/failsafe_epoll_bsdapp.c new file mode 100644 index 0000000..46c839b --- /dev/null +++ b/drivers/net/failsafe/failsafe_epoll_bsdapp.c @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 Mellanox Technologies, Ltd. + */ + +/** + * @file + * epoll wrapper for failsafe driver. + */ + +#include + +#include "failsafe_epoll.h" + +int +failsafe_epoll_create1(int flags) +{ + RTE_SET_USED(flags); + return -ENOTSUP; +} diff --git a/drivers/net/failsafe/failsafe_epoll_linuxapp.c b/drivers/net/failsafe/failsafe_epoll_linuxapp.c new file mode 100644 index 0000000..d82ee0a --- /dev/null +++ b/drivers/net/failsafe/failsafe_epoll_linuxapp.c @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 Mellanox Technologies, Ltd. + */ + +/** + * @file + * epoll wrapper for failsafe driver. + */ + +#include + +#include "failsafe_epoll.h" + +int +failsafe_epoll_create1(int flags) +{ + return epoll_create1(flags); +} diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c index 8a4cacf..0f1630e 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -283,6 +283,7 @@ return; switch (sdev->state) { case DEV_STARTED: + failsafe_rx_intr_uninstall_subdevice(sdev); rte_eth_dev_stop(PORT_ID(sdev)); sdev->state = DEV_ACTIVE; /* fallthrough */ diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c index 54ef2f4..512efc7 100644 --- a/drivers/net/failsafe/failsafe_intr.c +++ b/drivers/net/failsafe/failsafe_intr.c @@ -9,8 +9,198 @@ #include +#include "failsafe_epoll.h" #include "failsafe_private.h" +#define NUM_RX_PROXIES (FAILSAFE_MAX_ETHPORTS * RTE_MAX_RXTX_INTR_VEC_ID) + +/** + * Install failsafe Rx event proxy subsystem. + * This is the way the failsafe PMD generates Rx events on behalf of its + * subdevices. + * + * @param priv + * Pointer to failsafe private structure. + * @return + * 0 on success, negative errno value otherwise and rte_errno is set. + */ +static int +fs_rx_event_proxy_install(struct fs_priv *priv) +{ + int rc = 0; + + /* + * Create the epoll fd and event vector for the proxy service to + * wait on for Rx events generated by the subdevices. + */ + priv->rxp.efd = failsafe_epoll_create1(0); + if (priv->rxp.efd < 0) { + rte_errno = errno; + ERROR("Failed to create epoll," + " Rx interrupts will not be supported"); + return -rte_errno; + } + priv->rxp.evec = calloc(NUM_RX_PROXIES, sizeof(*priv->rxp.evec)); + if (priv->rxp.evec == NULL) { + ERROR("Failed to allocate memory for event vectors," + " Rx interrupts will not be supported"); + rc = -ENOMEM; + goto error; + } + return 0; +error: + if (priv->rxp.efd >= 0) { + close(priv->rxp.efd); + priv->rxp.efd = -1; + } + if (priv->rxp.evec != NULL) { + free(priv->rxp.evec); + priv->rxp.evec = NULL; + } + rte_errno = -rc; + return rc; +} + +/** + * RX Interrupt control per subdevice. + * + * @param sdev + * Pointer to sub-device structure. + * @param op + * The operation be performed for the vector. + * Operation type of {RTE_INTR_EVENT_ADD, RTE_INTR_EVENT_DEL}. + * @return + * - On success, zero. + * - On failure, a negative value. + */ +static int +failsafe_eth_rx_intr_ctl_subdevice(struct sub_device *sdev, int op) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev *fsdev; + int epfd; + uint16_t pid; + uint16_t qid; + struct rxq *fsrxq; + int rc; + int ret = 0; + + if (sdev == NULL || (ETH(sdev) == NULL) || + sdev->fs_dev == NULL || (PRIV(sdev->fs_dev) == NULL)) { + ERROR("Called with invalid arguments"); + return -EINVAL; + } + dev = ETH(sdev); + fsdev = sdev->fs_dev; + epfd = PRIV(sdev->fs_dev)->rxp.efd; + pid = PORT_ID(sdev); + + if (epfd <= 0) { + if (op == RTE_INTR_EVENT_ADD) { + ERROR("Proxy events are not initialized"); + return -EBADFD; + } else { + return 0; + } + } + if (dev->data->nb_rx_queues > fsdev->data->nb_rx_queues) { + ERROR("subdevice has too many queues," + " Interrupts will not be enabled"); + return -E2BIG; + } + for (qid = 0; qid < dev->data->nb_rx_queues; qid++) { + fsrxq = fsdev->data->rx_queues[qid]; + rc = rte_eth_dev_rx_intr_ctl_q(pid, qid, epfd, + op, (void *)fsrxq); + if (rc) { + ERROR("rte_eth_dev_rx_intr_ctl_q failed for " + "port %d queue %d, epfd %d, error %d", + pid, qid, epfd, rc); + ret = rc; + } + } + return ret; +} + +/** + * Install Rx interrupts subsystem for a subdevice. + * This is a support for dynamically adding subdevices. + * + * @param sdev + * Pointer to subdevice structure. + * + * @return + * 0 on success, negative errno value otherwise and rte_errno is set. + */ +int failsafe_rx_intr_install_subdevice(struct sub_device *sdev) +{ + int rc; + int qid; + struct rte_eth_dev *fsdev; + struct rxq **rxq; + const struct rte_intr_conf *const intr_conf = + Ð(sdev)->data->dev_conf.intr_conf; + + fsdev = sdev->fs_dev; + rxq = (struct rxq **)fsdev->data->rx_queues; + if (intr_conf->rxq == 0) + return 0; + rc = failsafe_eth_rx_intr_ctl_subdevice(sdev, RTE_INTR_EVENT_ADD); + if (rc) + return rc; + /* enable interrupts on already-enabled queues */ + for (qid = 0; qid < ETH(sdev)->data->nb_rx_queues; qid++) { + if (rxq[qid]->enable_events) { + int ret = rte_eth_dev_rx_intr_enable(PORT_ID(sdev), + qid); + if (ret && (ret != -ENOTSUP)) { + ERROR("Failed to enable interrupts on " + "port %d queue %d", PORT_ID(sdev), qid); + rc = ret; + } + } + } + return rc; +} + +/** + * Uninstall Rx interrupts subsystem for a subdevice. + * This is a support for dynamically removing subdevices. + * + * @param sdev + * Pointer to subdevice structure. + * + * @return + * 0 on success, negative errno value otherwise and rte_errno is set. + */ +void failsafe_rx_intr_uninstall_subdevice(struct sub_device *sdev) +{ + int qid; + + for (qid = 0; qid < ETH(sdev)->data->nb_rx_queues; qid++) + rte_eth_dev_rx_intr_disable(PORT_ID(sdev), qid); + failsafe_eth_rx_intr_ctl_subdevice(sdev, RTE_INTR_EVENT_DEL); +} + +/** + * Uninstall failsafe Rx event proxy. + * + * @param priv + * Pointer to failsafe private structure. + */ +static void +fs_rx_event_proxy_uninstall(struct fs_priv *priv) +{ + if (priv->rxp.evec != NULL) { + free(priv->rxp.evec); + priv->rxp.evec = NULL; + } + if (priv->rxp.efd > 0) { + close(priv->rxp.efd); + priv->rxp.efd = -1; + } +} + /** * Uninstall failsafe interrupt vector. * @@ -107,8 +297,12 @@ failsafe_rx_intr_uninstall(struct rte_eth_dev *dev) { struct fs_priv *priv; + struct rte_intr_handle *intr_handle; priv = PRIV(dev); + intr_handle = &priv->intr_handle; + rte_intr_free_epoll_fd(intr_handle); + fs_rx_event_proxy_uninstall(priv); fs_rx_intr_vec_uninstall(priv); dev->intr_handle = NULL; } @@ -133,6 +327,10 @@ return 0; if (fs_rx_intr_vec_install(priv) < 0) return -rte_errno; + if (fs_rx_event_proxy_install(priv) < 0) { + fs_rx_intr_vec_uninstall(priv); + return -rte_errno; + } dev->intr_handle = &priv->intr_handle; return 0; } diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index d6a82b3..2ea9cdd 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -214,6 +214,13 @@ continue; return ret; } + ret = failsafe_rx_intr_install_subdevice(sdev); + if (ret) { + if (!fs_err(sdev, ret)) + continue; + rte_eth_dev_stop(PORT_ID(sdev)); + return ret; + } sdev->state = DEV_STARTED; } if (PRIV(dev)->state < DEV_STARTED) @@ -231,6 +238,7 @@ PRIV(dev)->state = DEV_STARTED - 1; FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_STARTED) { rte_eth_dev_stop(PORT_ID(sdev)); + failsafe_rx_intr_uninstall_subdevice(sdev); sdev->state = DEV_STARTED - 1; } failsafe_rx_intr_uninstall(dev); @@ -413,6 +421,10 @@ fs_rx_intr_enable(struct rte_eth_dev *dev, uint16_t idx) { struct rxq *rxq; + struct sub_device *sdev; + uint8_t i; + int ret; + int rc = 0; if (idx >= dev->data->nb_rx_queues) { rte_errno = EINVAL; @@ -424,14 +436,26 @@ return -rte_errno; } rxq->enable_events = 1; - return 0; + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { + ret = rte_eth_dev_rx_intr_enable(PORT_ID(sdev), idx); + ret = fs_err(sdev, ret); + if (ret) + rc = ret; + } + if (rc) + rte_errno = -rc; + return rc; } static int fs_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx) { struct rxq *rxq; + struct sub_device *sdev; uint64_t u64; + uint8_t i; + int rc = 0; + int ret; if (idx >= dev->data->nb_rx_queues) { rte_errno = EINVAL; @@ -443,10 +467,18 @@ return -rte_errno; } rxq->enable_events = 0; + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { + ret = rte_eth_dev_rx_intr_disable(PORT_ID(sdev), idx); + ret = fs_err(sdev, ret); + if (ret) + rc = ret; + } /* Clear pending events */ while (read(rxq->event_fd, &u64, sizeof(uint64_t)) > 0) ; - return 0; + if (rc) + rte_errno = -rc; + return rc; } static bool diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 419e5e7..ff78b9f 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -63,6 +63,13 @@ /* TYPES */ +struct rx_proxy { + /* epoll file descriptor */ + int efd; + /* event vector to be used by epoll */ + struct rte_epoll_event *evec; +}; + struct rxq { struct fs_priv *priv; uint16_t qid; @@ -158,6 +165,13 @@ struct fs_priv { */ enum dev_state state; struct rte_eth_stats stats_accumulator; + /* + * Rx interrupts/events proxy. + * The PMD issues Rx events to the EAL on behalf of its subdevices, + * it does that by registering an event-fd for each of its queues with + * the EAL. + */ + struct rx_proxy rxp; unsigned int pending_alarm:1; /* An alarm is pending */ /* flow isolation state */ int flow_isolated:1; @@ -167,6 +181,8 @@ struct fs_priv { int failsafe_rx_intr_install(struct rte_eth_dev *dev); void failsafe_rx_intr_uninstall(struct rte_eth_dev *dev); +int failsafe_rx_intr_install_subdevice(struct sub_device *sdev); +void failsafe_rx_intr_uninstall_subdevice(struct sub_device *sdev); /* MISC */ -- 1.8.3.1