mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-12 03:00:28 +00:00
Code Issues Releases Activity

emulators/xen-kernel: fix foreign mappings

Browse Source 
Backport upstream patch to fix foreign mappings.

Sponsored by:		Citrix Systems R&D
Approved by:		ports (tobik)
Differential revision:	https://reviews.freebsd.org/D21028
This commit is contained in:
Roger Pau Monné 2019-07-29 14:58:42 +00:00
parent 1f3f819351
commit 3a144d9694
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=507571
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emulators/xen-kernel/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xen
PORTVERSION= 4.12.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= emulators
MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/
PKGNAMESUFFIX= -kernel
@ -49,6 +49,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-linker-add-a-reloc-section-to-ELF-linker-sc
${PATCHDIR}/0003-xen-link-handle-.init.rodata.cst-sections-in-the-lin.patch:-p1 \
${PATCHDIR}/0004-x86-check-for-multiboot-1-2-header-presence.patch:-p1
# Fix for Intel foreign mapping issues.
EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-ept-pass-correct-level-to-p2m_entry_modify.patch:-p1
.include <bsd.port.options.mk>
.if ${OPSYS} != FreeBSD

57
emulators/xen-kernel/files/0001-x86-ept-pass-correct-level-to-p2m_entry_modify.patch Normal file
View File

@ -0,0 +1,57 @@
From ec2ab491b52815c1daedfdf3d95d13cfe25fb38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
Date: Tue, 16 Jul 2019 09:05:28 +0200
Subject: [PATCH] x86/ept: pass correct level to p2m_entry_modify
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
EPT differs from NPT and shadow when translating page orders to levels
in the physmap page tables. EPT page tables level for order 0 pages is
0, while NPT and shadow instead use 1, ie: EPT page tables levels
starts at 0 while NPT and shadow starts at 1.
Fix the p2m_entry_modify call in atomic_write_ept_entry to always add
one to the level, in order to match NPT and shadow usage.
While there also add a check to ensure p2m_entry_modify is never
called with level == 0. That should allow to catch future errors
related to the level parameter.
Fixes: c7a4c088ad1c ('x86/mm: split p2m ioreq server pages special handling into helper')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
---
xen/arch/x86/mm/p2m-ept.c | 2 +-
xen/include/asm-x86/p2m.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c
index e3044bee2e..6b8468c793 100644
--- a/xen/arch/x86/mm/p2m-ept.c
+++ b/xen/arch/x86/mm/p2m-ept.c
@@ -51,7 +51,7 @@ static int atomic_write_ept_entry(struct p2m_domain *p2m,
int level)
{
int rc = p2m_entry_modify(p2m, new.sa_p2mt, entryptr->sa_p2mt,
- _mfn(new.mfn), _mfn(entryptr->mfn), level);
+ _mfn(new.mfn), _mfn(entryptr->mfn), level + 1);
if ( rc )
return rc;
diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index 09ef7e02fd..aff34e3adf 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -946,6 +946,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt,
p2m_type_t ot, mfn_t nfn, mfn_t ofn,
unsigned int level)
{
+ BUG_ON(!level);
BUG_ON(level > 1 && (nt == p2m_ioreq_server || nt == p2m_map_foreign));
if ( level != 1 || (nt == ot && mfn_eq(nfn, ofn)) )
--
2.20.1 (Apple Git-117)