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 491BF43345 for ; Thu, 16 Nov 2023 14:24:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42054402E0; Thu, 16 Nov 2023 14:24:14 +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 1ED17402C6 for ; Thu, 16 Nov 2023 14:24:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141051; 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=SKv2+FjQ9/HFLJlvysj4mS3dK1NXPATzodNPUypbCrk=; b=MAnZjFIcasEn+IqPiFRD6DOncoKRMfmcfzQ6Rt5U9E/qZVOt7CKh1fp4/pE1iRSY5rTMx6 eH+2GjItI2d638k+/Z4ePg9Hp9kLj+pnufBXqkT/Li/huUtGlg4ROIccZn8i7J/g+vNgPE wSaQKbKn7pYoqSElU0a06HH4mqySBRk= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-zCjgq_ZKPUGADXhRkVKXSg-1; Thu, 16 Nov 2023 08:24:10 -0500 X-MC-Unique: zCjgq_ZKPUGADXhRkVKXSg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 116AE38157A8 for ; Thu, 16 Nov 2023 13:24:10 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 388232166B27; Thu, 16 Nov 2023 13:24:09 +0000 (UTC) From: Kevin Traynor 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 21.11.6 Date: Thu, 16 Nov 2023 13:22:50 +0000 Message-ID: <20231116132348.557257-8-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/587aea0f91f7170f6812d248915f0c60aed3057d Thanks. Kevin --- >From 587aea0f91f7170f6812d248915f0c60aed3057d 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 [ 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 038baf53fd..8a20efa7c4 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1930,7 +1930,13 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) } + 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); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.776415453 +0000 +++ 0008-vhost-fix-check-on-virtqueue-access-in-in-flight-get.patch 2023-11-16 13:21:52.402946235 +0000 @@ -1 +1 @@ -From 288cd1f8ca3ebaf20aeed92966da9020a5793852 Mon Sep 17 00:00:00 2001 +From 587aea0f91f7170f6812d248915f0c60aed3057d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 288cd1f8ca3ebaf20aeed92966da9020a5793852 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 53318a54a3..f86516324b 100644 +index 038baf53fd..8a20efa7c4 100644 @@ -24 +25 @@ -@@ -2076,7 +2076,13 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) +@@ -1930,7 +1930,13 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) @@ -36 +37 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);