Date: Mon, 29 Jul 2019 14:58:42 +0000 (UTC) From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <royger@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507571 - in head/emulators/xen-kernel: . files Message-ID: <201907291458.x6TEwg7d094365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: royger (src committer) Date: Mon Jul 29 14:58:42 2019 New Revision: 507571 URL: https://svnweb.freebsd.org/changeset/ports/507571 Log: emulators/xen-kernel: fix foreign mappings Backport upstream patch to fix foreign mappings. Sponsored by: Citrix Systems R&D Approved by: ports (tobik) Differential revision: https://reviews.freebsd.org/D21028 Added: head/emulators/xen-kernel/files/0001-x86-ept-pass-correct-level-to-p2m_entry_modify.patch (contents, props changed) Modified: head/emulators/xen-kernel/Makefile Modified: head/emulators/xen-kernel/Makefile ============================================================================== --- head/emulators/xen-kernel/Makefile Mon Jul 29 12:57:39 2019 (r507570) +++ head/emulators/xen-kernel/Makefile Mon Jul 29 14:58:42 2019 (r507571) @@ -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 @@ -48,6 +48,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/xsa297-4.12-1.patch:-p1 \ EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-linker-add-a-reloc-section-to-ELF-linker-script.patch:-p1 \ ${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> Added: head/emulators/xen-kernel/files/0001-x86-ept-pass-correct-level-to-p2m_entry_modify.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/xen-kernel/files/0001-x86-ept-pass-correct-level-to-p2m_entry_modify.patch Mon Jul 29 14:58:42 2019 (r507571) @@ -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) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907291458.x6TEwg7d094365>