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 409B8432DA for ; Wed, 8 Nov 2023 20:25:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B57D42D80; Wed, 8 Nov 2023 20:25:57 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id C62C440395 for ; Wed, 8 Nov 2023 20:25:55 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40838915cecso53355215e9.2 for ; Wed, 08 Nov 2023 11:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471555; x=1700076355; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l/N+5uczRCmf7j4F6cwrKcb6zZKzpSR1HFCSK35YSzs=; b=izH0d926HvW0SeXFTQXGhMTbF/BDadI+i5w9wcXzT8VB7RVCjR43j1fezt9CCK5x4h 9K+y/KJEebfdE8rQ3r7ZP+CUKDupn/8wODfH5d42VrwHLz1xZ5AX9Q4Y5CoGGQZRk5oC CFpz3lC4aJGnDI77JqY68mq73E/4USAtkoCnLdZqRCDwTT6GGSaOzur9nk/YdRp1aiZ0 RDCkpPaL0MYfiBWlBEn06MwLjSk0lEZtukI4okzPD8cCPbqcVWuafvvykMis5vHh4fBC LaNS9x8/kdu5U/DoJVekigmCzbN9mtU6f+OzHso/PldoWc/zxNAgf9kf8cec8CSWRnvA UKDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471555; x=1700076355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l/N+5uczRCmf7j4F6cwrKcb6zZKzpSR1HFCSK35YSzs=; b=mZi7CNe3fptS7sPXmZ6jH96ARHNdHZ7Pvvp+DFL2Re+/+tJBhVlmLiTi8NlPpQcOsh akbLQGBJ+h7+Y38FGTVPwRu8dJwSxiVG3fo1e8NBuO6edeqjlyQAFAfuR+Yc01LyDl41 Rj0UU8tvnH+eg0GYoi6OkfDKwOD+Sv4xdyn1TNYDGwnulSJpiFYv+35h7XvHU9MbmxEE 1ojHxLS26FFpQywpvVRHqRtYIJDl8iRi5TzrqiIwih/eVb+jsZgyAWBgv3FgzKu2xj7L TrHHs0I2MJD3DJb18I4nlzsHjIMDx42Bc63EvoMNRg1c8sZMwE28R3vlkGtI16cWB6kL dpbw== X-Gm-Message-State: AOJu0YyVtQi2yoQaC4liIiIkA3S0FzjVXX7fn8jnsrX3+CDuj0My+aN/ svhVcjjTtFkiJ5l9qTRiSiXqjtMensFOcQ== X-Google-Smtp-Source: AGHT+IEU64ojVemRUY+sKq6kGgdKD4Ltkh35L/Jf7UU/fj3R0R60Fa2jZKNFekgaTJmVIGhLixWnAA== X-Received: by 2002:a05:600c:198a:b0:407:462a:7e9f with SMTP id t10-20020a05600c198a00b00407462a7e9fmr2595720wmq.27.1699471555186; Wed, 08 Nov 2023 11:25:55 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id m26-20020a05600c3b1a00b00407752bd834sm20490403wms.1.2023.11.08.11.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:25:54 -0800 (PST) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: David Marchand , dpdk stable Subject: patch 'vhost: fix missing check on virtqueue access' has been queued to stable release 20.11.10 Date: Wed, 8 Nov 2023 19:25:05 +0000 Message-Id: <20231108192535.922238-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108192535.922238-1-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> <20231108192535.922238-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6a3395ad5264dd58ced88f79997d3304f0de9f4f Thanks. Luca Boccassi --- >From 6a3395ad5264dd58ced88f79997d3304f0de9f4f Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:47:59 +0200 Subject: [PATCH] vhost: fix missing check on virtqueue access [ upstream commit 094c442cdbf1da3a19ae82ca7069fee8b3a43343 ] 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") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/librte_vhost/vhost.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index cb3ede8942..e62d797c89 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -1341,7 +1341,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) rte_spinlock_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; @@ -1433,9 +1436,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) rte_spinlock_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_spinlock_unlock(&vq->access_lock); return ret; @@ -1495,7 +1504,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) rte_spinlock_lock(&vq->access_lock); - if (unlikely(vq->enabled == 0 || 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; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:52.275363126 +0000 +++ 0007-vhost-fix-missing-check-on-virtqueue-access.patch 2023-11-08 19:23:51.733395465 +0000 @@ -1 +1 @@ -From 094c442cdbf1da3a19ae82ca7069fee8b3a43343 Mon Sep 17 00:00:00 2001 +From 6a3395ad5264dd58ced88f79997d3304f0de9f4f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 094c442cdbf1da3a19ae82ca7069fee8b3a43343 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - lib/vhost/vhost.c | 16 ++++++++++++++-- + lib/librte_vhost/vhost.c | 16 ++++++++++++++-- @@ -20,5 +21,5 @@ -diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c -index b438330063..43173c9eee 100644 ---- a/lib/vhost/vhost.c -+++ b/lib/vhost/vhost.c -@@ -1420,7 +1420,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) +diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c +index cb3ede8942..e62d797c89 100644 +--- a/lib/librte_vhost/vhost.c ++++ b/lib/librte_vhost/vhost.c +@@ -1341,7 +1341,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) @@ -26 +27 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -36 +37 @@ -@@ -1512,9 +1515,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) +@@ -1433,9 +1436,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) @@ -38 +39 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -49 +50 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -52 +53 @@ -@@ -1607,7 +1616,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) +@@ -1495,7 +1504,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) @@ -54 +55 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -56 +57 @@ -- if (unlikely(!vq->enabled || vq->avail == NULL)) +- if (unlikely(vq->enabled == 0 || vq->avail == NULL))