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 49F6143B86 for ; Tue, 5 Mar 2024 10:53:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4348A4026B; Tue, 5 Mar 2024 10:53:25 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2067.outbound.protection.outlook.com [40.107.94.67]) by mails.dpdk.org (Postfix) with ESMTP id A1C614014F for ; Tue, 5 Mar 2024 10:53:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WfuSinBXN1YT3Opfha311TFea6twLm3UVma8gPVE6++c1AbdWxW9cgDFVe3S+J9y9DCzqz8HweYipB4UHpVGYHQLm4LJGuSQRKBD6iRoRPq0e9BmjOwYljuLV4/6bn7OoZ8fLs/qVsWCtAHJn2adjP0giKvg7b7V5lDhjECSdHLY55iCscQ7/9sTi4Kl42cd79C2vpaBjiW35vsQD8EYUFHSzXQl7d3gEK8XjPbPd7NhwF5oKtLcYVeKIJij+f9ixPjEkjpMSxNYzfFZwbHSeF9/bHKfGDNwbLVqizSy0lQCJpwKSJd913P7ChGdqkh5zb9eNN4yvHhDced+Tbf2OQ== 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=BNEy2zHcYgmGB4x8xJyZZSHYYzKHf+sxEapXcqX24Rc=; b=h/yWpD0lxMgjdigUQ2S8DKEErSJWCHg1XbeNQsI39Q2XFtNegLwW6+f4ZZMy2Yi/mflq0moXZke/PDp9ua3ee3HQumnZHloFj7VkOaiDV8wNbCLhVIJ8oC8JwFgrAhBfe9X/RXmnks+RTeN5ybWY2rZAdQHueiIWTjLFv2/R9+hWCbG1o764sENGCkqilice9ms8pu3MQov+ze3rSDDn4dmWS7xHRkk88LQYe6T3Hb5+VCAhzaJczX1qFsF9qRSJx7rCTsUp22neqr/yJkZ7k9kNH9XFseIXl0xek9bN8nZx0At1KyS3MOI/cNmV/MrfaE4xKCmAfsuyUQjv4ObnDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 (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=BNEy2zHcYgmGB4x8xJyZZSHYYzKHf+sxEapXcqX24Rc=; b=rE9y5G7mKhBcaU50ZKccKyr+ll4pxc4KXJjVyv9BMkyyNrodHYTfkdp487YAx1VuePQs6a8qSvsDGOMVj8FEUaQMQ8GjTsrr7LjCl+RAw4dkEhOQ6vEXGwIdl0nn1gAiPiliuKlYKhjyBuAsUXYZK2+d0tdU3vrxBS/q6qMxOuBnVNgWmZ/tULlOnndZFDde+ez77QT3/udjV2RJiTuICm7w3/0d3C2iQ85EB+sYZCmuMxL+QUowCbL6GdspbrtVuH5+YXJnv+7mQ+7aDvSswbbwp0tBPqk1+nVd3UJeabEg8SQs373a1f7Lh3yt+MoS+xgzgmxMF+cYnzZQEBrmag== Received: from DM6PR02CA0134.namprd02.prod.outlook.com (2603:10b6:5:1b4::36) by SN7PR12MB7228.namprd12.prod.outlook.com (2603:10b6:806:2ab::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:53:19 +0000 Received: from CY4PEPF0000FCC0.namprd03.prod.outlook.com (2603:10b6:5:1b4:cafe::fa) by DM6PR02CA0134.outlook.office365.com (2603:10b6:5:1b4::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:53:18 +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 CY4PEPF0000FCC0.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:53:18 +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.986.41; Tue, 5 Mar 2024 01:53:11 -0800 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.1258.12; Tue, 5 Mar 2024 01:53:09 -0800 From: Xueming Li To: David Marchand CC: Eelco Chaudron , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix virtqueue access check in vhost-user setup' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:38 +0800 Message-ID: <20240305094757.439387-58-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC0:EE_|SN7PR12MB7228:EE_ X-MS-Office365-Filtering-Correlation-Id: 2523a2fe-8809-4ffe-9a0b-08dc3cfa1606 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aTxSoqTPTHdC7qolr0bSWSuKXa0NdcablnBTGMtmaEKslloTQEA1tQZBEdgsDYcigJ62BjVBt64itrH2SK5Ow+w7CQ9w1Ls/tnZrnRZ3RBoeuezh2IUOCMGdIGF5E98e2M4mf9zp0+QVed5jOAKoh5gjRm7tURqim+PebOEOfyC9lOa0kDOhmt7fF/IVEXpvfoTxntFhd+i6w8u6mpzT16sLwqb/KCep0EWVOJxzy6VOvDvdWGmlXAbljcHZi2d1XfF2q8SaYjk/8plO6rPCFFQm7UMHDDpYBbzKXH4vDRoiczw6wzN4/D+pnzk6moPGS18BzUItVGDeZ4U9i6rO/TGGkosU9WVI+4gEbyzBLA9Q48Qnqa4jdIF0u3EHsjdqyQzuXNpuWp1YyqQi5Z4HuuJSYkaRsI9sAF8iBehRdHHe0qGzm9baqOi6M1PEVtZvoloBsVgBu//ay7JdGW54Yrd90g4IBB9hyQKeY5PUl1wPXikpm9DZtESLPb3CQ6ta/vhxhklOytxOq8Ov967UkdXikn2VKaArbGH4d5Vq+sPDFRE6fyANTN2g+3sVWzVboSwRhQ1gQuevSVOq0AtYvWAkKm2s4n0wIVJPKV5AVe1/x9+Q1lCluBK0BNBSdkzPiYpMyES1ttMg7qp4RQA5KTcvRHGXH0HrPo61kzNlS3JvItPM/4ZynGIzdo7kbJLoF4dfaL2bnLuvpIxyG+kzbxveOqVdVsooRxJQ2CIfxgy/S9Jn3ba2k9GOpB0X1VY9 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:(13230031)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:53:18.7383 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2523a2fe-8809-4ffe-9a0b-08dc3cfa1606 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: CY4PEPF0000FCC0.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7228 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=c8e7cd6c6dbf806fe64c8b930ad362d253fc7230 Thanks. Xueming Li --- >From c8e7cd6c6dbf806fe64c8b930ad362d253fc7230 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 5 Dec 2023 10:45:33 +0100 Subject: [PATCH] vhost: fix virtqueue access check in vhost-user setup Cc: Xueming Li [ upstream commit b3e42d92362bcc75df21c5b86ba7c0685b40a3bf ] Calling vring_invalidate must be done with a (write) lock taken on the virtqueue. Fixes: 72d002b3ebda ("vhost: fix vring address handling during live migration") Signed-off-by: David Marchand Acked-by: Eelco Chaudron Reviewed-by: Maxime Coquelin --- lib/vhost/vhost_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index e36312181a..a323ce5fbf 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2198,7 +2198,9 @@ vhost_user_get_vring_base(struct virtio_net **pdev, vhost_user_iotlb_flush_all(dev); + rte_rwlock_write_lock(&vq->access_lock); vring_invalidate(dev, vq); + rte_rwlock_write_unlock(&vq->access_lock); return RTE_VHOST_MSG_RESULT_REPLY; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.691983857 +0800 +++ 0057-vhost-fix-virtqueue-access-check-in-vhost-user-setup.patch 2024-03-05 17:39:30.773566493 +0800 @@ -1 +1 @@ -From b3e42d92362bcc75df21c5b86ba7c0685b40a3bf Mon Sep 17 00:00:00 2001 +From c8e7cd6c6dbf806fe64c8b930ad362d253fc7230 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b3e42d92362bcc75df21c5b86ba7c0685b40a3bf ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index bac10e6182..931dc690ad 100644 +index e36312181a..a323ce5fbf 100644