From patchwork Fri Oct 20 08:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133064 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 606F3431BA; Fri, 20 Oct 2023 10:49:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5426F41156; Fri, 20 Oct 2023 10:48:31 +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 AD86041149 for ; Fri, 20 Oct 2023 10:48:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791709; 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=yGLwhuU8ZZeDj7Ppk6rtldZaV8L/ZRSR3mKAcocKoQo=; b=eIgqv9RUmB24la4EgeR6pGE6liN/I2dM3XyeCKlJzJ8ZSNSXI7HGWTw4kAAKUQbWOHoM+H tvNvYm43CbTsUOvdMrBogzhaCuCDvzBzuuvuSU51tmDqwBBUz9o0qPKKs2qiL0Fk9+idjk qaVo3OzfH0FqVI9DLqOwWvc/Ivi+yY8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-76-PFk6i2aPOweOSXmIFwbGzg-1; Fri, 20 Oct 2023 04:48:15 -0400 X-MC-Unique: PFk6i2aPOweOSXmIFwbGzg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 51A9410201E0; Fri, 20 Oct 2023 08:48:15 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00F0840C6F7B; Fri, 20 Oct 2023 08:48:13 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, chenbo.xia@outlook.com, fengli@smartx.com Cc: Maxime Coquelin , stable@dpdk.org Subject: [PATCH v2 4/7] vhost: fix check on virtqueue access in async registration Date: Fri, 20 Oct 2023 10:48:01 +0200 Message-ID: <20231020084804.3625099-5-maxime.coquelin@redhat.com> In-Reply-To: <20231020084804.3625099-1-maxime.coquelin@redhat.com> References: <20231020084804.3625099-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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: 78639d54563a ("vhost: introduce async enqueue registration API") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 5428ff4a25..ccd3c0e865 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1857,7 +1857,15 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id) return -1; rte_rwlock_write_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + ret = async_channel_register(dev, vq); + +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); return ret; @@ -1909,6 +1917,11 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) return ret; } + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (!vq->async) { ret = 0; } else if (vq->async->pkts_inflight_n) { @@ -1920,6 +1933,7 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) ret = 0; } +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); return ret;