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 AF93143676; Tue, 5 Dec 2023 10:46:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19B3642E1C; Tue, 5 Dec 2023 10:45:58 +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 80D0142E1B for ; Tue, 5 Dec 2023 10:45:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701769556; 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=rDL248rV7ydfFL382lO2CSTsGqjKdkjzDEz3CaMDRKA=; b=TmhSu+nNlowqzUNj706HgLNwMyqThcRT0dYIBONNwdMkc0HJyA7gxhlFXIKiudl97zVM/h WY07pM62wynf68Q/PPdXyYwlRItTynUyRshNScF8brfVs1fdFbXtFGGYhy8OC7rinGwzkr Z+YcdXLCJrTC5oPcB6DFaVriIuSNRco= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-Kz7XF72lO9-MeUSPSYKQCg-1; Tue, 05 Dec 2023 04:45:54 -0500 X-MC-Unique: Kz7XF72lO9-MeUSPSYKQCg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 8B3713CBDFA8; Tue, 5 Dec 2023 09:45:54 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.225.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id A71AD51E3; Tue, 5 Dec 2023 09:45:53 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Eelco Chaudron , Maxime Coquelin , Chenbo Xia Subject: [PATCH v2 4/5] vhost: annotate virtqueue access checks Date: Tue, 5 Dec 2023 10:45:34 +0100 Message-ID: <20231205094536.2816720-4-david.marchand@redhat.com> In-Reply-To: <20231205094536.2816720-1-david.marchand@redhat.com> References: <20231023095520.2864868-1-david.marchand@redhat.com> <20231205094536.2816720-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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(). Signed-off-by: David Marchand Acked-by: Eelco Chaudron --- Changes since v1: - moved fixes in separate patches, --- lib/vhost/vhost.h | 7 +++++-- lib/vhost/vhost_user.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index f8624fba3d..6767246656 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; @@ -875,11 +876,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 a323ce5fbf..651ea5854b 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -787,6 +787,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); @@ -924,6 +926,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 */ + vq_assert_lock(dev, vq); + access_ok = vq->access_ok; /* @@ -1436,6 +1441,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 */ + vq_assert_lock(dev, vq); + /* * If the memory table got updated, the ring addresses * need to be translated again as virtual addresses have -- 2.42.0