From nobody Fri Mar 14 19:47:42 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=reject dis=none) header.from=oracle.com
ARC-Seal: i=1; a=rsa-sha256; t=1738767560; cv=none;
d=zohomail.com; s=zohoarc;
b=G4mvHuba7zsptlEwRbEOMNoiJzHz9mcIFj45VLlf5FWicsRQ9OAwghHePLOCPR95uvNV98KpaIluLg8bBs9n71gRAoedvGZFigwNOUFA64z6D/DipxxRu/8vgxVCdmAOEQgrg6jZ0m5jNCLzu6WW5nQqlYYJ4hE7zgFlaxVhW/c=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738767560;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=j/k9/q28KjJdlKFMrtf+MmLMnEeMJRhfS7oG05H4Lpo=;
b=NVYyq8gWz3xqJe3e7L+33DHaDDDs9uC9YY8wXmgSZJgs2h2zMfhwd7gV+5HeazPmFUPV1Vkk/j9Nu2TAQCH1r+Z01iHjYfncbIX82Pa4svibcANKbTg/4SeWjxx21XB8Gj6OzUukCp0JErV2LkHSRXVX+OPuHIVpCXJV46OGRaQ=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<jonah.palmer@oracle.com> (p=reject dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738767559969911.2168135489962;
Wed, 5 Feb 2025 06:59:19 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tfgrE-0007b8-P4; Wed, 05 Feb 2025 09:58:28 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jonah.palmer@oracle.com>)
id 1tfgrB-0007Yj-6a
for qemu-devel@nongnu.org; Wed, 05 Feb 2025 09:58:25 -0500
Received: from mx0b-00069f02.pphosted.com ([205.220.177.32])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jonah.palmer@oracle.com>)
id 1tfgr8-0008Ty-BM
for qemu-devel@nongnu.org; Wed, 05 Feb 2025 09:58:24 -0500
Received: from pps.filterd (m0246630.ppops.net [127.0.0.1])
by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id
515DSWlC023797;
Wed, 5 Feb 2025 14:58:19 GMT
Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com
(phxpaimrmta01.appoci.oracle.com [138.1.114.2])
by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44m50u8myt-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
Wed, 05 Feb 2025 14:58:19 +0000 (GMT)
Received: from pps.filterd
(phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1])
by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2)
with ESMTP id 515Eibg0022556; Wed, 5 Feb 2025 14:58:18 GMT
Received: from pps.reinject (localhost [127.0.0.1])
by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id
44j8e96bex-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
Wed, 05 Feb 2025 14:58:18 +0000
Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com
(phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1])
by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 515EwGh9022923;
Wed, 5 Feb 2025 14:58:18 GMT
Received: from jonah-ol8.us.oracle.com (dhcp-10-65-182-246.vpn.oracle.com
[10.65.182.246])
by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id
44j8e96bbx-2; Wed, 05 Feb 2025 14:58:17 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc
:content-transfer-encoding:date:from:in-reply-to:message-id
:mime-version:references:subject:to; s=corp-2023-11-20; bh=j/k9/
q28KjJdlKFMrtf+MmLMnEeMJRhfS7oG05H4Lpo=; b=lHzKlzGfm2Zyo008Da+3l
IUpdo1M2/9y3Iq9HSO1TpGeZDVNWiBxCQcEWJfn5meZmO0zBJC2wsunFC5NmUstm
//ePU1pBHpKN33wTrAmEwHt0W4e7mhQaN8fJF5DOz6NNdlhUqk9kbPJ63xIakxs8
G+iCd1G5EUly+eJruEbq3ofXGKmBnHPrFRlZB1gaeX2fKBfNzqwPwn+LxZJLDzEI
dtA1+Hpkeen8M+hoMRlSuo5ML7eog8dBEltk3iZbR/W0SHiSmizyRK+xnnLJvCBq
nMWHQy/EbATX95AV8pAXTT2w7LyP7MRQFTGUTgTQaw2fCnLjHOvxuaYKHkPxG8AT
A==
From: Jonah Palmer <jonah.palmer@oracle.com>
To: qemu-devel@nongnu.org
Cc: eperezma@redhat.com, mst@redhat.com, leiyang@redhat.com,
peterx@redhat.com,
dtatulea@nvidia.com, jasowang@redhat.com, si-wei.liu@oracle.com,
boris.ostrovsky@oracle.com, jonah.palmer@oracle.com
Subject: [PATCH 1/4] vhost-iova-tree: Implement an IOVA-only tree
Date: Wed, 5 Feb 2025 09:58:07 -0500
Message-ID: <20250205145813.394915-2-jonah.palmer@oracle.com>
X-Mailer: git-send-email 2.43.5
In-Reply-To: <20250205145813.394915-1-jonah.palmer@oracle.com>
References: <20250205145813.394915-1-jonah.palmer@oracle.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34
definitions=2025-02-05_06,2025-02-05_02,2024-11-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
mlxlogscore=999
phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0
mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
engine=8.12.0-2501170000 definitions=main-2502050117
X-Proofpoint-GUID: 7eLc6QzVj_ou9J6AqBLbr3pmieGA5iep
X-Proofpoint-ORIG-GUID: 7eLc6QzVj_ou9J6AqBLbr3pmieGA5iep
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=205.220.177.32;
envelope-from=jonah.palmer@oracle.com; helo=mx0b-00069f02.pphosted.com
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @oracle.com)
X-ZM-MESSAGEID: 1738767561553019000
Content-Type: text/plain; charset="utf-8"
Creates and supports an IOVA-only tree to support a SVQ IOVA->HVA and
GPA->IOVA tree for host-only and guest-backed memory, respectively, in
the next patch.
The IOVA allocator still allocates an IOVA range but now adds this range
to the IOVA-only tree as well as to the full IOVA->HVA tree.
In the next patch, the full IOVA->HVA tree will be split into a partial
SVQ IOVA->HVA tree and a GPA->IOVA tree. The motivation behind having an
IOVA-only tree was to have a single tree that would keep track of all
allocated IOVA ranges between the partial SVQ IOVA->HVA and GPA->IOVA
trees.
Signed-off-by: Jonah Palmer <jonah.palmer@oracle.com>
---
hw/virtio/vhost-iova-tree.c | 26 ++++++++++++++++++++------
hw/virtio/vhost-iova-tree.h | 3 ++-
hw/virtio/vhost-vdpa.c | 29 +++++++++++++++++++++--------
net/vhost-vdpa.c | 10 ++++++++--
4 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/hw/virtio/vhost-iova-tree.c b/hw/virtio/vhost-iova-tree.c
index 3d03395a77..216885aa3c 100644
--- a/hw/virtio/vhost-iova-tree.c
+++ b/hw/virtio/vhost-iova-tree.c
@@ -28,6 +28,9 @@ struct VhostIOVATree {
=20
/* IOVA address to qemu memory maps. */
IOVATree *iova_taddr_map;
+
+ /* Allocated IOVA addresses */
+ IOVATree *iova_map;
};
=20
/**
@@ -44,6 +47,7 @@ VhostIOVATree *vhost_iova_tree_new(hwaddr iova_first, hwa=
ddr iova_last)
tree->iova_last =3D iova_last;
=20
tree->iova_taddr_map =3D iova_tree_new();
+ tree->iova_map =3D iova_tree_new();
return tree;
}
=20
@@ -53,6 +57,7 @@ VhostIOVATree *vhost_iova_tree_new(hwaddr iova_first, hwa=
ddr iova_last)
void vhost_iova_tree_delete(VhostIOVATree *iova_tree)
{
iova_tree_destroy(iova_tree->iova_taddr_map);
+ iova_tree_destroy(iova_tree->iova_map);
g_free(iova_tree);
}
=20
@@ -75,6 +80,7 @@ const DMAMap *vhost_iova_tree_find_iova(const VhostIOVATr=
ee *tree,
*
* @tree: The iova tree
* @map: The iova map
+ * @taddr: The translated address (HVA)
*
* Returns:
* - IOVA_OK if the map fits in the container
@@ -83,19 +89,26 @@ const DMAMap *vhost_iova_tree_find_iova(const VhostIOVA=
Tree *tree,
*
* It returns assignated iova in map->iova if return value is VHOST_DMA_MA=
P_OK.
*/
-int vhost_iova_tree_map_alloc(VhostIOVATree *tree, DMAMap *map)
+int vhost_iova_tree_map_alloc(VhostIOVATree *tree, DMAMap *map, hwaddr tad=
dr)
{
+ int ret;
+
/* Some vhost devices do not like addr 0. Skip first page */
hwaddr iova_first =3D tree->iova_first ?: qemu_real_host_page_size();
=20
- if (map->translated_addr + map->size < map->translated_addr ||
- map->perm =3D=3D IOMMU_NONE) {
+ if (taddr + map->size < taddr || map->perm =3D=3D IOMMU_NONE) {
return IOVA_ERR_INVALID;
}
=20
- /* Allocate a node in IOVA address */
- return iova_tree_alloc_map(tree->iova_taddr_map, map, iova_first,
- tree->iova_last);
+ /* Allocate a node in the IOVA-only tree */
+ ret =3D iova_tree_alloc_map(tree->iova_map, map, iova_first, tree->iov=
a_last);
+ if (unlikely(ret !=3D IOVA_OK)) {
+ return ret;
+ }
+
+ /* Insert a node in the IOVA->HVA tree */
+ map->translated_addr =3D taddr;
+ return iova_tree_insert(tree->iova_taddr_map, map);
}
=20
/**
@@ -107,4 +120,5 @@ int vhost_iova_tree_map_alloc(VhostIOVATree *tree, DMAM=
ap *map)
void vhost_iova_tree_remove(VhostIOVATree *iova_tree, DMAMap map)
{
iova_tree_remove(iova_tree->iova_taddr_map, map);
+ iova_tree_remove(iova_tree->iova_map, map);
}
diff --git a/hw/virtio/vhost-iova-tree.h b/hw/virtio/vhost-iova-tree.h
index 4adfd79ff0..525ce72b1d 100644
--- a/hw/virtio/vhost-iova-tree.h
+++ b/hw/virtio/vhost-iova-tree.h
@@ -21,7 +21,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(VhostIOVATree, vhost_iova_t=
ree_delete);
=20
const DMAMap *vhost_iova_tree_find_iova(const VhostIOVATree *iova_tree,
const DMAMap *map);
-int vhost_iova_tree_map_alloc(VhostIOVATree *iova_tree, DMAMap *map);
+int vhost_iova_tree_map_alloc(VhostIOVATree *iova_tree, DMAMap *map,
+ hwaddr taddr);
void vhost_iova_tree_remove(VhostIOVATree *iova_tree, DMAMap map);
=20
#endif
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 3cdaa12ed5..703dcfc929 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -360,14 +360,20 @@ static void vhost_vdpa_listener_region_add(MemoryList=
ener *listener,
llsize =3D int128_sub(llend, int128_make64(iova));
if (s->shadow_data) {
int r;
+ hwaddr hw_vaddr =3D (hwaddr)(uintptr_t)vaddr;
=20
- mem_region.translated_addr =3D (hwaddr)(uintptr_t)vaddr,
mem_region.size =3D int128_get64(llsize) - 1,
mem_region.perm =3D IOMMU_ACCESS_FLAG(true, section->readonly),
=20
- r =3D vhost_iova_tree_map_alloc(s->iova_tree, &mem_region);
+ r =3D vhost_iova_tree_map_alloc(s->iova_tree, &mem_region, hw_vadd=
r);
if (unlikely(r !=3D IOVA_OK)) {
error_report("Can't allocate a mapping (%d)", r);
+
+ if (mem_region.translated_addr =3D=3D hw_vaddr) {
+ error_report("Insertion to IOVA->HVA tree failed");
+ /* Remove the mapping from the IOVA-only tree */
+ goto fail_map;
+ }
goto fail;
}
=20
@@ -1142,16 +1148,23 @@ static void vhost_vdpa_svq_unmap_rings(struct vhost=
_dev *dev,
*
* @v: Vhost-vdpa device
* @needle: The area to search iova
+ * @taddr: The translated address (HVA)
* @errorp: Error pointer
*/
static bool vhost_vdpa_svq_map_ring(struct vhost_vdpa *v, DMAMap *needle,
- Error **errp)
+ hwaddr taddr, Error **errp)
{
int r;
=20
- r =3D vhost_iova_tree_map_alloc(v->shared->iova_tree, needle);
+ r =3D vhost_iova_tree_map_alloc(v->shared->iova_tree, needle, taddr);
if (unlikely(r !=3D IOVA_OK)) {
error_setg(errp, "Cannot allocate iova (%d)", r);
+
+ if (needle->translated_addr =3D=3D taddr) {
+ error_append_hint(errp, "Insertion to IOVA->HVA tree failed");
+ /* Remove the mapping from the IOVA-only tree */
+ vhost_iova_tree_remove(v->shared->iova_tree, *needle);
+ }
return false;
}
=20
@@ -1192,11 +1205,11 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_d=
ev *dev,
vhost_svq_get_vring_addr(svq, &svq_addr);
=20
driver_region =3D (DMAMap) {
- .translated_addr =3D svq_addr.desc_user_addr,
.size =3D driver_size - 1,
.perm =3D IOMMU_RO,
};
- ok =3D vhost_vdpa_svq_map_ring(v, &driver_region, errp);
+ ok =3D vhost_vdpa_svq_map_ring(v, &driver_region, svq_addr.desc_user_a=
ddr,
+ errp);
if (unlikely(!ok)) {
error_prepend(errp, "Cannot create vq driver region: ");
return false;
@@ -1206,11 +1219,11 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_d=
ev *dev,
addr->avail_user_addr =3D driver_region.iova + avail_offset;
=20
device_region =3D (DMAMap) {
- .translated_addr =3D svq_addr.used_user_addr,
.size =3D device_size - 1,
.perm =3D IOMMU_RW,
};
- ok =3D vhost_vdpa_svq_map_ring(v, &device_region, errp);
+ ok =3D vhost_vdpa_svq_map_ring(v, &device_region, svq_addr.used_user_a=
ddr,
+ errp);
if (unlikely(!ok)) {
error_prepend(errp, "Cannot create vq device region: ");
vhost_vdpa_svq_unmap_ring(v, driver_region.translated_addr);
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 231b45246c..5a3a57203d 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -510,14 +510,20 @@ static int vhost_vdpa_cvq_map_buf(struct vhost_vdpa *=
v, void *buf, size_t size,
bool write)
{
DMAMap map =3D {};
+ hwaddr taddr =3D (hwaddr)(uintptr_t)buf;
int r;
=20
- map.translated_addr =3D (hwaddr)(uintptr_t)buf;
map.size =3D size - 1;
map.perm =3D write ? IOMMU_RW : IOMMU_RO,
- r =3D vhost_iova_tree_map_alloc(v->shared->iova_tree, &map);
+ r =3D vhost_iova_tree_map_alloc(v->shared->iova_tree, &map, taddr);
if (unlikely(r !=3D IOVA_OK)) {
error_report("Cannot map injected element");
+
+ if (map.translated_addr =3D=3D taddr) {
+ error_report("Insertion to IOVA->HVA tree failed");
+ /* Remove the mapping from the IOVA-only tree */
+ goto dma_map_err;
+ }
return r;
}
=20
--=20
2.43.5