From patchwork Mon Sep 25 16:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 131893 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 B13D742637; Mon, 25 Sep 2023 18:36:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFEBC40EAB; Mon, 25 Sep 2023 18:36:35 +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 2F78D40E68 for ; Mon, 25 Sep 2023 18:36:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695659792; 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=1JrSFRc1MugUGewshNGqtGDYHSvBGYJlhMK66Dte57w=; b=Pg1akftbnxWDcrFxN9bTM17XpDk5UZ6IanApSC+QZViQlE7IzZ5g53BEzviBS4X7W2Q5RS jCgi8XybvI1AJUWnccCEQi2m9jicNqqx82x+9AH8rVHCwosYKffVdiWT+xjwrCPmrwjtYf lpt7u82ks6Erfsp4k3jBYt0Fhw80AuY= Received: from mimecast-mx02.redhat.com (mx-ext.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-584-CL7Q0qN6PZSd_WAJ_0Kpog-1; Mon, 25 Sep 2023 12:36:31 -0400 X-MC-Unique: CL7Q0qN6PZSd_WAJ_0Kpog-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 DE37C3800BA9; Mon, 25 Sep 2023 16:36:30 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 839EE1005E29; Mon, 25 Sep 2023 16:36:29 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, chenbo.xia@intel.com, mb@smartsharesystems.com Cc: Maxime Coquelin , stable@dpdk.org Subject: [PATCH 3/7] vhost: fix checking virtqueue access when notifying guest Date: Mon, 25 Sep 2023 18:36:06 +0200 Message-ID: <20230925163610.3307750-4-maxime.coquelin@redhat.com> In-Reply-To: <20230925163610.3307750-1-maxime.coquelin@redhat.com> References: <20230925163610.3307750-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: d761d455a0e4 ("vhost: add operation to offload the interrupt kick") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 83b71ffb23..f07674334d 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1540,6 +1540,9 @@ rte_vhost_notify_guest(int vid, uint16_t queue_id) rte_rwlock_read_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) + goto out_unlock; + if (dev->backend_ops->inject_irq(dev, vq)) { if (dev->flags & VIRTIO_DEV_STATS_ENABLED) __atomic_fetch_add(&vq->stats.guest_notifications_error, @@ -1552,6 +1555,7 @@ rte_vhost_notify_guest(int vid, uint16_t queue_id) dev->notify_ops->guest_notified(dev->vid); } +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); }