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 4477C43891 for ; Thu, 11 Jan 2024 11:52:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FCEA4025E; Thu, 11 Jan 2024 11:52:06 +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 A643940042 for ; Thu, 11 Jan 2024 11:52:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704970324; 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; bh=OcmOjRTUSEV0PPdBO3reCp/wqF2ANp1+svvJconFd5I=; b=h1en6R4WuUTsWuajo1QTs4d/LUF2LG0bfZag1RewO+Yb0zg107L/DuXTvkPyv0858FI9S4 1/vjh0BHXifKIGmlYF8XwT8I8Ow2fQEfLS7dTkKu2xnq6Q3fCi44H2VjjEICqnzXUIj+Z4 3msDkC+d5cxHsivcyxgDUotzo9skSAc= 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-64-deKa2CzAM1SVHi8kI9mCQw-1; Thu, 11 Jan 2024 05:52:02 -0500 X-MC-Unique: deKa2CzAM1SVHi8kI9mCQw-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 4AF1082DFE7; Thu, 11 Jan 2024 10:52:02 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2482F2026D66; Thu, 11 Jan 2024 10:52:00 +0000 (UTC) From: Maxime Coquelin To: stable@dpdk.org, xuemingl@nvidia.com, ktraynor@redhat.com, dmarchan@redhat.com Cc: Maxime Coquelin Subject: [PATCH v22.11] vhost: fix missing spinlock unlock Date: Thu, 11 Jan 2024 11:51:58 +0100 Message-ID: <20240111105158.3508078-1-maxime.coquelin@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 Two regressions were introduced when backporting below patch: b4c4e5675c85 ("vhost: fix missing lock protection in power monitor API") First, rte_vhost_get_monitor_addr did not release the lock in the success case. Then, rte_rwlock_read_lock() was converted to rte_spinlock_trylock() instead of rte_spinlock_lock(). This patch addresses both of these issues. Fixes: a07736eb68da ("vhost: fix missing lock protection in power monitor API") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 40ac350e21..9e28198528 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2060,6 +2060,7 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, { struct virtio_net *dev = get_device(vid); struct vhost_virtqueue *vq; + int ret = 0; if (dev == NULL) return -1; @@ -2070,11 +2071,12 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, if (vq == NULL) return -1; - if (!rte_spinlock_trylock(&vq->access_lock)) - return -1; + rte_spinlock_lock(&vq->access_lock); - if (unlikely(!vq->access_ok)) + if (unlikely(!vq->access_ok)) { + ret = -1; goto out_unlock; + } if (vq_is_packed(dev)) { struct vring_packed_desc *desc; @@ -2095,12 +2097,10 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, pmc->match = 0; } - return 0; - out_unlock: rte_spinlock_unlock(&vq->access_lock); - return -1; + return ret; } -- 2.43.0