From patchwork Thu Feb 18 21:11:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renata Saiakhova X-Patchwork-Id: 87994 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66502A054A; Thu, 18 Feb 2021 22:12:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97F4D160836; Thu, 18 Feb 2021 22:11:59 +0100 (CET) Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-eopbgr120113.outbound.protection.outlook.com [40.107.12.113]) by mails.dpdk.org (Postfix) with ESMTP id D4FE2160833 for ; Thu, 18 Feb 2021 22:11:57 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B4aV6ZP4LBPqOBxADAoxZCfQyW99S2ugiq4QLgz/mI4/m4GCVZxvz+bIEHRctmObld/pS5O0j/dapbwSzYBqPuw79zMu0bDpY+4/G0lZLw6czTbWbUR6h8dzJepEVzhASa7g8UQnl0NQTK5NsIf+CnlcirysLcsCOH3OxJAnurYLBPeRSlE8I6mmWoR9pFIaqxogUeKvBkHZphO4lyOeuJKKg9ip0kTXfkkCSL8AMnlZyIHdBXlR0A7NoT7V8bmm+wZ9mcGdvjIqHg2vnyCTxgYUAGSX8k9+43S8dUj7/hNMXaX6e+r3Zy4z6rUxj2WXghgoIQ1X6qZqFSV4fRGMsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VMgMjQV5FeDqe2EvCUX302u1f0Xd66I15p94LsxvM2c=; b=Ggpp2xfBL3VE8sZTdaEvsoSgPXgJKCBGhtLUayYeMRK3hG3UJHAMo5fy/PsVtmIhQo79ECkYKdpGc8bgxCoOXXmabOc8Q+ZwR19nE8jbnT5npIFaYtpWdBPCl3w5c6yaIl41nj6qm1B8B2vNortHZBew954qDGKApe4JrtGv0VUi3k2oFkAQ2gX2A1BN7vwMRc8A7FIbelQgTjgBkXa5vkteHaJyJ+vJ3+GdDgXP7QujiHxuNrxfj478sJU0w6Voo+GzyV1Oya7Ozj8L+4+X9FAGrRZAiMFaeozaPAbeqj7J1ks2lSzYKNtoRbIvaBfXGHlmUbTULIupFxhqg7QoiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ekinops.com; dmarc=pass action=none header.from=ekinops.com; dkim=pass header.d=ekinops.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ekinops.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VMgMjQV5FeDqe2EvCUX302u1f0Xd66I15p94LsxvM2c=; b=FnFs9qYsN5hXTQsFGaATB9u4RklsPg4kv/a1hJJsDyBB/9syBFRIZsCuNEWyZqiMycUVeyIi/ehwEZBN2AQ9FRv9gzixsdReTgBN1XtgmjdGG7VGsGc6tzh0geXrGoqFNh+HXhreXjv1HP0KU2M7dBUrMI3Al2tgzfhr7NaqtkQ= Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=ekinops.com; Received: from PAZP264MB1413.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:188::5) by PAZP264MB1142.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:189::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.36; Thu, 18 Feb 2021 21:11:57 +0000 Received: from PAZP264MB1413.FRAP264.PROD.OUTLOOK.COM ([fe80::88bd:6160:5403:acdf]) by PAZP264MB1413.FRAP264.PROD.OUTLOOK.COM ([fe80::88bd:6160:5403:acdf%6]) with mapi id 15.20.3846.042; Thu, 18 Feb 2021 21:11:57 +0000 From: Renata Saiakhova To: Anatoly Burakov , Harman Kalra , Bruce Richardson , Ray Kinsella , Neil Horman Cc: dev@dpdk.org, Renata Saiakhova Date: Thu, 18 Feb 2021 22:11:37 +0100 Message-Id: <20210218211137.32154-2-Renata.Saiakhova@ekinops.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20210218211137.32154-1-Renata.Saiakhova@ekinops.com> References: <20210218211137.32154-1-Renata.Saiakhova@ekinops.com> X-Originating-IP: [91.183.184.98] X-ClientProxiedBy: AM0PR04CA0098.eurprd04.prod.outlook.com (2603:10a6:208:be::39) To PAZP264MB1413.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:188::5) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from renataOAB.oneaccess.intra (91.183.184.98) by AM0PR04CA0098.eurprd04.prod.outlook.com (2603:10a6:208:be::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Thu, 18 Feb 2021 21:11:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62013adf-3bca-4cc5-8d89-08d8d451d31c X-MS-TrafficTypeDiagnostic: PAZP264MB1142: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /cvaUdc8FqMkGQhEsskJB077EuDS2ga2FUdMbVrkrWd91BY+Vidlt7Phhw7iViPUg0Dy69cvB2vkpdzCNSImXnr7i4kHll3fcMwhZ+gY0ZNuqyxJBla347cvVG3hlrYQuO/HstWmISiBjQp01YpPTTM5Sw/iqC89WmiPmBDSJfd7XMpUx8XblQwvig+wWpBcFp3R+IwzSPISOshA6XTdYyjF5zB4kvG7Jv73w4GZsKykBk2Uu2aB8bHjdZHAQMhm6Pi/Mopk+OJEF4j1CH7yACCLoUlCsVuzTWbfz3D9g/1S/S3Co0nN6rG1+uFgBI6Auad/papBZH3jfmXo0Yf73vMHvpYJCBC7vl0HFG+v5bEIcoyNWsV/yEgIW6ci/HURJAXlUMsLqaR8soDxX5YQzoAHQHHUGhq1RxBO22FZda6nXt/fFuxvv67UAFi76SUM/1eYrHrDNTKJZqJ7yOenyUY0VXBshHDByW3uurp6tk5rdv/9VkVQRrUpQSuBGI9snUvw+KtOETALhNuX2USQJQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAZP264MB1413.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(376002)(39850400004)(366004)(346002)(136003)(396003)(6666004)(8676002)(956004)(8936002)(2906002)(83380400001)(4326008)(52116002)(2616005)(5660300002)(6512007)(316002)(1076003)(107886003)(36756003)(86362001)(478600001)(26005)(66476007)(110136005)(66556008)(66946007)(6506007)(16526019)(6486002)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: LnJDLxvzCLKNhJpd6c2snfZ0TDr2UZgAMOZIFqlLFI5y36e610A+NMggh9tWfl2juDT34CFlJ9OX3Z01tp2D+y04Fc5LpgcFyQQIf0cwb6Yx/MWrrUOqKcmRZdgcXuUXsCH3RxcEENwoQdwvaREzLpt04hifyjVSrXfELTJYP2Yp4JtXpFE4Og/8x5yUsLGpmIPCnqTM1H403VgvM+ODyNPXL4EuL7nmuHFuaFyRdyGYb3WUVEGwqeknpmUzJmNXsXXczvQga6bL4BuUDx18Pa3VcCKa0OghJfIu5aXU2jnfebClAdaONeTunrkLz3+ADUMAi/upzHHWnes3QFimlfeQUjGEF+fJnY5IU8zxGtsLwmeijyXzqqbG21DtZnEFrAZGPo03fNb5bptIl7m0cu4Dj5pD2i0mdQ/KpreNBlCzcLOOcW02qAgoYaXPCVbx6c6WvLxz2EyFar18Hv9DV7U4on7PjQYY7oHKyZXqGsMtxcYCQIZ6MvDW4GsgEKqQwcnT36qhvFgSbOATrQYCravWTimXrgXf9JeGKIBP7MU6b8VuWJk7ANyJT2ChNnSX7zsKWUOXaywWAu45QLpcH/Z7zEpmLgVXl3wO8HoEDOzLko3pV+9tKnmno2Out5FFRd98CFOJlZRbfZMJqj1VJeKP8ex6FiKbLzqDMKeHuQAnl9PbxFLqxamo66yct8eoxKA8AhbRiMp465MuCDir2SLB2HFGtri8il7x6KMe+6qsjo3zkRcBV7U4pV6Rj+Kv X-OriginatorOrg: ekinops.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62013adf-3bca-4cc5-8d89-08d8d451d31c X-MS-Exchange-CrossTenant-AuthSource: PAZP264MB1413.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2021 21:11:57.3224 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f57b78a6-c654-4771-a72f-837275f46179 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JCwPv98w8JP7K/E05LO2qhpAJ9iD/w7J/3c5s4aX4aosvovmTDEBVRM6SPT4ymem2SfSA1OvZk3KhvCfsqDLAPKEWYHSKlrCWSm58rwixjs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAZP264MB1142 Subject: [dpdk-dev] [PATCH v3 1/1] eal/interrupts: add synchronous wrapper around unregister X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Avoid race with unregister interrupt hanlder if interrupt source has some active callbacks at the moment, use wrapper around rte_intr_callback_unregister() to check for -EAGAIN return value and to loop until rte_intr_callback_unregister() succeeds. Signed-off-by: Renata Saiakhova Acked-by: Anatoly Burakov --- drivers/bus/pci/linux/pci_vfio.c | 2 +- lib/librte_eal/freebsd/eal_interrupts.c | 12 ++++++++++++ lib/librte_eal/include/rte_interrupts.h | 25 +++++++++++++++++++++++++ lib/librte_eal/linux/eal_interrupts.c | 12 ++++++++++++ lib/librte_eal/version.map | 1 + 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index e3f7b6abe..c14f7f8c4 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -414,7 +414,7 @@ pci_vfio_disable_notifier(struct rte_pci_device *dev) return -1; } - ret = rte_intr_callback_unregister(&dev->vfio_req_intr_handle, + ret = rte_intr_callback_unregister_sync(&dev->vfio_req_intr_handle, pci_vfio_req_handler, (void *)&dev->device); if (ret < 0) { diff --git a/lib/librte_eal/freebsd/eal_interrupts.c b/lib/librte_eal/freebsd/eal_interrupts.c index 72eeacbc1..86810845f 100644 --- a/lib/librte_eal/freebsd/eal_interrupts.c +++ b/lib/librte_eal/freebsd/eal_interrupts.c @@ -345,6 +345,18 @@ rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle, return ret; } +int +rte_intr_callback_unregister_sync(const struct rte_intr_handle *intr_handle, + rte_intr_callback_fn cb_fn, void *cb_arg) +{ + int ret = 0; + + while ((ret = rte_intr_callback_unregister(intr_handle, cb_fn, cb_arg)) == -EAGAIN) + rte_pause(); + + return ret; +} + int rte_intr_enable(const struct rte_intr_handle *intr_handle) { diff --git a/lib/librte_eal/include/rte_interrupts.h b/lib/librte_eal/include/rte_interrupts.h index e3b406abc..cc3bf45d8 100644 --- a/lib/librte_eal/include/rte_interrupts.h +++ b/lib/librte_eal/include/rte_interrupts.h @@ -94,6 +94,31 @@ rte_intr_callback_unregister_pending(const struct rte_intr_handle *intr_handle, rte_intr_callback_fn cb_fn, void *cb_arg, rte_intr_unregister_callback_fn ucb_fn); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Loop until rte_intr_callback_unregister() succeeds. + * After a call to this function, + * the callback provided by the specified interrupt handle is unregistered. + * + * @param intr_handle + * pointer to the interrupt handle. + * @param cb + * callback address. + * @param cb_arg + * address of parameter for callback, (void *)-1 means to remove all + * registered which has the same callback address. + * + * @return + * - On success, return the number of callback entities removed. + * - On failure, a negative value. + */ +__rte_experimental +int +rte_intr_callback_unregister_sync(const struct rte_intr_handle *intr_handle, + rte_intr_callback_fn cb, void *cb_arg); + /** * It enables the interrupt for the specified handle. * diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/librte_eal/linux/eal_interrupts.c index 1dd994bd1..22b3b7bcd 100644 --- a/lib/librte_eal/linux/eal_interrupts.c +++ b/lib/librte_eal/linux/eal_interrupts.c @@ -662,6 +662,18 @@ rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle, return ret; } +int +rte_intr_callback_unregister_sync(const struct rte_intr_handle *intr_handle, + rte_intr_callback_fn cb_fn, void *cb_arg) +{ + int ret = 0; + + while ((ret = rte_intr_callback_unregister(intr_handle, cb_fn, cb_arg)) == -EAGAIN) + rte_pause(); + + return ret; +} + int rte_intr_enable(const struct rte_intr_handle *intr_handle) { diff --git a/lib/librte_eal/version.map b/lib/librte_eal/version.map index fce90a112..56caa9cc9 100644 --- a/lib/librte_eal/version.map +++ b/lib/librte_eal/version.map @@ -318,6 +318,7 @@ EXPERIMENTAL { rte_fbarray_find_rev_biggest_free; rte_fbarray_find_rev_biggest_used; rte_intr_callback_unregister_pending; + rte_intr_callback_unregister_sync; rte_realloc_socket; # added in 19.08