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 BBFB043829 for ; Tue, 5 Mar 2024 16:35:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B692042D2E; Tue, 5 Mar 2024 16:35:35 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6223042686 for ; Tue, 5 Mar 2024 16:35:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Hfrq3SRqpZmpM5oRpl+BxXrnBUVdU9U2l39yAVEYwM=; b=hkuSFQQcnqGvqAX1v1+nyXPZKtkEdcgAvdDkwXbRaci2GZvsQ2RR8lQ+EcpDXIrDgG6uT7 l8YLaRuVQjatzm1tfY7kmbumheTt91o0llAq9/DVLtTFG5mRKNon2uVNHM5oRbyFikH16U KPJdh1Xl8FT/hdvnahAPi5mYg+upQz4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-578-9z6ujuOzMSmRYW7JOgaJ8A-1; Tue, 05 Mar 2024 10:35:32 -0500 X-MC-Unique: 9z6ujuOzMSmRYW7JOgaJ8A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79E4780026B for ; Tue, 5 Mar 2024 15:35:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 263FC200AFA2; Tue, 5 Mar 2024 15:35:30 +0000 (UTC) From: Kevin Traynor 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 21.11.7 Date: Tue, 5 Mar 2024 15:34:00 +0000 Message-ID: <20240305153449.263666-27-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 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/11/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7293e69ddf77c3ed83f1e14ab3a96f13d2ff144b Thanks. Kevin --- >From 7293e69ddf77c3ed83f1e14ab3a96f13d2ff144b 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 [ 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 bf489cb13b..af0062dd1f 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2190,5 +2190,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev, vhost_user_iotlb_flush_all(vq); + rte_spinlock_lock(&vq->access_lock); vring_invalidate(dev, vq); + rte_spinlock_unlock(&vq->access_lock); return RTE_VHOST_MSG_RESULT_REPLY; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.338989180 +0000 +++ 0027-vhost-fix-virtqueue-access-check-in-vhost-user-setup.patch 2024-03-05 14:08:54.642520744 +0000 @@ -1 +1 @@ -From b3e42d92362bcc75df21c5b86ba7c0685b40a3bf Mon Sep 17 00:00:00 2001 +From 7293e69ddf77c3ed83f1e14ab3a96f13d2ff144b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3e42d92362bcc75df21c5b86ba7c0685b40a3bf ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bac10e6182..931dc690ad 100644 +index bf489cb13b..af0062dd1f 100644 @@ -23,2 +24,2 @@ -@@ -2199,5 +2199,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev, - vhost_user_iotlb_flush_all(dev); +@@ -2190,5 +2190,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev, + vhost_user_iotlb_flush_all(vq); @@ -26 +27 @@ -+ rte_rwlock_write_lock(&vq->access_lock); ++ rte_spinlock_lock(&vq->access_lock); @@ -28 +29 @@ -+ rte_rwlock_write_unlock(&vq->access_lock); ++ rte_spinlock_unlock(&vq->access_lock);