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 3EEB545610 for ; Fri, 12 Jul 2024 12:51:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 386F342EFC; Fri, 12 Jul 2024 12:51:18 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2056.outbound.protection.outlook.com [40.107.94.56]) by mails.dpdk.org (Postfix) with ESMTP id 4FA6942EFC for ; Fri, 12 Jul 2024 12:51:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aeuiIGAsJmIjBxIXZmXrfTaqIP49p2nln830VEzRbfj/tIgiVUt0Yx3XMfQkH4M5NJgCQuFXwRZAHTMO/cMxn56St3jEOifur91HL9wWILnidvZjkpRVLs0h29ObbEfQ+zpFQOOKAh60qqHL6hN7mb3/VzDeyQ8n9qAYkVzRW+3P2Y2GsgJaPqHl1Yzsui2RkZ3ZkEEab2HjpxF4QMOBdU5YEk/mQHYgImfc5u888c0hYIVL3G4eTPHA2A4b3WDQTHZEgozIxTeqOp/QY2GF4W/lygvsUHKWIdmpj1MGQpOgNenbTxjMXq6d/LQ/bk1XKS8JRMzEEHm34UlTCQ6wYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uonOsObnsCRKjB3s1UHyKAd1arH97cUmvc2yS4d6e7c=; b=wUMFx0fb5yuibuRmzdo6UtwobSXUPmzmpd0Rf/5UXrBIEox6wvp3a/NtFrtE5d5W2TNZrgt3eyNA8wmJw5P486gX7Zd+qw62OMDtBA19FWTacVga2Fwmg/o3tmmSww/uDfuookX+KsvVzZSA3vj9iTkHbLFdKQwhezsH/aI9MWRKJ9rbvZPZFNc7MQE1olA18EXf+AUruwBH7vvZbvStsJqpffi8moE6c2oLCWn16DUlXITnVKyrubNejMtJO+Q7BFWePl++PGvxxcOgWT7w0wHWNIKuFpxqLdN/St0JDijalrJps5iaGgHrZPhu2p9C/Z46KpERXglByInlxW3iyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=smartx.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 (0) 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=uonOsObnsCRKjB3s1UHyKAd1arH97cUmvc2yS4d6e7c=; b=rS4t+EXLnLnde/eKsgeO4RQIJ6hgJVIUnnP8pI1rcsh9ru/GwODHaXbOgubgDKQueKfO4lIVhFirvAuqzPgb7MCJDek2IUhBDHp2mlILj11/9QbFZKon/HqYOP75qXXnoVsL34YNIB+QR8JsCXLcv3Bs02UGMB6bSny8Y7RZj4qeAr5f5UJFRXWaT3ELfGrjjzVoLEOvMZQ5VgI7j1FQl1Y0JZzKIShI0daR4DQW5wIdlRGAlkHaDcdP522NwvsqXICQiDG4Z9omWoM9BYxk/185m1FpnNPfqMRWjfU38i/Lb/t9IKRa6geHu4AQhxiz3IVZTWnp8O0NYVTVNy0LTg== Received: from BY5PR13CA0035.namprd13.prod.outlook.com (2603:10b6:a03:180::48) by CYYPR12MB8855.namprd12.prod.outlook.com (2603:10b6:930:bb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22; Fri, 12 Jul 2024 10:51:14 +0000 Received: from SJ5PEPF000001D3.namprd05.prod.outlook.com (2603:10b6:a03:180:cafe::58) by BY5PR13CA0035.outlook.office365.com (2603:10b6:a03:180::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:51:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF000001D3.mail.protection.outlook.com (10.167.242.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:51:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:50:59 -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.1544.4; Fri, 12 Jul 2024 03:50:57 -0700 From: Xueming Li To: Haoqian He CC: Maxime Coquelin , dpdk stable Subject: patch 'vhost: cleanup resubmit info before inflight setup' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:38 +0800 Message-ID: <20240712104528.308638-53-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D3:EE_|CYYPR12MB8855:EE_ X-MS-Office365-Filtering-Correlation-Id: 73044f58-d6e6-4902-ab92-08dca2608cd3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Vlo3V1BHWDJSZ0QwKzZoamhLMUloNm53VFdqc3JqRi9VNkttMmZEQU03bFU1?= =?utf-8?B?dS9JL0dHajNlRHpnOUxCTlozWGZYWmVvWmQ0ZjZlSDJVMGNQN2xEMVQzZm1u?= =?utf-8?B?dnBKYWlrWEJkYjBvcy9BZlBKTlNuT2lKNXJDdXUxdEFPdzdOTDlTa2Y4d004?= =?utf-8?B?WjA3eml1N0FxRDhKL2RoWDYvUzRGdzdPdWN2RmJOZTZsaG5LelZGakVuQlFo?= =?utf-8?B?MGllelpSbHhjcmFlSW40Qm52OXpUUElzNWFwTGxxZGhRczBZdGVmRWVjazBU?= =?utf-8?B?dEZ1aW4yV25oMlF3by8rUi9sZGZpbmpRcG5KNXgwOWtlTnFxZ3FqbFIwMENJ?= =?utf-8?B?YXRTZGpmREVPWWdBNVlFY3BRdnZFQ244RVRRYlV4b1ZpV2ZFQUpGMGsvZGo2?= =?utf-8?B?bGxCK1JCUlUvTzJ6dFV4MURSUTYrSWpGeWVoMHlLbWZtUWZ0eUlSUmhSckQ0?= =?utf-8?B?cnpOMXpERk1TaTFnWWZha0pHRmxvQXEyR0M5V0hGSVNubUk1bDRJSkFobWQr?= =?utf-8?B?R1dTMDNTMXFFWXlKWC9IblNWd1JUbjVLWXlkdUNoTFN2VG9JYVBHdVNDTHk2?= =?utf-8?B?dy9PclNPWk5YZ29lWVlRWnFzWlJ0RnMyN0VPYzVTbEtSeG1KZDN4MytCc2k1?= =?utf-8?B?UnVoT0JtcmcrUjNBUFpNeVRzVll1U0RSR1dHQmlhUVJUbTF6K1B6RDJ6emc3?= =?utf-8?B?Qmt0cFE5MnVoVzdENytmaytRTUN0Tld4RXhaS1FVdHNZUVZ1Rk1IL0p1MjBO?= =?utf-8?B?OE1qaEFwSE84ZXpmcy9RQ0NUN1dKcW1RRTBoSTlya1o0YWt4aGZEYTJlWnNk?= =?utf-8?B?UGZmRUdpVW9WejdvRkdWSFV0dTlUN3A5T0o2T0NxQzcyWVUxcyszM0ZzRFJG?= =?utf-8?B?WVQ3cUdXdklCd001Uko5OEFJSkVXc0ZSa1FyMU5heFBUZVFXbHhJZjdxUSsx?= =?utf-8?B?eGJNc1gyVXlXSXdBVi9GanQvSC9DQ09SL1loNm1OZXBZZG5BZFBzK2VZUkZP?= =?utf-8?B?ZUZHNTM4N01qS0JHcTEwSlptUDJBclMwbDFyOXllZXdJMEhOL3QxSWZoWFI0?= =?utf-8?B?bkJhcGpjNWNpMFpZNm83ZGZidlo5bmNoeHlnT1Q1SWQzR3VQcGc3NGZOYnRP?= =?utf-8?B?dHN0WVB2bFg2S3dnaTh6Y291UDV0MTN5TFpBeTRIYlpuZmY4YzN2QVlId1Vm?= =?utf-8?B?aDlDUXJhMHY2WFR0ZUUrTHcvVUtvUE03dEFKTUI3Vms1RzdYQXYyZklNQzI1?= =?utf-8?B?OGsvVGpqMVY4WTVKUFhyVkszQzNxR1FzUDZCeVk4ZzdtNFdGRVlKbWNkazFX?= =?utf-8?B?dXNOcEFjbnZRSGk0K2R0eVZGVHVFaE5VcFRYMWhjUjJVNG9RRkhXVDdXUVFT?= =?utf-8?B?ZGd6SnIwTG9ia3J3MG1sVG1VQktXVTlHdEJyMlNGTGZSN1JROHpsd3pGQk1q?= =?utf-8?B?ZjBnTHd6SDZwU1R6aXp5Vkp4MlRMN2RFYjFoZXQ2VDdLYUZXTHVtcFdzblF4?= =?utf-8?B?UXJVMVhWK3RRVzJlaG9TU1pibE56RlN1amhONElPazZPMlYwTnJyZ2V5S1p6?= =?utf-8?B?cWgwb0RBdEpPUXBOTk5YNmZxeHptR2Z5L2VDZmoyZGdBV3ZMcHBqNlVNR2xh?= =?utf-8?B?ZmtKNVRTcFJPdTZQNnNXWTg0SzE3SWFWUHVJN3g0bWhwWHhqZEVQNTJ6Tm9y?= =?utf-8?B?eXQ2VXdxSW85Y3FUZWZIV0x1OFhqdzZhYThxalVvYVQ4WkUxSmF0VHJtd3kx?= =?utf-8?B?TmcxbS9iTGRmMTBQT2pVVTdRd1UxMDVjWDBFYkxJaVZiTUtRYXlsYmg1dG1q?= =?utf-8?B?UnltTnJJUVJzSUQ3VGpNOHhCY2E2elRhN2E0U1JKL2ZQNENkYjZjV0hvaXI0?= =?utf-8?B?NEpCczB0dU05cE5WelE5N2lpRDlIN1ROTTBxcUM2a3ZpbE1uVlgvMzh1dEU2?= =?utf-8?Q?5oBBO3INI8oJcp/Sn7mpTEqun61k71XO?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:51:14.2697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 73044f58-d6e6-4902-ab92-08dca2608cd3 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8855 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d119ad0b29f26b96da7ecefa0ce07c8ed6a14dff Thanks. Xueming Li --- >From d119ad0b29f26b96da7ecefa0ce07c8ed6a14dff Mon Sep 17 00:00:00 2001 From: Haoqian He Date: Fri, 26 Apr 2024 07:09:46 -0400 Subject: [PATCH] vhost: cleanup resubmit info before inflight setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit e4a01eea66326c58593906e189b376605a0ec606 ] This patch fixes a potential VM hang bug when the VM reboots after vhost live recovery due to missing cleanup virtqueue resubmit info. Specifically, if inflight IO that should be resubmitted during the latest vhost reconnection has not been submitted yet while VM rebooting, so GET_VRING_BASE would not wait for the inflight IO, at this time the resubmit info has been. When the VM restarts, SET_VRING_KICK will resubmit the inflight IO (If resubmit info is not null, function set_vring_kick will return without updating resubmit info). It’s an error, any stale inflight IO should not be resubmitted after the VM restart. The solution is to clean up virtqueue resubmit info when function set_inflight_fd before function set_vring_kick. Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information") Signed-off-by: Haoqian He Reviewed-by: Maxime Coquelin --- .mailmap | 1 + lib/vhost/vhost_user.c | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index e1ce4e1b1b..b0eda8e8af 100644 --- a/.mailmap +++ b/.mailmap @@ -489,6 +489,7 @@ Hanoch Haim Hanumanth Pothula Hao Chen Hao Wu +Haoqian He Hari Kumar Vemula Harini Ramakrishnan Hariprasad Govindharajan diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index a323ce5fbf..f8e42dd619 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -1799,6 +1799,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev, if (!vq) continue; + cleanup_vq_inflight(dev, vq); if (vq_is_packed(dev)) { vq->inflight_packed = addr; vq->inflight_packed->desc_num = queue_size; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.550820633 +0800 +++ 0052-vhost-cleanup-resubmit-info-before-inflight-setup.patch 2024-07-12 18:40:14.096594228 +0800 @@ -1 +1 @@ -From e4a01eea66326c58593906e189b376605a0ec606 Mon Sep 17 00:00:00 2001 +From d119ad0b29f26b96da7ecefa0ce07c8ed6a14dff Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit e4a01eea66326c58593906e189b376605a0ec606 ] @@ -27 +29,0 @@ -Cc: stable@dpdk.org @@ -37 +39 @@ -index ed63605a15..ff20619bfb 100644 +index e1ce4e1b1b..b0eda8e8af 100644 @@ -40 +42 @@ -@@ -495,6 +495,7 @@ Hanoch Haim +@@ -489,6 +489,7 @@ Hanoch Haim @@ -49 +51 @@ -index 414192500e..7c54afc5fb 100644 +index a323ce5fbf..f8e42dd619 100644 @@ -52 +54 @@ -@@ -1871,6 +1871,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev, +@@ -1799,6 +1799,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev,