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 69AFD433D8 for ; Mon, 11 Dec 2023 11:13:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6527C40E0F; Mon, 11 Dec 2023 11:13:50 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2077.outbound.protection.outlook.com [40.107.212.77]) by mails.dpdk.org (Postfix) with ESMTP id 070B0402E9 for ; Mon, 11 Dec 2023 11:13:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWKuThqE60dUmQD4+8fAAFPgiWWTY5+DeXD2EdVgvcPa5/IGc5Vi/Qk4cNkxcOS3WfWwpzQ7VpKsnk1adA7RoweE7v7r2Y/kLXnA8qs1AwGOfQ2f5+8UzRXBqEmI9aYkNpiIQ7zQQ8sxti6WwH5iAlLc1NgXyZH3a5r9V0C09F7kzaLJiHg2d6HK6dDPD2sDA8OThBJ/cCyoTDCTeKDsY1sQMQr4dU9zk6plo+OUXLpAqFalVnMV47Gv4ftlHmuw1bSZn0C0Ug35SUXBLEJkE2YNDsmR5he40wL7KwyrzOmRBSGyC3PI717NuidzMtS2YRUZ71NxQROnfc+Z+S/TGQ== 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=WGZ43hmjXtBpwHoRmfQEgBP67V/kAWQ0rAoV8SYTEaw=; b=Q7polqgPLsuuFfUHg2RlQOWoPuRyh+ifwvbx/Qe5gJLEZUu1regI+KV5iq6BqkU3vA4xMiNahsNk9AI3XH0U98upTArNhIwacmz3L6AIOpIv5cEw15BqK2DZ7eD+9nMiENRtPwYCea0U0Zi6DMDv68zzLXl8FKHbonX7MLhlqDGho+EjPKWJub4jqQEkJPicc1kHoSShFXIKyCEVmEypii30Ee8BB3Qrf2WQ+0CLkHgMOc6r71Gcumm7O3wajSVQf6Ahr0RGCz5X4wV3suhKtLjyqg74qmsU/eLL6hlvrH64z0cSqhZdbsAloR1DJKZkoiPOr0+mAWJAuFh9VWZYPQ== 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 (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=WGZ43hmjXtBpwHoRmfQEgBP67V/kAWQ0rAoV8SYTEaw=; b=KChTDc8ryZBzjcnHESeF5Ds3nQFT4sZDl1JyNsHAxIywm3+CQTQe7CED/tm06O3cDiownoYPcYHgThV2OOQT6Z2AtmZG9rUceorwDzGuneRgTEhegwUf5YOVeEM8G7b8EbaFy7Wj3W8G967YpJEXEjGrShT/iCbp+zdRAhs7vzCBFEQCxwIZur4ZkasfX3sn9h6xMV3e5jUUwnn089coEnQrrXziG3HjXbfFXR8XnG9BvYeoC/RuN96W1Cp8kfmOmV8pblvDz+rQJSSzAkpgXHZx1+xPPV+oi/R5wv+v/xCFy2VrAohpDmZ/Tq7upV/BxHWLlyzR1dzRkHL8RdPT1g== Received: from DM6PR14CA0068.namprd14.prod.outlook.com (2603:10b6:5:18f::45) by PH7PR12MB6658.namprd12.prod.outlook.com (2603:10b6:510:211::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:13:46 +0000 Received: from DS3PEPF000099E0.namprd04.prod.outlook.com (2603:10b6:5:18f:cafe::ab) by DM6PR14CA0068.outlook.office365.com (2603:10b6:5:18f::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:13:46 +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 DS3PEPF000099E0.mail.protection.outlook.com (10.167.17.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:13:46 +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; Mon, 11 Dec 2023 02:13:33 -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.986.41; Mon, 11 Dec 2023 02:13:31 -0800 From: Xueming Li To: Maxime Coquelin CC: David Marchand , dpdk stable Subject: patch 'vhost: fix check on virtqueue access in in-flight getter' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:35 +0800 Message-ID: <20231211101226.2122-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: DS3PEPF000099E0:EE_|PH7PR12MB6658:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b0c202b-590a-4d3c-21c0-08dbfa31dc6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /s7Jp4oFVYAX0sUem1jEmUpRQKRb5oQ7dhe3t26GjVft9Gat/6+g4dwNp/Btqw+UIWb3FTS3Nr2iwFg2Q95b1ABB9TX/Sxx62r4QDr00EElz69VMKeSZ2QjxMq2tNIcR+COHxi6UIeSCmo3h3JJim8bA0FeUkJSdQz3Hp82Lfh1T5hEKyjpm4w4tHhHE5CaJcXfi+O80ALkw28hwojYLERtZKNJe1fmu9IbgVscXumM9O1HrEYUcZYF7RQHK0l02OZE4mRF0ZrPqSSxsl66OG3/3D8rgEp/nKOkqPteWQsoNqY31NrUanL5GIqSKdSZytCBU2rjzLSCzsgmKk6mR9UrhPfzCVIjgGn5xSwYLCYrrOv+ZrjZn8AeUqkjgBSAPM8OligNz1+OsCBvjODUUbDyRMs8IqhQ33mQXYmqL7EcF0aHENgWKX4BAEfVulJUmQOMBs9za4h8TRNErJB8ANgHFHQZRmNB+c3RsXjjMsRLXXIRcepto8ev/6APgpJP+UdJgl8VkEvoqHeca6s3U3uZNUu6dqvLTZkf+ggAbY9KqEqeoW2TDQrSUQM59RmVixodFbgoRzrPH+ScznChYJ+9/GEHvxN6OuW92jxQIP//deKpDSw8l7740w5ySSxBgBrqqPa4JpZFGCOvKf6pJKBvPcSPzNx4luz8QzOpN0slPwWLvfml6+Ef5N88nN8RjM5K5IE0FZXZoHLuugo7FzR5vEu7UdATzo8fTTFp7Lo7+6sAqMRMPYMbINIHnG1DDK6HBTPVLMIPKv9k6oBFOPmWmAQQJl4JfIRlWT/BgiqU= 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)(396003)(346002)(376002)(39860400002)(136003)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(82310400011)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(6286002)(1076003)(26005)(426003)(336012)(16526019)(2616005)(40460700003)(82740400003)(36756003)(7636003)(86362001)(356005)(47076005)(83380400001)(5660300002)(53546011)(7696005)(36860700001)(316002)(70586007)(70206006)(966005)(8936002)(8676002)(6916009)(54906003)(41300700001)(4001150100001)(4326008)(2906002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:46.0066 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1b0c202b-590a-4d3c-21c0-08dbfa31dc6c 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: DS3PEPF000099E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6658 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 12/13/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=adae353b36e10f642eb4eed195a710f658432790 Thanks. Xueming Li --- >From adae353b36e10f642eb4eed195a710f658432790 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:48:02 +0200 Subject: [PATCH] vhost: fix check on virtqueue access in in-flight getter Cc: Xueming Li [ upstream commit 288cd1f8ca3ebaf20aeed92966da9020a5793852 ] Acquiring the access lock is not enough to ensure virtqueue's metadata such as vring pointers are valid. The access status must also be checked. Fixes: 0c0935c5f794 ("vhost: allow to check in-flight packets for async vhost") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/vhost/vhost.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 695aa167dc..4edb76d0dd 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2008,9 +2008,15 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) return ret; } + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq->async) ret = vq->async->pkts_inflight_n; +out_unlock: rte_spinlock_unlock(&vq->access_lock); return ret; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.564883200 +0800 +++ 0010-vhost-fix-check-on-virtqueue-access-in-in-flight-get.patch 2023-12-11 17:56:22.887652300 +0800 @@ -1 +1 @@ -From 288cd1f8ca3ebaf20aeed92966da9020a5793852 Mon Sep 17 00:00:00 2001 +From adae353b36e10f642eb4eed195a710f658432790 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 288cd1f8ca3ebaf20aeed92966da9020a5793852 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 53318a54a3..f86516324b 100644 +index 695aa167dc..4edb76d0dd 100644 @@ -24 +26 @@ -@@ -2075,9 +2075,15 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) +@@ -2008,9 +2008,15 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) @@ -37 +39 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);