From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC 05/55] x86/mm: introduce l{1, 2}t local variables to modify_xen_mappings Date: Thu, 7 Feb 2019 16:44:06 +0000 Message-ID: <20190207164456.9260-6-wei.liu2@citrix.com> References: <20190207164456.9260-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1grmnS-0006f0-AD for xen-devel@lists.xenproject.org; Thu, 07 Feb 2019 16:45:06 +0000 In-Reply-To: <20190207164456.9260-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org VGhlIHBsMmUgYW5kIHBsMWUgdmFyaWFibGVzIGFyZSBoZWF2aWx5IChhYil1c2VkIGluIHRoYXQg ZnVuY3Rpb24uICBJdAppcyBmaW5lIGF0IHRoZSBtb21lbnQgYmVjYXVzZSBhbGwgcGFnZSB0YWJs ZXMgYXJlIGFsd2F5cyBtYXBwZWQgc28KdGhlcmUgaXMgbm8gbmVlZCB0byB0cmFjayB0aGUgbGlm ZSB0aW1lIG9mIGVhY2ggdmFyaWFibGUuCgpXZSB3aWxsIHNvb24gaGF2ZSB0aGUgcmVxdWlyZW1l bnQgdG8gbWFwIGFuZCB1bm1hcCBwYWdlIHRhYmxlcy4gV2UKbmVlZCB0byB0cmFjayB0aGUgbGlm ZSB0aW1lIG9mIGVhY2ggdmFyaWFibGUgdG8gYXZvaWQgbGVha2FnZS4KCkludHJvZHVjZSBzb21l IGx7MSwyfXQgdmFyaWFibGVzIHdpdGggbGltaXRlZCBzY29wZSBzbyB0aGF0IHdlIGNhbgp0cmFj ayBsaWZlIHRpbWUgb2YgcG9pbnRlcnMgdG8geGVuIHBhZ2UgdGFibGVzIG1vcmUgZWFzaWx5LgoK Tm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBj aXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9tbS5jIHwgNjggKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM4 IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4 Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMKaW5kZXggN2MyZDU2OTM0Ny4uNDE0N2E3MWM1ZCAx MDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L21tLmMKQEAg LTUzMDEsNiArNTMwMSw4IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcg cywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAKICAgICAgICAgaWYgKCBsM2Vf Z2V0X2ZsYWdzKCpwbDNlKSAmIF9QQUdFX1BTRSApCiAgICAgICAgIHsKKyAgICAgICAgICAgIGwy X3BnZW50cnlfdCAqbDJ0OworCiAgICAgICAgICAgICBpZiAoIGwyX3RhYmxlX29mZnNldCh2KSA9 PSAwICYmCiAgICAgICAgICAgICAgICAgIGwxX3RhYmxlX29mZnNldCh2KSA9PSAwICYmCiAgICAg ICAgICAgICAgICAgICgoZSAtIHYpID49ICgxVUwgPDwgTDNfUEFHRVRBQkxFX1NISUZUKSkgKQpA QCAtNTMxNiwxMSArNTMxOCwxMSBAQCBpbnQgbW9kaWZ5X3hlbl9tYXBwaW5ncyh1bnNpZ25lZCBs b25nIHMsIHVuc2lnbmVkIGxvbmcgZSwgdW5zaWduZWQgaW50IG5mKQogICAgICAgICAgICAgfQog CiAgICAgICAgICAgICAvKiBQQUdFMUdCOiBzaGF0dGVyIHRoZSBzdXBlcnBhZ2UgYW5kIGZhbGwg dGhyb3VnaC4gKi8KLSAgICAgICAgICAgIHBsMmUgPSBhbGxvY194ZW5fcGFnZXRhYmxlKCk7Ci0g ICAgICAgICAgICBpZiAoICFwbDJlICkKKyAgICAgICAgICAgIGwydCA9IGFsbG9jX3hlbl9wYWdl dGFibGUoKTsKKyAgICAgICAgICAgIGlmICggIWwydCApCiAgICAgICAgICAgICAgICAgcmV0dXJu IC1FTk9NRU07CiAgICAgICAgICAgICBmb3IgKCBpID0gMDsgaSA8IEwyX1BBR0VUQUJMRV9FTlRS SUVTOyBpKysgKQotICAgICAgICAgICAgICAgIGwyZV93cml0ZShwbDJlICsgaSwKKyAgICAgICAg ICAgICAgICBsMmVfd3JpdGUobDJ0ICsgaSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgbDJl X2Zyb21fcGZuKGwzZV9nZXRfcGZuKCpwbDNlKSArCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoaSA8PCBQQUdFVEFCTEVfT1JERVIpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbDNlX2dldF9mbGFncygqcGwzZSkpKTsKQEAgLTUzMjksMTQg KzUzMzEsMTQgQEAgaW50IG1vZGlmeV94ZW5fbWFwcGluZ3ModW5zaWduZWQgbG9uZyBzLCB1bnNp Z25lZCBsb25nIGUsIHVuc2lnbmVkIGludCBuZikKICAgICAgICAgICAgIGlmICggKGwzZV9nZXRf ZmxhZ3MoKnBsM2UpICYgX1BBR0VfUFJFU0VOVCkgJiYKICAgICAgICAgICAgICAgICAgKGwzZV9n ZXRfZmxhZ3MoKnBsM2UpICYgX1BBR0VfUFNFKSApCiAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgbDNlX3dyaXRlX2F0b21pYyhwbDNlLCBsM2VfZnJvbV9tZm4odmlydF90b19tZm4ocGwy ZSksCisgICAgICAgICAgICAgICAgbDNlX3dyaXRlX2F0b21pYyhwbDNlLCBsM2VfZnJvbV9tZm4o dmlydF90b19tZm4obDJ0KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBfX1BBR0VfSFlQRVJWSVNPUikpOwotICAgICAgICAgICAgICAgIHBsMmUg PSBOVUxMOworICAgICAgICAgICAgICAgIGwydCA9IE5VTEw7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBpZiAoIGxvY2tpbmcgKQogICAgICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZtYXBf cGdkaXJfbG9jayk7Ci0gICAgICAgICAgICBpZiAoIHBsMmUgKQotICAgICAgICAgICAgICAgIGZy ZWVfeGVuX3BhZ2V0YWJsZShwbDJlKTsKKyAgICAgICAgICAgIGlmICggbDJ0ICkKKyAgICAgICAg ICAgICAgICBmcmVlX3hlbl9wYWdldGFibGUobDJ0KTsKICAgICAgICAgfQogCiAgICAgICAgIC8q CkBAIC01MzcwLDEyICs1MzcyLDE0IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVk IGxvbmcgcywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAgICAgICAgICAgICB9 CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgbDFfcGdl bnRyeV90ICpsMXQ7CisKICAgICAgICAgICAgICAgICAvKiBQU0U6IHNoYXR0ZXIgdGhlIHN1cGVy cGFnZSBhbmQgdHJ5IGFnYWluLiAqLwotICAgICAgICAgICAgICAgIHBsMWUgPSBhbGxvY194ZW5f cGFnZXRhYmxlKCk7Ci0gICAgICAgICAgICAgICAgaWYgKCAhcGwxZSApCisgICAgICAgICAgICAg ICAgbDF0ID0gYWxsb2NfeGVuX3BhZ2V0YWJsZSgpOworICAgICAgICAgICAgICAgIGlmICggIWwx dCApCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiAtRU5PTUVNOwogICAgICAgICAgICAgICAg IGZvciAoIGkgPSAwOyBpIDwgTDFfUEFHRVRBQkxFX0VOVFJJRVM7IGkrKyApCi0gICAgICAgICAg ICAgICAgICAgIGwxZV93cml0ZSgmcGwxZVtpXSwKKyAgICAgICAgICAgICAgICAgICAgbDFlX3dy aXRlKCZsMXRbaV0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMWVfZnJvbV9wZm4o bDJlX2dldF9wZm4oKnBsMmUpICsgaSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBsMmVfZ2V0X2ZsYWdzKCpwbDJlKSAmIH5fUEFHRV9QU0UpKTsKICAgICAgICAg ICAgICAgICBpZiAoIGxvY2tpbmcgKQpAQCAtNTM4MywxOSArNTM4NywxOSBAQCBpbnQgbW9kaWZ5 X3hlbl9tYXBwaW5ncyh1bnNpZ25lZCBsb25nIHMsIHVuc2lnbmVkIGxvbmcgZSwgdW5zaWduZWQg aW50IG5mKQogICAgICAgICAgICAgICAgIGlmICggKGwyZV9nZXRfZmxhZ3MoKnBsMmUpICYgX1BB R0VfUFJFU0VOVCkgJiYKICAgICAgICAgICAgICAgICAgICAgIChsMmVfZ2V0X2ZsYWdzKCpwbDJl KSAmIF9QQUdFX1BTRSkgKQogICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAg bDJlX3dyaXRlX2F0b21pYyhwbDJlLCBsMmVfZnJvbV9tZm4odmlydF90b19tZm4ocGwxZSksCisg ICAgICAgICAgICAgICAgICAgIGwyZV93cml0ZV9hdG9taWMocGwyZSwgbDJlX2Zyb21fbWZuKHZp cnRfdG9fbWZuKGwxdCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIF9fUEFHRV9IWVBFUlZJU09SKSk7Ci0gICAgICAgICAgICAgICAgICAg IHBsMWUgPSBOVUxMOworICAgICAgICAgICAgICAgICAgICBsMXQgPSBOVUxMOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoIGxvY2tpbmcgKQogICAgICAgICAgICAgICAg ICAgICBzcGluX3VubG9jaygmbWFwX3BnZGlyX2xvY2spOwotICAgICAgICAgICAgICAgIGlmICgg cGwxZSApCi0gICAgICAgICAgICAgICAgICAgIGZyZWVfeGVuX3BhZ2V0YWJsZShwbDFlKTsKKyAg ICAgICAgICAgICAgICBpZiAoIGwxdCApCisgICAgICAgICAgICAgICAgICAgIGZyZWVfeGVuX3Bh Z2V0YWJsZShsMXQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGVsc2UKICAg ICAgICAgewotICAgICAgICAgICAgbDFfcGdlbnRyeV90IG5sMWU7CisgICAgICAgICAgICBsMV9w Z2VudHJ5X3QgbmwxZSwgKmwxdDsKIAogICAgICAgICAgICAgLyoKICAgICAgICAgICAgICAqIE9y ZGluYXJ5IDRrQiBtYXBwaW5nOiBUaGUgTDIgZW50cnkgaGFzIGJlZW4gdmVyaWZpZWQgdG8gYmUK QEAgLTU0NDIsOSArNTQ0Niw5IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVkIGxv bmcgcywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHBsMWUgPSBsMmVfdG9fbDFl KCpwbDJlKTsKKyAgICAgICAgICAgIGwxdCA9IGwyZV90b19sMWUoKnBsMmUpOwogICAgICAgICAg ICAgZm9yICggaSA9IDA7IGkgPCBMMV9QQUdFVEFCTEVfRU5UUklFUzsgaSsrICkKLSAgICAgICAg ICAgICAgICBpZiAoIGwxZV9nZXRfaW50cHRlKHBsMWVbaV0pICE9IDAgKQorICAgICAgICAgICAg ICAgIGlmICggbDFlX2dldF9pbnRwdGUobDF0W2ldKSAhPSAwICkKICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICBpZiAoIGkgPT0gTDFfUEFHRVRBQkxFX0VOVFJJRVMgKQog ICAgICAgICAgICAgewpAQCAtNTQ1Myw3ICs1NDU3LDcgQEAgaW50IG1vZGlmeV94ZW5fbWFwcGlu Z3ModW5zaWduZWQgbG9uZyBzLCB1bnNpZ25lZCBsb25nIGUsIHVuc2lnbmVkIGludCBuZikKICAg ICAgICAgICAgICAgICBpZiAoIGxvY2tpbmcgKQogICAgICAgICAgICAgICAgICAgICBzcGluX3Vu bG9jaygmbWFwX3BnZGlyX2xvY2spOwogICAgICAgICAgICAgICAgIGZsdXNoX2FyZWEoTlVMTCwg RkxVU0hfVExCX0dMT0JBTCk7IC8qIGZsdXNoIGJlZm9yZSBmcmVlICovCi0gICAgICAgICAgICAg ICAgZnJlZV94ZW5fcGFnZXRhYmxlKHBsMWUpOworICAgICAgICAgICAgICAgIGZyZWVfeGVuX3Bh Z2V0YWJsZShsMXQpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxzZSBpZiAoIGxvY2tp bmcgKQogICAgICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZtYXBfcGdkaXJfbG9jayk7CkBAIC01 NDgyLDIxICs1NDg2LDI1IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcg cywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgfQogCi0gICAgICAgIHBsMmUgPSBsM2VfdG9fbDJlKCpwbDNlKTsKLSAgICAg ICAgZm9yICggaSA9IDA7IGkgPCBMMl9QQUdFVEFCTEVfRU5UUklFUzsgaSsrICkKLSAgICAgICAg ICAgIGlmICggbDJlX2dldF9pbnRwdGUocGwyZVtpXSkgIT0gMCApCi0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgIGlmICggaSA9PSBMMl9QQUdFVEFCTEVfRU5UUklFUyApCiAgICAgICAg IHsKLSAgICAgICAgICAgIC8qIEVtcHR5OiB6YXAgdGhlIEwzRSBhbmQgZnJlZSB0aGUgTDIgcGFn ZS4gKi8KLSAgICAgICAgICAgIGwzZV93cml0ZV9hdG9taWMocGwzZSwgbDNlX2VtcHR5KCkpOwot ICAgICAgICAgICAgaWYgKCBsb2NraW5nICkKKyAgICAgICAgICAgIGwyX3BnZW50cnlfdCAqbDJ0 OworCisgICAgICAgICAgICBsMnQgPSBsM2VfdG9fbDJlKCpwbDNlKTsKKyAgICAgICAgICAgIGZv ciAoIGkgPSAwOyBpIDwgTDJfUEFHRVRBQkxFX0VOVFJJRVM7IGkrKyApCisgICAgICAgICAgICAg ICAgaWYgKCBsMmVfZ2V0X2ludHB0ZShsMnRbaV0pICE9IDAgKQorICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIGlmICggaSA9PSBMMl9QQUdFVEFCTEVfRU5UUklFUyApCisg ICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgLyogRW1wdHk6IHphcCB0aGUgTDNFIGFuZCBm cmVlIHRoZSBMMiBwYWdlLiAqLworICAgICAgICAgICAgICAgIGwzZV93cml0ZV9hdG9taWMocGwz ZSwgbDNlX2VtcHR5KCkpOworICAgICAgICAgICAgICAgIGlmICggbG9ja2luZyApCisgICAgICAg ICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZtYXBfcGdkaXJfbG9jayk7CisgICAgICAgICAgICAg ICAgZmx1c2hfYXJlYShOVUxMLCBGTFVTSF9UTEJfR0xPQkFMKTsgLyogZmx1c2ggYmVmb3JlIGZy ZWUgKi8KKyAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGUobDJ0KTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGVsc2UgaWYgKCBsb2NraW5nICkKICAgICAgICAgICAgICAgICBz cGluX3VubG9jaygmbWFwX3BnZGlyX2xvY2spOwotICAgICAgICAgICAgZmx1c2hfYXJlYShOVUxM LCBGTFVTSF9UTEJfR0xPQkFMKTsgLyogZmx1c2ggYmVmb3JlIGZyZWUgKi8KLSAgICAgICAgICAg IGZyZWVfeGVuX3BhZ2V0YWJsZShwbDJlKTsKICAgICAgICAgfQotICAgICAgICBlbHNlIGlmICgg bG9ja2luZyApCi0gICAgICAgICAgICBzcGluX3VubG9jaygmbWFwX3BnZGlyX2xvY2spOwogICAg IH0KIAogICAgIGZsdXNoX2FyZWEoTlVMTCwgRkxVU0hfVExCX0dMT0JBTCk7Ci0tIAoyLjExLjAK CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2 ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xp c3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs