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 1E8A8A0555 for ; Thu, 9 Jun 2022 13:38:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19138427F9; Thu, 9 Jun 2022 13:38:19 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2877A41614 for ; Thu, 9 Jun 2022 13:38:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774697; 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=itQGGXUSlVsmaZQEX43QItncfYn5QSAHTKeZDgktbys=; b=g85DZfbKRc7Lf7qlSV8TNGxGIu+oez3wsLfR0MdFLRtHhXmZRZLhAk7G0KtWHwr7VqZhui AdCZHTjmDA6yJntaGPEmexEFTM4KcZePn+J0FaX/1XggDMTrWhrUP6wJQwANaXu9GNQJ4s c87m0hdPcgtZw5heQSPL3hVp2TaIR+o= 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-365-CNOcp7S-MgS99zuSlLwJhA-1; Thu, 09 Jun 2022 07:38:16 -0400 X-MC-Unique: CNOcp7S-MgS99zuSlLwJhA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 668E41C0CE72; Thu, 9 Jun 2022 11:38:16 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59F4518EA4; Thu, 9 Jun 2022 11:38:15 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Sunil Pai G , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix async access' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:35 +0100 Message-Id: <20220609113701.386938-48-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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 06/13/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/fadc687f559274967c43c55317b66e924002a261 Thanks. Kevin --- >From fadc687f559274967c43c55317b66e924002a261 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 11 Apr 2022 13:00:08 +0200 Subject: [PATCH] vhost: fix async access [ upstream commit 2d47fd3dfb596d266b89d82c2c4b2351c3d6fe20 ] vq->async accesses must be protected with vq->access_lock. Fixes: eb666d24085f ("vhost: fix async unregister deadlock") Fixes: 0c0935c5f794 ("vhost: allow to check in-flight packets for async vhost") Signed-off-by: David Marchand Acked-by: Sunil Pai G Reviewed-by: Maxime Coquelin --- lib/vhost/vhost.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 474645b64e..24f94495c6 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1784,24 +1784,20 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) return ret; - ret = 0; - - if (!vq->async) - return ret; - if (!rte_spinlock_trylock(&vq->access_lock)) { VHOST_LOG_CONFIG(ERR, "Failed to unregister async channel. " "virt queue busy.\n"); - return -1; + return ret; } - if (vq->async->pkts_inflight_n) { + if (!vq->async) { + ret = 0; + } else if (vq->async->pkts_inflight_n) { VHOST_LOG_CONFIG(ERR, "Failed to unregister async channel. " "async inflight packets must be completed before unregistration.\n"); - ret = -1; - goto out; + } else { + vhost_free_async_mem(vq); + ret = 0; } - vhost_free_async_mem(vq); -out: rte_spinlock_unlock(&vq->access_lock); @@ -1858,7 +1854,4 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) return ret; - if (!vq->async) - return ret; - if (!rte_spinlock_trylock(&vq->access_lock)) { VHOST_LOG_CONFIG(DEBUG, "Failed to check in-flight packets. " @@ -1867,5 +1860,7 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) } - ret = vq->async->pkts_inflight_n; + if (vq->async) + ret = vq->async->pkts_inflight_n; + rte_spinlock_unlock(&vq->access_lock); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.882751020 +0100 +++ 0048-vhost-fix-async-access.patch 2022-06-09 12:34:29.763980671 +0100 @@ -1 +1 @@ -From 2d47fd3dfb596d266b89d82c2c4b2351c3d6fe20 Mon Sep 17 00:00:00 2001 +From fadc687f559274967c43c55317b66e924002a261 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2d47fd3dfb596d266b89d82c2c4b2351c3d6fe20 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index df0bb9d043..14863144f3 100644 +index 474645b64e..24f94495c6 100644 @@ -23 +24 @@ -@@ -1754,25 +1754,21 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) +@@ -1784,24 +1784,20 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) @@ -32,2 +33,2 @@ - VHOST_LOG_CONFIG(ERR, "(%s) failed to unregister async channel, virtqueue busy.\n", - dev->ifname); + VHOST_LOG_CONFIG(ERR, "Failed to unregister async channel. " + "virt queue busy.\n"); @@ -42,3 +43,2 @@ - VHOST_LOG_CONFIG(ERR, "(%s) failed to unregister async channel.\n", dev->ifname); - VHOST_LOG_CONFIG(ERR, "(%s) inflight packets must be completed before unregistration.\n", - dev->ifname); + VHOST_LOG_CONFIG(ERR, "Failed to unregister async channel. " + "async inflight packets must be completed before unregistration.\n"); @@ -56 +56 @@ -@@ -1892,7 +1888,4 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) +@@ -1858,7 +1854,4 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) @@ -63,2 +63,2 @@ - VHOST_LOG_CONFIG(DEBUG, -@@ -1902,5 +1895,7 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) + VHOST_LOG_CONFIG(DEBUG, "Failed to check in-flight packets. " +@@ -1867,5 +1860,7 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id)