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 9F8E4A0350 for ; Mon, 28 Feb 2022 22:22:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 957544067B; Mon, 28 Feb 2022 22:22:12 +0100 (CET) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mails.dpdk.org (Postfix) with ESMTP id 2280440140 for ; Mon, 28 Feb 2022 22:22:11 +0100 (CET) Received: by mail-ed1-f42.google.com with SMTP id p4so4327164edi.1 for ; Mon, 28 Feb 2022 13:22:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8wbrLC3kvaL2usIzTm/XEl6RCa33KHLXb9Pf/+q388Q=; b=OT8cot6McgEoukS/9JBGQUYM6IMKs2e36TvC0k/l340WN289HDhK8Do2JfMfmOwl2Q WQ3S0cCmkZMpkGBZsWZ39gu/u3W1ABEYV6fVD3DVJv11E4Y0sUIEUoIlx/mwSkPuZeJn /DdPl0XyhXJUfrbwUXmg9/RehsVp/kJP96D4dKWDsCvNa9aMOGhtp3T8GO5tYYfdjFkY T7SAnBIVjj0fWj00diI9tvT2qAUgeslG8PI8mWM2pvvbncdO3b6zfptYU1sA5PepPECZ cEFKm3KC1N9+A0iWjo9UQclk/exdMid0BGzUPsxIZQxtIv33WxGDuoCM0x1OLNhuWbzV EnRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8wbrLC3kvaL2usIzTm/XEl6RCa33KHLXb9Pf/+q388Q=; b=MvqtZVZflNR7pJHU2pwn1l5Y61JcmSiNFQj8s9lqrQaD69tvXOh6s+flwQBop5/5W5 Qm9g+hOnearS+n60otG7iuM2/5s0Uku76GdCH4J/AK6avzvgGGNMCgEd0HyRAvDi+j5j WkxgKm4pUBt1TZ8nZ6vvYt2LMJjMHPg+N8YCEQ3PdqgiH/LZjqqWu6upSQue51G5qMsd fgwoQyOdh8xAGhuT3th8QqaasxPpurUoNnL8G4OwrjHqhjg2iMvDPkRJa6I89aRp35gu kqVKpIXdJ54LRqnwF3l+AGOATxLFC5942ONovdEYiWIcN2O82FeBiUWzgJLbHG8U/755 p6ig== X-Gm-Message-State: AOAM531i7NAoTqAeVrY/TpdyYtux8vU+1yDvUkQKR7D7fTtHg2btRvyQ J77sTSgpstZD0iOOPwq5ASQ= X-Google-Smtp-Source: ABdhPJxxe5DR8oHuQZVZ3H0cp4Tyf/yb7s7l8vROLi9mw29QFSu0zrmNYhlEtK5cj23Ofs6IwqyWvQ== X-Received: by 2002:a05:6402:278b:b0:412:80a5:6cb3 with SMTP id b11-20020a056402278b00b0041280a56cb3mr21624243ede.157.1646083330788; Mon, 28 Feb 2022 13:22:10 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id l1-20020a056402028100b0040f682ee13dsm6438613edv.26.2022.02.28.13.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:22:10 -0800 (PST) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: Chenbo Xia , David Marchand , dpdk stable Subject: patch 'vhost: fix unsafe vring addresses modifications' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:22 +0000 Message-Id: <20220228212047.3341966-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/22. 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/33f2e375618602da76c84d408876edd34c179740 Thanks. Luca Boccassi --- >From 33f2e375618602da76c84d408876edd34c179740 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 27 Jan 2022 12:09:53 +0100 Subject: [PATCH] vhost: fix unsafe vring addresses modifications [ upstream commit 04c27cb673b983ce2580731c0afc4b0e815fd658 ] This patch adds missing protection around vring_invalidate and translate_ring_addresses calls in vhost_user_iotlb_msg. Fixes: eefac9536a90 ("vhost: postpone device creation until rings are mapped") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia Reviewed-by: David Marchand --- lib/librte_vhost/vhost_user.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 0ee54def9c..11d58113a7 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -2379,8 +2379,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, vhost_user_iotlb_cache_insert(vq, imsg->iova, vva, len, imsg->perm); - if (is_vring_iotlb(dev, vq, imsg)) + if (is_vring_iotlb(dev, vq, imsg)) { + rte_spinlock_lock(&vq->access_lock); *pdev = dev = translate_ring_addresses(dev, i); + rte_spinlock_unlock(&vq->access_lock); + } } break; case VHOST_IOTLB_INVALIDATE: @@ -2393,8 +2396,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, vhost_user_iotlb_cache_remove(vq, imsg->iova, imsg->size); - if (is_vring_iotlb(dev, vq, imsg)) + if (is_vring_iotlb(dev, vq, imsg)) { + rte_spinlock_lock(&vq->access_lock); vring_invalidate(dev, vq); + rte_spinlock_unlock(&vq->access_lock); + } } break; default: -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:56.055035138 +0000 +++ 0026-vhost-fix-unsafe-vring-addresses-modifications.patch 2022-02-28 21:17:53.912930808 +0000 @@ -1 +1 @@ -From 04c27cb673b983ce2580731c0afc4b0e815fd658 Mon Sep 17 00:00:00 2001 +From 33f2e375618602da76c84d408876edd34c179740 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 04c27cb673b983ce2580731c0afc4b0e815fd658 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/vhost/vhost_user.c | 10 ++++++++-- + lib/librte_vhost/vhost_user.c | 10 ++++++++-- @@ -19,6 +20,6 @@ -diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c -index 8ee9c3e2db..723c6890c3 100644 ---- a/lib/vhost/vhost_user.c -+++ b/lib/vhost/vhost_user.c -@@ -2564,8 +2564,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, - vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva, +diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c +index 0ee54def9c..11d58113a7 100644 +--- a/lib/librte_vhost/vhost_user.c ++++ b/lib/librte_vhost/vhost_user.c +@@ -2379,8 +2379,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, + vhost_user_iotlb_cache_insert(vq, imsg->iova, vva, @@ -36 +37 @@ -@@ -2578,8 +2581,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, +@@ -2393,8 +2396,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,