@@ -45,13 +45,20 @@
#undef page_to_mfn
#define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg))
=20
-/* We may store INVALID_MFN in l1 PTEs. We need to clip this
- * to avoid trampling over higher-order bits (NX, p2m type, IOMMU flags). =
We
- * seem to not need to unclip on the return path, as callers are concerned=
only
- * with p2m type in such cases.=20
+/*
+ * We may store INVALID_MFN in PTEs. We need to clip this to avoid trampl=
ing
+ * over higher-order bits (NX, p2m type, IOMMU flags). We seem to not nee=
d
+ * to unclip on the read path, as callers are concerned only with p2m type=
in
+ * such cases.
*/
#define p2m_l1e_from_pfn(pfn, flags) \
l1e_from_pfn((pfn) & (PADDR_MASK >> PAGE_SHIFT), (flags))
+#define p2m_l2e_from_pfn(pfn, flags) \
+ l2e_from_pfn((pfn) & ((PADDR_MASK & ~(_PAGE_PSE_PAT | 0UL)) \
+ >> PAGE_SHIFT), (flags) | _PAGE_PSE)
+#define p2m_l3e_from_pfn(pfn, flags) \
** Delivery incomplete ** There was a temporary problem delivering your message to curtiskwong9@gmail.com. Gmail will retry for 47 more hours. You'll be notified if the delivery fails permanently. The response was: Receive rate too high ; Sat, 10 Jun 2017 16:55:27 -0700 (PDT) ARC-Seal: i=3D1; a=3Drsa-sha256; t=3D1497138927; cv=3Dnone; d=3Dgoogle.com; s=3Darc-20160816; b=3DHrKv7x/bS8EY3maTjNY+9KcHjrIun1KOG6OZBcYe7cpit7psaQ6hpfQfY5Ai9SA= IEc PMIT5rxIhwuez8kmFm1RgKiNunnzmM4rmszM/wqM1Q5jmSUIi228MqMKL9inOUO+4A= yM Lw84h2wjaFS+zv8RXMQdoIjwHtVnemLieZeKJC5aTTqJMqihSxcymrRj6IS+i+Tvak= 1S kCHjTKhhJqiLAjT8o28n29ua/o1bwPkcA3f0CiPf0Cc5LcOtYHRvn25HPdzrNV1FGn= Ez gPeZSj1EoUxAaqeQaiOq6AwtrnZUxigc7K1Vha+Cr6+dh+vsNvAQ0mJbStrMn69nla= xm eSlA=3D=3D ARC-Message-Signature: i=3D1; a=3Drsa-sha256; c=3Drelaxed/relaxed; d=3Dgoog= le.com; s=3Darc-20160816; h=3Dlist-subscribe:list-help:list-post:list-unsubscribe :list-unsubscribe:list-id:precedence:subject:date:message-id:to :reply-to:sender:from:content-transfer-encoding:mime-version :dkim-signature:delivery-date:arc-authentication-results; bh=3D3vw0mmjobBOPWYLaibudX63+UJNnHk4WQF1oK+on21Q=3D; b=3DPR3gX4fa5H/wdWFBlfpmuD3zkdnSWqsRtmGOkQCr9MpgX8oUDqygY91oYcwnuHf= N5a WaH9EsdLA41NzeSCZxSs/e9okBxhvBAlxfqQDTw0X9e+XvlLmFOXaui0wWq4vfLZ0/= 2Y j8Pxs3j/GAopvhLBL4ChyanpAbEQAXXn9UVrnHc3UFJASfB6cP4QY8GexN9mCxL9HE= iY p1JKomvH1EQezFDgfjklclNmdOirHXTgH0Ld2oEZF+zPVejVfYS1FJjfQcZ+YGrd8b= Xd 06+HWxummm69fAAFCvxaAEtdwWbGnNx6dWeiqpY2tdq5GNou+p52IaXT4QT4PRDxdK= xx Fubg=3D=3D ARC-Authentication-Results: i=3D1; mx.google.com; dkim=3Dpass header.i=3D@opayq.com; spf=3Dpass (google.com: domain of fwd-737qhysmhvayqaucaoiqbdaagaqlma= 2yamheccjdlibayawyakiazaqhsmccwmblia4uanqueigcimbkmazuz4aaeaaca=3D=3D=3D@op= ayq.com designates 184.105.182.156 as permitted sender) smtp.mailfrom=3DFWD= -737QHYSMHVAYQAUCAOIQBDAAGAQLMA2YAMHECCJDLIBAYAWYAKIAZAQHSMCCWMBLIA4UANQUEI= GCIMBKMAZUZ4AAEAACA=3D=3D=3D@opayq.com; dmarc=3Dpass (p=3DNONE sp=3DNONE dis=3DNONE) header.from=3Dopayq.com Return-Path: <FWD-737QHYSMHVAYQAUCAOIQBDAAGAQLMA2YAMHECCJDLIBAYAWYAKIAZAQHS= MCCWMBLIA4UANQUEIGCIMBKMAZUZ4AAEAACA=3D=3D=3D@opayq.com> Received: from opayq-out-06.junkemailfilter.com (opayq-out-06.junkemailfilt= er.com. [184.105.182.156]) by mx.google.com with ESMTPS id 73si4073951ple.514.2017.06.10.16.55= .27 for <curtiskwong9@gmail.com> (version=3DTLS1_2 cipher=3DECDHE-RSA-AES128-GCM-SHA256 bits=3D128/1= 28); Sat, 10 Jun 2017 16:55:27 -0700 (PDT) Received-SPF: pass (google.com: domain of fwd-737qhysmhvayqaucaoiqbdaagaqlm= a2yamheccjdlibayawyakiazaqhsmccwmblia4uanqueigcimbkmazuz4aaeaaca=3D=3D=3D@o= payq.com designates 184.105.182.156 as permitted sender) client-ip=3D184.10= 5.182.156; Authentication-Results: mx.google.com; dkim=3Dpass header.i=3D@opayq.com; spf=3Dpass (google.com: domain of fwd-737qhysmhvayqaucaoiqbdaagaqlma= 2yamheccjdlibayawyakiazaqhsmccwmblia4uanqueigcimbkmazuz4aaeaaca=3D=3D=3D@op= ayq.com designates 184.105.182.156 as permitted sender) smtp.mailfrom=3DFWD= -737QHYSMHVAYQAUCAOIQBDAAGAQLMA2YAMHECCJDLIBAYAWYAKIAZAQHSMCCWMBLIA4UANQUEI= GCIMBKMAZUZ4AAEAACA=3D=3D=3D@opayq.com; dmarc=3Dpass (p=3DNONE sp=3DNONE dis=3DNONE) header.from=3Dopayq.com Delivery-date: Sat, 10 Jun 2017 16:55:27 -0700 Received: from smtp2.opayq.com ([54.235.124.91]:58570) helo=3D[54.235.124.9= 1] by opayq-outbound.junkemailfilter.com with esmtps (TLSv1.2:AES256-SHA256:2= 56) (Exim 4.89) id 1dJqE3-00032g-6O on interface=3D184.105.182.150 for curtiskwong9@gmail.com; Sat, 10 Jun 2017 16:55:27 -0700 DKIM-Signature: v=3D1; d=3Dopayq.com; t=3D1497138926; b=3Dgqj+X95z43Q+EmJ1H= rrhw+fotYZ61Yg/Is38dcr3mxZAgn80m5igXoH+V3J63rmpF6oK243yOPeCPNcYoaLGSncBGbjq= ee1LyHWlHkC340KFwuUd1QjPi8IFzqBvjpxrdkxEe42JJVEkG+74gTBamz8XyR6U0bXyQBGXfUD= RFXM=3D; s=3Dabine; c=3Drelaxed/relaxed; a=3Drsa-sha256; bh=3D3vw0mmjobBOPW= YLaibudX63+UJNnHk4WQF1oK+on21Q=3D; h=3DDate:From:Reply-To:Subject:To:List-U= nsubscribe; MIME-Version: 1.0 Content-Type: text/plain; charset=3D"utf-8" Content-Transfer-Encoding: 7bit X-GetAbine-Processed: 1 From: "lists.xen.org [Masked]" <FWD-737QHYSMHVAYQAUCAOIQBDAAGAQLMA2YAMHECCJ= DLIBAYAWYAKIAZAQHSMCCWMBLIA4UANQUEIGCIMBKMAZUZ4AAEAACA=3D=3D=3D@opayq.com> Sender: "lists.xen.org [Masked]" <FWD-737QHYSMHVAYQAUCAOIQBDAAGAQLMA2YAMHEC= CJDLIBAYAWYAKIAZAQHSMCCWMBLIA4UANQUEIGCIMBKMAZUZ4AAEAACA=3D=3D=3D@opayq.com= > Reply-To:=20 FWD-737QHYSMHVAYQAUCAOIQBDAAGAQLMA2YAMHECCJDLIBAYAWYAKIAZAQHSMCCWMBLIA4UAN= QUEIGCIMBKMAZUZ4AAEAACA=3D=3D=3D@opayq.com To: f4da1594@opayq.com X-GetAbine-Sender: xen-changelog-bounces@lists.xen.org X-GetAbine-Disposable: f4da1594@opayq.com X-GetAbine-Host-Address: 54.235.124.91 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRWlGSWpSXmKPExsWS0XRdVfdGm02 kwcO9GhYTthk4MHps79vFHsAYxZqZl5RfkcCasfFJG2vBLo2Kt/vbmBoYd8t1MXJxCAl8YZS4 c7yPBcI5zyjx4OxjIIeDg01ATGLuXoUuRk4OEQFViVkrljOD2EIC6hJNvxvYQGxhgSCJRfv/g sV5BcwkPrSdYgexWYDqd077xTyBkWMBI8MqRvXi1KKy1CJdI72kosz0jJLcxMwcXUMDY73c1O LixPTUnMSkYr3k/NxNjECf1DMwMO5gPNXsfIhRkoNJSZRX5qFVpBBfUn5KZUZicUZ8UWlOavE hRhkODiUJ3uZWm0ghwaLU9NSKtMwcYHDApCU4eJREeBPqgdK8xQWJucWZ6RCpU4yKUuIQfQIg iYzSPLg2WEBeYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMuxNkCk9mXgnc9FdAi5mAFi95Z wGyuCQRISXVwMhQptYfFqO8MiLQ42rs3HrWFWzXHsQKTTzquHT3h9qJ6t/+K346v1697JH13f crTA/NYWx2CbXjlfJ2z1I++fvJMoWKA3cVT9azprxfOSVd/ZHCo6zmDUuN83rltZefDLjCH/3 CYdven1KT2YUSD0g9bPONe39O5YZ5jM25iMN+zVsLReIWflFiKc5INNRiLipOBAAn0tFPQwIA AA=3D=3D X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1497138903!100979190!1 X-Originating-IP: [104.130.215.37] X-SpamReason: No, hits=3D0.0 required=3D7.0 tests=3D X-StarScan-Received:=20 X-StarScan-Version: 9.4.19; banners=3D-,-,- X-VirusChecked: Checked Message-Id: <E1dJqDe-0003qo-9d@xenbits.xenproject.org> Date: Sat, 10 Jun 2017 23:55:02 +0000 Subject: [Xen-changelog] [xen stable-4.9] x86/NPT: deal with fallout from 2Mb/1Gb unmapping change X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" <xen-changelog.lists.xen.org> List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-change= log>,=20 <mailto:xen-changelog-request@lists.xen.org?subject=3Dunsubscribe> List-Unsubscribe: <mailto:unsubscribe-1188110264-f4da1594@opayq.com>, <http= s://emails.abine.com/disableDisposable?fwd=3DFWD-737QHYSMHVAYQAUCAOIQBDAAGA= QLMA2YAMHECCJDLIBAYAWYAKIAZAQHSMCCWMBLIA4UANQUEIGCIMBKMAZUZ4AAEAACA=3D=3D= =3D@opayq.com> List-Post: <mailto:xen-changelog@lists.xen.org> List-Help: <mailto:xen-changelog-request@lists.xen.org?subject=3Dhelp> List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-changel= og>,=20 <mailto:xen-changelog-request@lists.xen.org?subject=3Dsubscribe> X-Sender-Domain: xenproject.org X-Spamfilter-host: plato.junkemailfilter.com - http://www.junkemailfilter.c= om X-Key-ID: ZjRkYTE1OTRAb3BheXEuY29tIHhlbi1jaGFuZ2Vsb2ctYm91bmNlc0BsaXN0cy54Z= W4ub3JnIDIwMTctMDYtMTAgMTY6NTU6MTYgMWRKcURzLTAwMDFLNi1Qdw=3D=3D X-Content-flags: deal deals=20 X-Domain-list: xenproject.org rackspace.com messagelabs.com xen.org opayq.c= om xensource.com citrix.com X-Mail-from: xen-changelog-bounces@lists.xen.org X-Sender-Host-Address: 192.237.175.120 X-Sender-Host-Name: lists.xenproject.org X-Key-ID: Y3VydGlza3dvbmc5QGdtYWlsLmNvbSBmd2QtNzM3cWh5c21odmF5cWF1Y2FvaXFiZ= GFhZ2FxbG1hMnlhbWhlY2NqZGxpYmF5YXd5YWtpYXphcWhzbWNjd21ibGlhNHVhbnF1ZWlnY2lt= YmttYXp1ejRhYWVhYWNhPT09QG9wYXlxLmNvbSAyMDE3LTA2LTEwIDE2OjU1OjI3IDFkSnFFMy0= wMDAzMmctNk8=3D -------------------------Blur------------------------- This email is forwarded from a MASKED EMAIL you created using Blur. (https= ://dnt.abine.com/#help/faq/faq-whataremaskedemails). IF THIS IS SPAM, CLICK HERE TO BLOCK: https://dnt.abine.com/#/block_email/f4da1594@opayq.com/FWD-737QHYSMHVAYQAUC= AOIQBDAAGAQLMA2YAMHECCJDLIBAYAWYAKIAZAQHSMCCWMBLIA4UANQUEIGCIMBKMAZUZ4AAEAA= CA=3D=3D=3D@opayq.com Want to shop safely and privately online? Go Premium: https://dnt.abine.com= /?pk_campaign=3DmaskHeader#premium -------------------------by Abine------------------------- commit a39c6b4516996ae1e776a46743dbcb78002b9dd8 Author: Jan Beulich <jbeulich@suse.com> AuthorDate: Wed Jun 7 11:36:30 2017 +0200 Commit: Jan Beulich <jbeulich@suse.com> CommitDate: Wed Jun 7 11:36:30 2017 +0200 x86/NPT: deal with fallout from 2Mb/1Gb unmapping change =20 Commit efa9596e9d ("x86/mm: fix incorrect unmapping of 2MB and 1GB pages") left the NPT code untouched, as there is no explicit alignment check matching the one in EPT code. However, the now more widespread storing of INVALID_MFN into PTEs requires adjustments: - calculations when shattering large pages may spill into the p2m type field (converting p2m_populate_on_demand to p2m_grant_map_rw) - use OR instead of PLUS, - the use of plain l{2,3}e_from_pfn() in p2m_pt_set_entry() results in all upper (flag) bits being clobbered - introduce and use p2m_l{2,3}e_from_pfn(), paralleling the existing L1 variant. =20 Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Acked-by: George Dunlap <george.dunlap@citrix.com> Release-acked-by: Julien Grall <julien.grall@arm.com> master commit: 83520cb4aa39ebeb4eb1a7cac2e85b413e75a336 master date: 2017-06-06 14:32:54 +0200 --- xen/arch/x86/mm/p2m-pt.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) + l3e_from_pfn((pfn) & ((PADDR_MASK & ~(_PAGE_PSE_PAT | 0UL)) \ + >> PAGE_SHIFT), (flags) | _PAGE_PSE) =20 /* PTE flags for the various types of p2m entry */ #define P2M_BASE_FLAGS \ @@ -243,7 +250,7 @@ p2m_next_level(struct p2m_domain *p2m, void **table, l1_entry =3D __map_domain_page(pg); for ( i =3D 0; i < L2_PAGETABLE_ENTRIES; i++ ) { - new_entry =3D l1e_from_pfn(pfn + (i * L1_PAGETABLE_ENTRIES), f= lags); + new_entry =3D l1e_from_pfn(pfn | (i * L1_PAGETABLE_ENTRIES), f= lags); p2m_add_iommu_flags(&new_entry, 1, IOMMUF_readable|IOMMUF_writ= able); p2m->write_p2m_entry(p2m, gfn, l1_entry + i, new_entry, 2); } @@ -277,7 +284,7 @@ p2m_next_level(struct p2m_domain *p2m, void **table, l1_entry =3D __map_domain_page(pg); for ( i =3D 0; i < L1_PAGETABLE_ENTRIES; i++ ) { - =20 ----- Message truncated -----