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 1D798431E0; Mon, 23 Oct 2023 11:55:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB02541140; Mon, 23 Oct 2023 11:55:37 +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 BDC584113C for ; Mon, 23 Oct 2023 11:55:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698054935; 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=l8Np6/GCkdhp696d62/BtT5HaMrmmArBJ3ghgq/MMSA=; b=iwA9l226rgqpHZdoASjD1Pzx9BdusdKFYgOB1jDqsYrwaVxAF4RR9qQT13LvfiqzpIk3LI O0iDOnLEaQmL0g/EIpztUVmvKc8dC8d/uriaEuCDrQWSCOjJSrC3FO6hJVT6O68fpclzj0 rNJCPIpy1pWtxfwsE7JQeQL7J9NlB6g= 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-326-tpdFBlVVMQOzf_5r7XB66Q-1; Mon, 23 Oct 2023 05:55:31 -0400 X-MC-Unique: tpdFBlVVMQOzf_5r7XB66Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 846CC382254C; Mon, 23 Oct 2023 09:55:31 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.225.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id C122E2166B26; Mon, 23 Oct 2023 09:55:30 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Maxime Coquelin , Chenbo Xia Subject: [PATCH 3/3] vhost: annotate virtqueue access checks Date: Mon, 23 Oct 2023 11:55:20 +0200 Message-ID: <20231023095520.2864868-3-david.marchand@redhat.com> In-Reply-To: <20231023095520.2864868-1-david.marchand@redhat.com> References: <20231023095520.2864868-1-david.marchand@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: 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 Modifying vq->access_ok should be done with a write lock taken. Annotate vring_translate() and vring_invalidate() and add missing locks. Signed-off-by: David Marchand --- lib/vhost/vduse.c | 4 ++++ lib/vhost/vhost.h | 7 +++++-- lib/vhost/vhost_user.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index 080b58f7de..e198eeef64 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -196,6 +196,7 @@ vduse_vring_setup(struct virtio_net *dev, unsigned int index) vq->size * sizeof(struct batch_copy_elem), RTE_CACHE_LINE_SIZE, 0); + rte_rwlock_write_lock(&vq->access_lock); vhost_user_iotlb_rd_lock(vq); if (vring_translate(dev, vq)) VHOST_LOG_CONFIG(dev->ifname, ERR, "Failed to translate vring %d addresses\n", @@ -206,6 +207,7 @@ vduse_vring_setup(struct virtio_net *dev, unsigned int index) "Failed to disable guest notifications on vring %d\n", index); vhost_user_iotlb_rd_unlock(vq); + rte_rwlock_write_unlock(&vq->access_lock); vq_efd.index = index; vq_efd.fd = vq->kickfd; @@ -259,7 +261,9 @@ vduse_vring_cleanup(struct virtio_net *dev, unsigned int index) close(vq->kickfd); vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; + rte_rwlock_write_lock(&vq->access_lock); vring_invalidate(dev, vq); + rte_rwlock_write_unlock(&vq->access_lock); rte_free(vq->batch_copy_elems); vq->batch_copy_elems = NULL; diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 5fc9035a1f..70d18bdfbf 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -295,7 +295,8 @@ struct vhost_virtqueue { #define VIRTIO_UNINITIALIZED_EVENTFD (-2) bool enabled; - bool access_ok; + /* Protected by vq->access_lock */ + bool access_ok __rte_guarded_var; bool ready; rte_rwlock_t access_lock; @@ -874,11 +875,13 @@ void *vhost_alloc_copy_ind_table(struct virtio_net *dev, uint64_t desc_addr, uint64_t desc_len) __rte_shared_locks_required(&vq->iotlb_lock); int vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq) + __rte_exclusive_locks_required(&vq->access_lock) __rte_shared_locks_required(&vq->iotlb_lock); uint64_t translate_log_addr(struct virtio_net *dev, struct vhost_virtqueue *vq, uint64_t log_addr) __rte_shared_locks_required(&vq->iotlb_lock); -void vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq); +void vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq) + __rte_exclusive_locks_required(&vq->access_lock); static __rte_always_inline uint64_t vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq, diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 5bbdbd54d8..cbe2222ef3 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -797,6 +797,8 @@ translate_ring_addresses(struct virtio_net **pdev, struct vhost_virtqueue **pvq) dev = *pdev; vq = *pvq; + vq_assert_lock(dev, vq); + if (vq->ring_addrs.flags & (1 << VHOST_VRING_F_LOG)) { vq->log_guest_addr = log_addr_to_gpa(dev, vq); @@ -934,6 +936,9 @@ vhost_user_set_vring_addr(struct virtio_net **pdev, /* addr->index refers to the queue index. The txq 1, rxq is 0. */ vq = dev->virtqueue[ctx->msg.payload.addr.index]; + /* vhost_user_lock_all_queue_pairs locked all qps */ + VHOST_USER_ASSERT_LOCK(dev, vq, VHOST_USER_SET_VRING_ADDR); + access_ok = vq->access_ok; /* @@ -1446,6 +1451,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, continue; if (vq->desc || vq->avail || vq->used) { + /* vhost_user_lock_all_queue_pairs locked all qps */ + VHOST_USER_ASSERT_LOCK(dev, vq, VHOST_USER_SET_MEM_TABLE); + /* * If the memory table got updated, the ring addresses * need to be translated again as virtual addresses have @@ -2208,7 +2216,9 @@ vhost_user_get_vring_base(struct virtio_net **pdev, vhost_user_iotlb_flush_all(dev); + rte_rwlock_write_lock(&vq->access_lock); vring_invalidate(dev, vq); + rte_rwlock_write_unlock(&vq->access_lock); return RTE_VHOST_MSG_RESULT_REPLY; } -- 2.41.0