From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/3] x86/mm: Consolidate all Xen L2 slot writing into init_xen_pae_l2_slots() Date: Thu, 12 Oct 2017 14:54:21 +0100 Message-ID: <1507816462-15881-3-git-send-email-andrew.cooper3@citrix.com> References: <1507816462-15881-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1507816462-15881-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Julien Grall , Jan Beulich List-Id: xen-devel@lists.xenproject.org SGF2aW5nIGFsbCBvZiB0aGlzIGxvZ2ljIHRvZ2V0aGVyIG1ha2VzIGl0IGVhc2llciB0byBmb2xs b3cgWGVuJ3MgdmlydHVhbApzZXR1cCBhY3Jvc3MgdGhlIHdob2xlIHN5c3RlbS4KCk5vIGZ1bmN0 aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3Bl cjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkND OiBUaW0gRGVlZ2FuIDx0aW1AeGVuLm9yZz4KQ0M6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5s YXBAZXUuY2l0cml4LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBK dWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9tbS5j ICAgICAgICAgICAgICB8IDE2ICsrKysrKysrKy0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9zaGFk b3cvbXVsdGkuYyB8IDQyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9tbS5oICAgICAgIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2Vk LCAyNSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9tbS5jCmluZGV4IGY5MGE0MmEuLmVhNGFmMTYgMTAw NjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS5jCkBAIC0x NDMzLDEzICsxNDMzLDcgQEAgc3RhdGljIGludCBhbGxvY19sMl90YWJsZShzdHJ1Y3QgcGFnZV9p bmZvICpwYWdlLCB1bnNpZ25lZCBsb25nIHR5cGUsCiAgICAgfQogCiAgICAgaWYgKCByYyA+PSAw ICYmICh0eXBlICYgUEdUX3BhZV94ZW5fbDIpICkKLSAgICB7Ci0gICAgICAgIC8qIFhlbiBwcml2 YXRlIG1hcHBpbmdzLiAqLwotICAgICAgICBtZW1jcHkoJnBsMmVbQ09NUEFUX0wyX1BBR0VUQUJM RV9GSVJTVF9YRU5fU0xPVChkKV0sCi0gICAgICAgICAgICAgICAmY29tcGF0X2lkbGVfcGdfdGFi bGVfbDJbCi0gICAgICAgICAgICAgICAgICAgbDJfdGFibGVfb2Zmc2V0KEhJUk9fQ09NUEFUX01Q VF9WSVJUX1NUQVJUKV0sCi0gICAgICAgICAgICAgICBDT01QQVRfTDJfUEFHRVRBQkxFX1hFTl9T TE9UUyhkKSAqIHNpemVvZigqcGwyZSkpOwotICAgIH0KKyAgICAgICAgaW5pdF94ZW5fcGFlX2wy X3Nsb3RzKHBsMmUsIGQpOwogCiAgICAgdW5tYXBfZG9tYWluX3BhZ2UocGwyZSk7CiAgICAgcmV0 dXJuIHJjID4gMCA/IDAgOiByYzsKQEAgLTE1MTgsNiArMTUxMiwxNCBAQCBzdGF0aWMgaW50IGFs bG9jX2wzX3RhYmxlKHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UpCiAgICAgcmV0dXJuIHJjID4gMCA/ IDAgOiByYzsKIH0KIAordm9pZCBpbml0X3hlbl9wYWVfbDJfc2xvdHMobDJfcGdlbnRyeV90ICps MnQsIGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCit7CisgICAgbWVtY3B5KCZsMnRbQ09NUEFUX0wy X1BBR0VUQUJMRV9GSVJTVF9YRU5fU0xPVChkKV0sCisgICAgICAgICAgICZjb21wYXRfaWRsZV9w Z190YWJsZV9sMlsKKyAgICAgICAgICAgICAgIGwyX3RhYmxlX29mZnNldChISVJPX0NPTVBBVF9N UFRfVklSVF9TVEFSVCldLAorICAgICAgICAgICBDT01QQVRfTDJfUEFHRVRBQkxFX1hFTl9TTE9U UyhkKSAqIHNpemVvZigqbDJ0KSk7Cit9CisKIC8qCiAgKiBUaGlzIGZ1bmN0aW9uIG11c3Qgd3Jp dGUgYWxsIFJPT1RfUEFHRVRBQkxFX1BWX1hFTl9TTE9UUywgdG8gY2xvYmJlciBhbnkKICAqIHZh bHVlcyBhIGd1ZXN0IG1heSBoYXZlIGxlZnQgdGhlcmUgZnJvbSBhbGxvY19sNF90YWJsZSgpLgpk aWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9tdWx0aS5jIGIveGVuL2FyY2gveDg2 L21tL3NoYWRvdy9tdWx0aS5jCmluZGV4IGQ1NDBhZjEuLjFiNzZlMGMgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYworKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93 L211bHRpLmMKQEAgLTE1MjEsMzEgKzE1MjEsNiBAQCB2b2lkIHNoX2luc3RhbGxfeGVuX2VudHJp ZXNfaW5fbDQoc3RydWN0IGRvbWFpbiAqZCwgbWZuX3QgZ2w0bWZuLCBtZm5fdCBzbDRtZm4pCiB9 CiAjZW5kaWYKIAotI2lmIEdVRVNUX1BBR0lOR19MRVZFTFMgPj0gMwotLy8gRm9yIDMtb24tMyBQ ViBndWVzdHMsIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHRoZSB4ZW4gbWFwcGluZ3MgYXJlIGluCi0v LyBwbGFjZSwgd2hpY2ggbWVhbnMgdGhhdCB3ZSBuZWVkIHRvIHBvcHVsYXRlIHRoZSBsMmggZW50 cnkgaW4gdGhlIGwzCi0vLyB0YWJsZS4KLQotc3RhdGljIHZvaWQgc2hfaW5zdGFsbF94ZW5fZW50 cmllc19pbl9sMmgoc3RydWN0IGRvbWFpbiAqZCwgbWZuX3Qgc2wyaG1mbikKLXsKLSAgICBzaGFk b3dfbDJlX3QgKnNsMmU7Ci0KLSAgICBpZiAoICFpc19wdl8zMmJpdF9kb21haW4oZCkgKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBzbDJlID0gbWFwX2RvbWFpbl9wYWdlKHNsMmhtZm4pOwotICAg IEJVSUxEX0JVR19PTihzaXplb2YgKGwyX3BnZW50cnlfdCkgIT0gc2l6ZW9mIChzaGFkb3dfbDJl X3QpKTsKLQotICAgIC8qIENvcHkgdGhlIGNvbW1vbiBYZW4gbWFwcGluZ3MgZnJvbSB0aGUgaWRs ZSBkb21haW4gKi8KLSAgICBtZW1jcHkoCi0gICAgICAgICZzbDJlW0NPTVBBVF9MMl9QQUdFVEFC TEVfRklSU1RfWEVOX1NMT1QoZCldLAotICAgICAgICAmY29tcGF0X2lkbGVfcGdfdGFibGVfbDJb bDJfdGFibGVfb2Zmc2V0KEhJUk9fQ09NUEFUX01QVF9WSVJUX1NUQVJUKV0sCi0gICAgICAgIENP TVBBVF9MMl9QQUdFVEFCTEVfWEVOX1NMT1RTKGQpICogc2l6ZW9mKCpzbDJlKSk7Ci0KLSAgICB1 bm1hcF9kb21haW5fcGFnZShzbDJlKTsKLX0KLSNlbmRpZgotCiAKIC8qKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq Ki8KIC8qIENyZWF0ZSBhIHNoYWRvdyBvZiBhIGdpdmVuIGd1ZXN0IHBhZ2UuCkBAIC0xNjEwLDcg KzE1ODUsMTQgQEAgc2hfbWFrZV9zaGFkb3coc3RydWN0IHZjcHUgKnYsIG1mbl90IGdtZm4sIHUz MiBzaGFkb3dfdHlwZSkKICNlbmRpZgogI2lmIEdVRVNUX1BBR0lOR19MRVZFTFMgPj0gMwogICAg ICAgICBjYXNlIFNIX3R5cGVfbDJoX3NoYWRvdzoKLSAgICAgICAgICAgIHNoX2luc3RhbGxfeGVu X2VudHJpZXNfaW5fbDJoKHYtPmRvbWFpbiwgc21mbik7CisgICAgICAgICAgICBCVUlMRF9CVUdf T04oc2l6ZW9mKGwyX3BnZW50cnlfdCkgIT0gc2l6ZW9mKHNoYWRvd19sMmVfdCkpOworICAgICAg ICAgICAgaWYgKCBpc19wdl8zMmJpdF9kb21haW4oZCkgKQorICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgIHNoYWRvd19sMmVfdCAqbDJ0ID0gbWFwX2RvbWFpbl9wYWdlKHNtZm4pOworCisg ICAgICAgICAgICAgICAgaW5pdF94ZW5fcGFlX2wyX3Nsb3RzKGwydCwgZCk7CisgICAgICAgICAg ICAgICAgdW5tYXBfZG9tYWluX3BhZ2UobDJ0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAg IGJyZWFrOwogI2VuZGlmCiAgICAgICAgIGRlZmF1bHQ6IC8qIERvIG5vdGhpbmcgKi8gYnJlYWs7 CkBAIC0xNjc3LDYgKzE2NTksOCBAQCBzaF9tYWtlX21vbml0b3JfdGFibGUoc3RydWN0IHZjcHUg KnYpCiAKICAgICAgICAgICAgIGlmICggaXNfcHZfMzJiaXRfZG9tYWluKGQpICkKICAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBsMl9wZ2VudHJ5X3QgKmwydDsKKwogICAgICAgICAgICAg ICAgIC8qIEZvciAzMi1iaXQgUFYgZ3Vlc3RzLCB3ZSBuZWVkIHRvIG1hcCB0aGUgMzItYml0IFhl bgogICAgICAgICAgICAgICAgICAqIGFyZWEgaW50byBpdHMgdXN1YWwgVkFzIGluIHRoZSBtb25p dG9yIHRhYmxlcyAqLwogICAgICAgICAgICAgICAgIG0zbWZuID0gc2hhZG93X2FsbG9jKGQsIFNI X3R5cGVfbW9uaXRvcl90YWJsZSwgMCk7CkBAIC0xNjg3LDcgKzE2NzEsMTEgQEAgc2hfbWFrZV9t b25pdG9yX3RhYmxlKHN0cnVjdCB2Y3B1ICp2KQogICAgICAgICAgICAgICAgIG1mbl90b19wYWdl KG0ybWZuKS0+c2hhZG93X2ZsYWdzID0gMjsKICAgICAgICAgICAgICAgICBsM2UgPSBtYXBfZG9t YWluX3BhZ2UobTNtZm4pOwogICAgICAgICAgICAgICAgIGwzZVszXSA9IGwzZV9mcm9tX21mbiht Mm1mbiwgX1BBR0VfUFJFU0VOVCk7Ci0gICAgICAgICAgICAgICAgc2hfaW5zdGFsbF94ZW5fZW50 cmllc19pbl9sMmgoZCwgbTJtZm4pOworCisgICAgICAgICAgICAgICAgbDJ0ID0gbWFwX2RvbWFp bl9wYWdlKG0ybWZuKTsKKyAgICAgICAgICAgICAgICBpbml0X3hlbl9wYWVfbDJfc2xvdHMobDJ0 LCBkKTsKKyAgICAgICAgICAgICAgICB1bm1hcF9kb21haW5fcGFnZShsMnQpOworCiAgICAgICAg ICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UobDNlKTsKICAgICAgICAgICAgIH0KIApkaWZmIC0t Z2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9tbS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9tbS5o CmluZGV4IGVlYWM0ZDcuLmRhM2M1ZTIgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYv bW0uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L21tLmgKQEAgLTM0MCw2ICszNDAsNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgKl9fcGFnZV90b192aXJ0KGNvbnN0IHN0cnVjdCBwYWdlX2luZm8g KnBnKQogaW50IGZyZWVfcGFnZV90eXBlKHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UsIHVuc2lnbmVk IGxvbmcgdHlwZSwKICAgICAgICAgICAgICAgICAgICBpbnQgcHJlZW1wdGlibGUpOwogCit2b2lk IGluaXRfeGVuX3BhZV9sMl9zbG90cyhsMl9wZ2VudHJ5X3QgKmwydCwgY29uc3Qgc3RydWN0IGRv bWFpbiAqZCk7CiB2b2lkIGluaXRfZ3Vlc3RfbDRfdGFibGUobDRfcGdlbnRyeV90W10sIGNvbnN0 IHN0cnVjdCBkb21haW4gKiwKICAgICAgICAgICAgICAgICAgICAgICAgICBib29sX3QgemFwX3Jv X21wdCk7CiBib29sIGZpbGxfcm9fbXB0KG1mbl90IG1mbik7Ci0tIAoyLjEuNAoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1k ZXZlbAo=