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 B40FFA0555 for ; Wed, 25 May 2022 18:29:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE4CC400EF; Wed, 25 May 2022 18:29:12 +0200 (CEST) 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 5672D400EF for ; Wed, 25 May 2022 18:29:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496149; 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=iTCRfsWR69Dz0kdKbGhrn9J3+n5Gn5wuGX3OX7pCsS4=; b=iLknkc4G7B3E9kuqranRuq0M6UfLVxX1zsGxrE+9hBOh+rYJeYva8tgYr8u96H9E+1ENN4 XY9v2wky5EXipB3bJbMa/ZbrJvOEQZY2jfNvEZF68yN5GnJaqbXk+0F0VUjJirwA5lMIZK avZCPsFmjKTm6DskAAhc/fupqlNdTec= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-216-LLzq2oafMyioVdd4IpCjhw-1; Wed, 25 May 2022 12:29:08 -0400 X-MC-Unique: LLzq2oafMyioVdd4IpCjhw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B39A3817A65 for ; Wed, 25 May 2022 16:29:08 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75E792026D64; Wed, 25 May 2022 16:29:07 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: David Marchand , dpdk stable Subject: patch 'vhost: fix missing virtqueue lock protection' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:02 +0100 Message-Id: <20220525162847.711753-10-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.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 05/30/22. 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/78414da84eb5f5ae3594a073bdc978d3e14efeb4 Thanks. Kevin --- >From 78414da84eb5f5ae3594a073bdc978d3e14efeb4 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 24 Mar 2022 13:46:34 +0100 Subject: [PATCH] vhost: fix missing virtqueue lock protection [ upstream commit c5736998305def298e26f8fa73b9995f184fc983 ] This patch ensures virtqueue metadata are not being modified while rte_vhost_vring_call() is executed. Fixes: 6c299bb7322f ("vhost: introduce vring call API") Signed-off-by: Maxime Coquelin Reviewed-by: David Marchand --- lib/vhost/vhost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 13a9bb9dd1..474645b64e 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1300,4 +1300,6 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) return -1; + rte_spinlock_lock(&vq->access_lock); + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); @@ -1305,4 +1307,6 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) vhost_vring_call_split(dev, vq); + rte_spinlock_unlock(&vq->access_lock); + return 0; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:58.867269545 +0100 +++ 0010-vhost-fix-missing-virtqueue-lock-protection.patch 2022-05-25 17:26:58.544828298 +0100 @@ -1 +1 @@ -From c5736998305def298e26f8fa73b9995f184fc983 Mon Sep 17 00:00:00 2001 +From 78414da84eb5f5ae3594a073bdc978d3e14efeb4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c5736998305def298e26f8fa73b9995f184fc983 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cf4bac277a..df0bb9d043 100644 +index 13a9bb9dd1..474645b64e 100644 @@ -22 +23 @@ -@@ -1292,4 +1292,6 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) +@@ -1300,4 +1300,6 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) @@ -29 +30 @@ -@@ -1297,4 +1299,6 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) +@@ -1305,4 +1307,6 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx)