From patchwork Fri Oct 20 08:47:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133059 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 B0995431BA; Fri, 20 Oct 2023 10:48:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A4AE40A67; Fri, 20 Oct 2023 10:48:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6D4D3402B8 for ; Fri, 20 Oct 2023 10:48:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791693; 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=eLO6Saj0e0DoyVmFRVUdS2pGCnma22zBL/hNYG3nhFA=; b=KvLIdjXgoK3bj0naNXaSuZRy9vXFIFzItDgSSuPPHlhJYmTOA2zqzi4n/KI+hcETVWNDq/ +g5Cyc+eJKzcOVB7bdYgadHrOB1KfUM9FANOdEFujgzhgUfiS7lCN0sR7tKCZ+kBnypJTO mg+Qk7Yy54FN4LWN6vf6RwqAGtZzIM0= 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-661-JHL_K4SGO7-dEVtVLfPjKg-1; Fri, 20 Oct 2023 04:48:10 -0400 X-MC-Unique: JHL_K4SGO7-dEVtVLfPjKg-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 6BE4F88CC4A; Fri, 20 Oct 2023 08:48:10 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ABE140C6F7B; Fri, 20 Oct 2023 08:48:08 +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 1/7] vhost: fix missing vring call check on virtqueue access Date: Fri, 20 Oct 2023 10:47:58 +0200 Message-ID: <20231020084804.3625099-2-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: 6c299bb7322f ("vhost: introduce vring call API") Fixes: c5736998305d ("vhost: fix missing virtqueue lock protection") Fixes: 830f7e790732 ("vhost: add non-blocking API for posting interrupt") Cc: stable@dpdk.org Reported-by: Li Feng Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 7fde412ef3..0d2bc1a48b 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1330,6 +1330,7 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1344,14 +1345,20 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) rte_rwlock_read_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); - return 0; + return ret; } int @@ -1359,6 +1366,7 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1374,14 +1382,20 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) if (rte_rwlock_read_trylock(&vq->access_lock)) return -EAGAIN; + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); - return 0; + return ret; } uint16_t From patchwork Fri Oct 20 08:47:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133060 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 3838E431BA; Fri, 20 Oct 2023 10:48:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE6A840A8B; Fri, 20 Oct 2023 10:48:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 06CE540A6F for ; Fri, 20 Oct 2023 10:48:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791695; 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=kzlNweC7zH4RL73PBYFoSyMUhwm5eL1sK333jJt7e5o=; b=RieQTLvh4ra6l7Tgx6wma3ckVj8FndRXcUSwt+Q35NJCgh6FZ8Wx0/sV2rWx9BAF1ATxLy CHzaSfF0ItfaMeSs0LZd6jh0Pusn48zTtyLW+JfJJtjel87auu5o4x2ByGR59g/5KZDSU7 SNpP0hDsQX02SD9XRJucxDLSQVK27d4= 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-341-N_4v58nBMAmsHKHLOKHS-w-1; Fri, 20 Oct 2023 04:48:12 -0400 X-MC-Unique: N_4v58nBMAmsHKHLOKHS-w-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 0E77E886C62; Fri, 20 Oct 2023 08:48:12 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id B11C840C6F7B; Fri, 20 Oct 2023 08:48:10 +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 2/7] vhost: fix missing check on virtqueue access Date: Fri, 20 Oct 2023 10:47:59 +0200 Message-ID: <20231020084804.3625099-3-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: 4e0de8dac853 ("vhost: protect vring access done by application") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 0d2bc1a48b..446bca1574 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1418,7 +1418,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) rte_rwlock_write_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; ret = *(volatile uint16_t *)&vq->avail->idx - vq->last_used_idx; @@ -1510,9 +1513,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) rte_rwlock_write_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + vq->notif_enable = enable; ret = vhost_enable_guest_notification(dev, vq, enable); +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); return ret; @@ -1605,7 +1614,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) rte_rwlock_write_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; ret = *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx; From patchwork Fri Oct 20 08:48:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133061 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 0637A431BA; Fri, 20 Oct 2023 10:48:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B5C340E54; Fri, 20 Oct 2023 10:48:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C608F40A7D for ; Fri, 20 Oct 2023 10:48:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791698; 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=GK4JGV/LkJ/03cOoYm3ZzzbRhzX7fdHT4SW0+F5j8js=; b=WjLCCq+AgKDTmA6WOn7OY50Exhcd8TVS9nnuDc7fdpDufNgmbN/pEgeAO3fCMFrD3CbJZ+ /cNOqNBeTKsCT8RspK5jxUk1THx6mEo4salx7yvmhzb7sLzXVVMEfr2McpvJDo3zGh86sq EzUHyA6nNqshHza0nn0sCf4/V43Pc74= 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-609-TGO14EioPU2nby03KDuoqQ-1; Fri, 20 Oct 2023 04:48:14 -0400 X-MC-Unique: TGO14EioPU2nby03KDuoqQ-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 A5E3A886C67; Fri, 20 Oct 2023 08:48:13 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5434840C6F7B; Fri, 20 Oct 2023 08:48:12 +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 3/7] vhost: fix checking virtqueue access when notifying guest Date: Fri, 20 Oct 2023 10:48:00 +0200 Message-ID: <20231020084804.3625099-4-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: 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 446bca1574..5428ff4a25 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1542,6 +1542,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; + __atomic_store_n(&vq->irq_pending, false, __ATOMIC_RELEASE); if (dev->backend_ops->inject_irq(dev, vq)) { @@ -1556,6 +1559,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); } 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; From patchwork Fri Oct 20 08:48:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133062 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 31B13431BA; Fri, 20 Oct 2023 10:48:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA94A410E6; Fri, 20 Oct 2023 10:48:22 +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 2D37940E7C for ; Fri, 20 Oct 2023 10:48:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791700; 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=NzDAVRUip9gWtWqiBGGWRMuHGgIeyrMYN5cD4uzgSg4=; b=QZyAAsGC+jP5dwsqHnvuIoa8VPoejt4kYHgcQWVnKUXGF+5GuZNL3dBKzjCjzzfpQ0Fi6v kSW/Vf0h8yKQZMWpA6C4Z1aAFewQc70ckCoMSykVZXimw87vAn6NnpX+KKWpN4kSarRORi npoKhodNFutDRbw7JaC4U36mB67Rsa0= 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-466-YiVJ5VLoP-2qg8ZVUz3zrw-1; Fri, 20 Oct 2023 04:48:17 -0400 X-MC-Unique: YiVJ5VLoP-2qg8ZVUz3zrw-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 E70D5868005; Fri, 20 Oct 2023 08:48:16 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 974BE40C6F7B; Fri, 20 Oct 2023 08:48:15 +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 5/7] vhost: fix check on virtqueue access in in-flight getter Date: Fri, 20 Oct 2023 10:48:02 +0200 Message-ID: <20231020084804.3625099-6-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: 0c0935c5f794 ("vhost: allow to check in-flight packets for async vhost") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index ccd3c0e865..a243f88398 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2073,9 +2073,15 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id) return ret; } + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq->async) ret = vq->async->pkts_inflight_n; +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); return ret; From patchwork Fri Oct 20 08:48:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133065 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 7FF96431BA; Fri, 20 Oct 2023 10:49:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D1649427DC; Fri, 20 Oct 2023 10:48:35 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 33A6A41133 for ; Fri, 20 Oct 2023 10:48:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791713; 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=YDQaIEt+f1Dt36/6GlmdKhBLWFcPTsATMi8lzC0tlqU=; b=OsDaI+7xm38lZuP/eCUT1JG8gX7tloyJexzqHTUsKMZsm+J86/X1Uaa9VPI1ZIAOXEkoaG upMzzfqHlZMVyKy4jkfT6vXXivwp8CbH16mHuXY5uBQj21M03vCV1gFAmoOIcXOctYYLUJ HpSCvoGFgOWryAmyLcDgwdtjt3FXxTI= 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-227-mnh7T5KxNTCzUUNfDLDj2Q-1; Fri, 20 Oct 2023 04:48:19 -0400 X-MC-Unique: mnh7T5KxNTCzUUNfDLDj2Q-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 9403710201FF; Fri, 20 Oct 2023 08:48:18 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4303340C6F7B; Fri, 20 Oct 2023 08:48:17 +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 6/7] vhost: fix missing lock protection in power monitor API Date: Fri, 20 Oct 2023 10:48:03 +0200 Message-ID: <20231020084804.3625099-7-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 The power monitor get API is missing both access lock protection and access status check. Fixes: 34fd4373ce76 ("vhost: add power monitor API") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index a243f88398..d8d74623d4 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2121,6 +2121,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; @@ -2131,6 +2132,13 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, if (vq == NULL) return -1; + rte_rwlock_read_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) { struct vring_packed_desc *desc; desc = vq->desc_packed; @@ -2150,7 +2158,10 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, pmc->match = 0; } - return 0; +out_unlock: + rte_rwlock_read_unlock(&vq->access_lock); + + return ret; } From patchwork Fri Oct 20 08:48:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133063 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 EB6C3431BA; Fri, 20 Oct 2023 10:48:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17F8140E6E; Fri, 20 Oct 2023 10:48:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1DF64410FD for ; Fri, 20 Oct 2023 10:48:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791703; 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=8JSUrGSqP7nlt3ZcvKG9CyGqWhawsrSkVV8RRlCQ52Q=; b=heR0rWQiGee8NnnrPvNdkw8UaEhaHzgRB0aZCH6qD3u+ZDhoVXZ832l/aAppaGN7ALwNO8 P6Z3G8FIlHdbxluXcqB/PLZ23QfVqJDe7Q7ZNK7DHYVRDu3RqtoBgKi9j9nWTsr7qFG/ig pHwWiW0q4UvWLRAxn2NDhHm14wjB3Rc= 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-317-efWv7JpiN3O-6iRQlRVr1w-1; Fri, 20 Oct 2023 04:48:20 -0400 X-MC-Unique: efWv7JpiN3O-6iRQlRVr1w-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 416EA886C67; Fri, 20 Oct 2023 08:48:20 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4CBC40C6F7B; Fri, 20 Oct 2023 08:48:18 +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 7/7] vhost: fix checking virtqueue access in stats API Date: Fri, 20 Oct 2023 10:48:04 +0200 Message-ID: <20231020084804.3625099-8-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: be75dc99ea1f ("vhost: support per-virtqueue statistics") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index d8d74623d4..b03e3b391d 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2199,6 +2199,7 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, struct virtio_net *dev = get_device(vid); struct vhost_virtqueue *vq; unsigned int i; + int ret = VHOST_NB_VQ_STATS; if (dev == NULL) return -1; @@ -2215,6 +2216,12 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, vq = dev->virtqueue[queue_id]; rte_rwlock_write_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + for (i = 0; i < VHOST_NB_VQ_STATS; i++) { /* * No need to the read atomic counters as such, due to the @@ -2224,15 +2231,18 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, *(uint64_t *)(((char *)vq) + vhost_vq_stat_strings[i].offset); stats[i].id = i; } + +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); - return VHOST_NB_VQ_STATS; + return ret; } int rte_vhost_vring_stats_reset(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; @@ -2246,14 +2256,21 @@ int rte_vhost_vring_stats_reset(int vid, uint16_t queue_id) vq = dev->virtqueue[queue_id]; rte_rwlock_write_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } /* * No need to the reset atomic counters as such, due to the * above write access_lock preventing them to be updated. */ memset(&vq->stats, 0, sizeof(vq->stats)); + +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); - return 0; + return ret; } int