From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 157F1431D5 for ; Sun, 22 Oct 2023 16:29:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E56840A79; Sun, 22 Oct 2023 16:29:49 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2066.outbound.protection.outlook.com [40.107.212.66]) by mails.dpdk.org (Postfix) with ESMTP id 95CAC40A79 for ; Sun, 22 Oct 2023 16:29:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VuwbxdpSUT8hfkmHa3i05HTqholMQxK84gaP8IAxo8v90/t7P7XACJXnNrTCncoiYZUSKcDnEtQn4SAH5UUUDe761VeAktzKLHVHOrD1x9xefmUgysnRfTAOTmw+jMRIWY4FyD+m3256iHRS5RZYDUfzhcX/tVCuTPTjeR/zGjtRgR/7KK9ATQdkmEu9VNVkx6VMoUuhNHq11kk1w1k2rSzGNsXMhqL7m4bJiPtrgBFgcYYD9ImNPzmjZArqt7NPP0Cjbpn2/1iIjpFJULrQNGNfm7PHa5oBpbwBZOzzmnHIVIpvEtq/tBJPl7XpGZ9JvNH/6ko8deXiaBYu6GeQiA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h2hvtT+S1+Y0Y46JLdHb8i1ICf1rigofLfchECzC5ts=; b=GgYDrVy+Rhta10VuXL19aF12DVsiLscVt5OsyUKxkpCHgX4dPN11IgaGZmrMxpdDOeLtw7YioLzwjUP1ZrYg06e8+brdO4agzeszxUig0ZfJT7zJcKohBztzaG8HNKakDIxg0yiAn2dyHU8wOsAg90HOnQisXHBQvG0+ChYyiZ0b3lXlgbKSn9BQ0xS/4C0LAcDPt7cCNfKivCyf1HNiU1nllX57P5EAgYbk4gWfPcHxemjSOG/1DQDzHisehK+CZFYXXNtaMq393eZsLvUEGrfDFPdIF0jj6CyVXPInG2l+VQ53y10zAMGxZHpt//KUFxjelLlw3ORM1RLMZfJcYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h2hvtT+S1+Y0Y46JLdHb8i1ICf1rigofLfchECzC5ts=; b=i8eYZhAeVdEXNE0onEfbHRH9nYzJ1ME6mtsxdV5y7i1UhkN267rJYGiead4sNcn/zu/R4Q8+tEgmtyDew+8AWKJXEnxfQA5neYYS5ZJb2ON7iXsjnBy3yK9f5KGCzbd8UKTFTdt979SlomrRUKRuUXdQAPR+IiO9Rg7YixbwDwplRyuwftx4eSQUFa8o5xVPAwpm/dHdTMYvmJmRGYeyY9Fv8mJbErwgU9rNIDTirZiMLAxQI+CRGcMP/BY+22ITgFNuf1L2mLd9weAJlPcRs7yChxEQkhSvFv32q+ndxCBI3RkwiMQZx8YxqzcdaS2NG3agBpjpFZNRnvSCuAwcug== Received: from DM5PR07CA0058.namprd07.prod.outlook.com (2603:10b6:4:ad::23) by CH0PR12MB5252.namprd12.prod.outlook.com (2603:10b6:610:d3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sun, 22 Oct 2023 14:29:45 +0000 Received: from CY4PEPF0000EE33.namprd05.prod.outlook.com (2603:10b6:4:ad:cafe::d5) by DM5PR07CA0058.outlook.office365.com (2603:10b6:4:ad::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Sun, 22 Oct 2023 14:29:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE33.mail.protection.outlook.com (10.167.242.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:29:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:29:43 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:29:41 -0700 From: Xueming Li To: Yajun Wu CC: Matan Azrad , Maxime Coquelin , dpdk stable Subject: patch 'vdpa/mlx5: fix unregister kick handler order' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:47 +0800 Message-ID: <20231022142250.10324-79-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE33:EE_|CH0PR12MB5252:EE_ X-MS-Office365-Filtering-Correlation-Id: e250829b-6d7f-44ce-b33f-08dbd30b56c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 12DpYAeIdI/NGPEKmQzXLhT3R3IpIW/73gJFuEDj5ycDtk2i8+FvjbfEHZjkEOyH54mBGEOdhTe70r5IUAhJ78cCKc7TySCHzHvX7h0ndPQe+AAXyF5502K1hJSqROAMI/WbM3e1fD8VnrFoRO4uo2gq6dfG8ye57/7jBG3Lh5ogOk1MSOxmPNcpmpruSPnUKpw/LI9h9/4vHu53Bb757ltFaDGkiqEccUjfHJTS/x1tviQf+kT+RXCwnot8OLQ35h7iY7GmhqbyoCxh+7m5w1MfifLpDIoJtD5ZhL8jN4AE5d81pG9Co4oVuxWTE8RUn+tckpNrpjTT7FefLErAvr+dILwk/VoYrz/sIRFaPbrtgLlLA8e/wKR1XCDkag0jQrar9SBYsRKIW0hnRnd7fGSjs9wd8HrYyP/EdPJrUd2FOwvOKINKaoxKNnNtsRqRYKBP9Z64Hf68uMROS3PYSgNcQ2vfSVgURk5XNXS/n8NnwnZaZh4GuzCYIuudda1GAD75qqhKyQz5aYYR5GEU2jLTL5mRd9xwids9ZLqzuS1W4d1me4W5cZlFkZI5l9Z+/k8/NmPUDhoVaMECheDksLb7hn/1e1epBXjZx+jWioxud7osO2gHhjxruUQxF3ts3Jlw3rEHZWqWxmH8gtJ4Z4WIVHKAL2ljQWA/SodM2zwCCiQvSG3g+xg7fZ+pGQzvAelnb6KPLXPzomZq3xSQZgepWzrmXC3ySnlVGqCpFwJz2gQVClURyUx6wvyXTfT6 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(39860400002)(346002)(136003)(396003)(230922051799003)(186009)(451199024)(82310400011)(64100799003)(1800799009)(46966006)(36840700001)(6286002)(4001150100001)(26005)(2906002)(55016003)(36860700001)(41300700001)(86362001)(5660300002)(36756003)(6862004)(8676002)(8936002)(4326008)(2616005)(7636003)(7696005)(478600001)(16526019)(1076003)(37006003)(356005)(82740400003)(316002)(70206006)(54906003)(70586007)(6636002)(83380400001)(966005)(40480700001)(53546011)(426003)(336012)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:29:45.5548 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e250829b-6d7f-44ce-b33f-08dbd30b56c5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE33.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5252 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=9e7a4f889b0ca1755be668113f3ae991927c38a0 Thanks. Xueming Li --- >From 9e7a4f889b0ca1755be668113f3ae991927c38a0 Mon Sep 17 00:00:00 2001 From: Yajun Wu Date: Tue, 8 Aug 2023 19:32:21 +0800 Subject: [PATCH] vdpa/mlx5: fix unregister kick handler order Cc: Xueming Li [ upstream commit 72ec059a1ca91c52c6139cfc32133d643f709986 ] The mlx5_vdpa_virtq_kick_handler function may still be running and waiting on virtq->virtq_lock while mlx5_vdpa_cqe_event_unset function is trying to re-initialize the virtq->virtq_lock. This causes mlx5_vdpa_virtq_kick_handler thread can't be wake up and can't be unregister. Following print may loop forever when calling rte_vhost_driver_unregister(socket_path): mlx5_vdpa: Try again to unregister fd 154 of virtq 11 interrupt mlx5_vdpa: Try again to unregister fd 154 of virtq 11 interrupt ... The fix is to move mlx5_vdpa_virtq_unregister_intr_handle before mlx5_vdpa_cqe_event_unset. Fixes: 057f7d208499 ("vdpa/mlx5: optimize datapath-control synchronization") Signed-off-by: Yajun Wu Acked-by: Matan Azrad Reviewed-by: Maxime Coquelin --- drivers/vdpa/mlx5/mlx5_vdpa.c | 1 + drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index 026daa3f24..8bcbedd071 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c @@ -282,6 +282,7 @@ _internal_mlx5_vdpa_dev_close(struct mlx5_vdpa_priv *priv, int ret = 0; int vid = priv->vid; + mlx5_vdpa_virtq_unreg_intr_handle_all(priv); mlx5_vdpa_cqe_event_unset(priv); if (priv->state == MLX5_VDPA_STATE_CONFIGURED) { ret |= mlx5_vdpa_lm_log(priv); diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c index 6e6624e5a3..1d84e422d4 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c @@ -190,7 +190,6 @@ mlx5_vdpa_c_thread_handle(void *arg) pthread_mutex_unlock(&virtq->virtq_lock); break; case MLX5_VDPA_TASK_DEV_CLOSE_NOWAIT: - mlx5_vdpa_virtq_unreg_intr_handle_all(priv); pthread_mutex_lock(&priv->steer_update_lock); mlx5_vdpa_steer_unset(priv); pthread_mutex_unlock(&priv->steer_update_lock); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.217768600 +0800 +++ 0078-vdpa-mlx5-fix-unregister-kick-handler-order.patch 2023-10-22 22:17:34.296723700 +0800 @@ -1 +1 @@ -From 72ec059a1ca91c52c6139cfc32133d643f709986 Mon Sep 17 00:00:00 2001 +From 9e7a4f889b0ca1755be668113f3ae991927c38a0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 72ec059a1ca91c52c6139cfc32133d643f709986 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index 01a5877d08..f900384aeb 100644 +index 026daa3f24..8bcbedd071 100644 @@ -45 +47 @@ -index 1a5fd3eb17..68ed841efc 100644 +index 6e6624e5a3..1d84e422d4 100644 @@ -48 +50 @@ -@@ -189,7 +189,6 @@ mlx5_vdpa_c_thread_handle(void *arg) +@@ -190,7 +190,6 @@ mlx5_vdpa_c_thread_handle(void *arg)