From owner-svn-ports-head@freebsd.org Mon Jul 29 14:58:52 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A326ACFFB; Mon, 29 Jul 2019 14:58:52 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B2039875DB; Mon, 29 Jul 2019 14:58:50 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EB0B1E11; Mon, 29 Jul 2019 14:58:43 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6TEwhmJ094366; Mon, 29 Jul 2019 14:58:43 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6TEwg7d094365; Mon, 29 Jul 2019 14:58:42 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201907291458.x6TEwg7d094365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Mon, 29 Jul 2019 14:58:42 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: royger X-SVN-Commit-Paths: in head/emulators/xen-kernel: . files X-SVN-Commit-Revision: 507571 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B2039875DB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jul 2019 14:58:52 -0000 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 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?= +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é +Reviewed-by: Jan Beulich +Reviewed-by: Kevin Tian +--- + 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) +