From 62617af77e0c19c9f295c2285f374ae9d2d8e7c1 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 7 Mar 2019 13:22:10 -0800 Subject: [PATCH] xen/arm: use p2m_mmio_direct_c to map reserved-memory Don't use p2m_ram_rw for memory mapped into the guest with iomem, and for reserved-memory regions. Instead, use p2m_mmio_direct_c which has very similar pagetable properties but not the same security implications (p2m_is_ram checks and memory allocations.) Signed-off-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/p2m.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index fb13f5b60a..6fcf02c9a8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1327,7 +1327,7 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, * p2m. */ if ( !strcmp(dt_node_name(node), "reserved-memory") ) - p2mt = p2m_ram_rw; + p2mt = p2m_mmio_direct_c; res = handle_device(d, node, p2mt); if ( res) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 5b8fcc59f5..3bac5d8d14 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1076,7 +1076,7 @@ int map_mmio_regions(struct domain *d, switch ( cache_policy ) { case CACHEABILITY_MEMORY: - t = p2m_ram_rw; + t = p2m_mmio_direct_c; break; case CACHEABILITY_DEVMEM: t = p2m_mmio_direct_dev; -- 2.39.5