From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC 19/55] x86/mm: drop lXe_to_lYe invocations from modify_xen_mappings Date: Thu, 7 Feb 2019 16:44:20 +0000 Message-ID: <20190207164456.9260-20-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 us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1grn1g-0001M2-OR for xen-devel@lists.xenproject.org; Thu, 07 Feb 2019 16:59:48 +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 U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj aC94ODYvbW0uYyB8IDI4ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMKaW5kZXggMThjN2I0MzcwNS4uZGRkOTll ZjBmMiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L21t LmMKQEAgLTU0MDYsOCArNTQwNiw3IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVk IGxvbmcgcywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiB7CiAgICAgYm9vbCBs b2NraW5nID0gc3lzdGVtX3N0YXRlID4gU1lTX1NUQVRFX2Jvb3Q7CiAgICAgbDNfcGdlbnRyeV90 ICpwbDNlID0gTlVMTDsKLSAgICBsMl9wZ2VudHJ5X3QgKnBsMmU7Ci0gICAgbDFfcGdlbnRyeV90 ICpwbDFlOworICAgIGwyX3BnZW50cnlfdCAqcGwyZSA9IE5VTEw7CiAgICAgdW5zaWduZWQgaW50 ICBpOwogICAgIHVuc2lnbmVkIGxvbmcgdiA9IHM7CiAgICAgaW50IHJjID0gLUVOT01FTTsKQEAg LTU0ODksNyArNTQ4OCw4IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcg cywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAgICAgICAgICAqIFRoZSBMMyBl bnRyeSBoYXMgYmVlbiB2ZXJpZmllZCB0byBiZSBwcmVzZW50LCBhbmQgd2UndmUgZGVhbHQgd2l0 aAogICAgICAgICAgKiAxRyBwYWdlcyBhcyB3ZWxsLCBzbyB0aGUgTDIgdGFibGUgY2Fubm90IHJl cXVpcmUgYWxsb2NhdGlvbi4KICAgICAgICAgICovCi0gICAgICAgIHBsMmUgPSBsM2VfdG9fbDJl KCpwbDNlKSArIGwyX3RhYmxlX29mZnNldCh2KTsKKyAgICAgICAgcGwyZSA9IG1hcF94ZW5fcGFn ZXRhYmxlX25ldyhsM2VfZ2V0X21mbigqcGwzZSkpOworICAgICAgICBwbDJlICs9IGwyX3RhYmxl X29mZnNldCh2KTsKIAogICAgICAgICBpZiAoICEobDJlX2dldF9mbGFncygqcGwyZSkgJiBfUEFH RV9QUkVTRU5UKSApCiAgICAgICAgIHsKQEAgLTU1NTQsMTQgKzU1NTQsMTYgQEAgaW50IG1vZGlm eV94ZW5fbWFwcGluZ3ModW5zaWduZWQgbG9uZyBzLCB1bnNpZ25lZCBsb25nIGUsIHVuc2lnbmVk IGludCBuZikKICAgICAgICAgfQogICAgICAgICBlbHNlCiAgICAgICAgIHsKLSAgICAgICAgICAg IGwxX3BnZW50cnlfdCBubDFlLCAqbDF0OworICAgICAgICAgICAgbDFfcGdlbnRyeV90IG5sMWUs ICpsMXQsICpwbDFlOworICAgICAgICAgICAgbWZuX3QgbDF0X21mbjsKIAogICAgICAgICAgICAg LyoKICAgICAgICAgICAgICAqIE9yZGluYXJ5IDRrQiBtYXBwaW5nOiBUaGUgTDIgZW50cnkgaGFz IGJlZW4gdmVyaWZpZWQgdG8gYmUKICAgICAgICAgICAgICAqIHByZXNlbnQsIGFuZCB3ZSd2ZSBk ZWFsdCB3aXRoIDJNIHBhZ2VzIGFzIHdlbGwsIHNvIHRoZSBMMSB0YWJsZQogICAgICAgICAgICAg ICogY2Fubm90IHJlcXVpcmUgYWxsb2NhdGlvbi4KICAgICAgICAgICAgICAqLwotICAgICAgICAg ICAgcGwxZSA9IGwyZV90b19sMWUoKnBsMmUpICsgbDFfdGFibGVfb2Zmc2V0KHYpOworICAgICAg ICAgICAgcGwxZSA9IG1hcF94ZW5fcGFnZXRhYmxlX25ldyhsMmVfZ2V0X21mbigqcGwyZSkpOwor ICAgICAgICAgICAgcGwxZSArPSBsMV90YWJsZV9vZmZzZXQodik7CiAKICAgICAgICAgICAgIC8q IENvbmZpcm0gdGhlIGNhbGxlciBpc24ndCB0cnlpbmcgdG8gY3JlYXRlIG5ldyBtYXBwaW5ncy4g Ki8KICAgICAgICAgICAgIGlmICggIShsMWVfZ2V0X2ZsYWdzKCpwbDFlKSAmIF9QQUdFX1BSRVNF TlQpICkKQEAgLTU1NzIsNiArNTU3NCw3IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2ln bmVkIGxvbmcgcywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGwxZV9nZXRfZmxhZ3MoKnBsMWUpICYgfkZMQUdTX01BU0sp IHwgbmYpOwogCiAgICAgICAgICAgICBsMWVfd3JpdGVfYXRvbWljKHBsMWUsIG5sMWUpOworICAg ICAgICAgICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVcocGwxZSk7CiAgICAgICAgICAgICB2ICs9 IFBBR0VfU0laRTsKIAogICAgICAgICAgICAgLyoKQEAgLTU2MDEsMTAgKzU2MDQsMTIgQEAgaW50 IG1vZGlmeV94ZW5fbWFwcGluZ3ModW5zaWduZWQgbG9uZyBzLCB1bnNpZ25lZCBsb25nIGUsIHVu c2lnbmVkIGludCBuZikKICAgICAgICAgICAgICAgICBnb3RvIGVuZF9vZl9sb29wOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBsMXQgPSBsMmVfdG9fbDFlKCpwbDJlKTsKKyAgICAgICAg ICAgIGwxdF9tZm4gPSBsMmVfZ2V0X21mbigqcGwyZSk7CisgICAgICAgICAgICBsMXQgPSBtYXBf eGVuX3BhZ2V0YWJsZV9uZXcobDF0X21mbik7CiAgICAgICAgICAgICBmb3IgKCBpID0gMDsgaSA8 IEwxX1BBR0VUQUJMRV9FTlRSSUVTOyBpKysgKQogICAgICAgICAgICAgICAgIGlmICggbDFlX2dl dF9pbnRwdGUobDF0W2ldKSAhPSAwICkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICBVTk1BUF9YRU5fUEFHRVRBQkxFX05FVyhsMXQpOwogICAgICAgICAgICAgaWYgKCBp ID09IEwxX1BBR0VUQUJMRV9FTlRSSUVTICkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAvKiBFbXB0eTogemFwIHRoZSBMMkUgYW5kIGZyZWUgdGhlIEwxIHBhZ2UuICovCkBAIC01NjEy LDcgKzU2MTcsNyBAQCBpbnQgbW9kaWZ5X3hlbl9tYXBwaW5ncyh1bnNpZ25lZCBsb25nIHMsIHVu c2lnbmVkIGxvbmcgZSwgdW5zaWduZWQgaW50IG5mKQogICAgICAgICAgICAgICAgIGlmICggbG9j a2luZyApCiAgICAgICAgICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZtYXBfcGdkaXJfbG9jayk7 CiAgICAgICAgICAgICAgICAgZmx1c2hfYXJlYShOVUxMLCBGTFVTSF9UTEJfR0xPQkFMKTsgLyog Zmx1c2ggYmVmb3JlIGZyZWUgKi8KLSAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGUo bDF0KTsKKyAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGVfbmV3KGwxdF9tZm4pOwog ICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxzZSBpZiAoIGxvY2tpbmcgKQogICAgICAgICAg ICAgICAgIHNwaW5fdW5sb2NrKCZtYXBfcGdkaXJfbG9jayk7CkBAIC01NjQzLDExICs1NjQ4LDE0 IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcgcywgdW5zaWduZWQgbG9u ZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAKICAgICAgICAgewogICAgICAgICAgICAgbDJfcGdlbnRy eV90ICpsMnQ7CisgICAgICAgICAgICBtZm5fdCBsMnRfbWZuOwogCi0gICAgICAgICAgICBsMnQg PSBsM2VfdG9fbDJlKCpwbDNlKTsKKyAgICAgICAgICAgIGwydF9tZm4gPSBsM2VfZ2V0X21mbigq cGwzZSk7CisgICAgICAgICAgICBsMnQgPSBtYXBfeGVuX3BhZ2V0YWJsZV9uZXcobDJ0X21mbik7 CiAgICAgICAgICAgICBmb3IgKCBpID0gMDsgaSA8IEwyX1BBR0VUQUJMRV9FTlRSSUVTOyBpKysg KQogICAgICAgICAgICAgICAgIGlmICggbDJlX2dldF9pbnRwdGUobDJ0W2ldKSAhPSAwICkKICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBVTk1BUF9YRU5fUEFHRVRBQkxF X05FVyhsMnQpOwogICAgICAgICAgICAgaWYgKCBpID09IEwyX1BBR0VUQUJMRV9FTlRSSUVTICkK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAvKiBFbXB0eTogemFwIHRoZSBMM0UgYW5k IGZyZWUgdGhlIEwyIHBhZ2UuICovCkBAIC01NjU1LDEyICs1NjYzLDEzIEBAIGludCBtb2RpZnlf eGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcgcywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBp bnQgbmYpCiAgICAgICAgICAgICAgICAgaWYgKCBsb2NraW5nICkKICAgICAgICAgICAgICAgICAg ICAgc3Bpbl91bmxvY2soJm1hcF9wZ2Rpcl9sb2NrKTsKICAgICAgICAgICAgICAgICBmbHVzaF9h cmVhKE5VTEwsIEZMVVNIX1RMQl9HTE9CQUwpOyAvKiBmbHVzaCBiZWZvcmUgZnJlZSAqLwotICAg ICAgICAgICAgICAgIGZyZWVfeGVuX3BhZ2V0YWJsZShsMnQpOworICAgICAgICAgICAgICAgIGZy ZWVfeGVuX3BhZ2V0YWJsZV9uZXcobDJ0X21mbik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBlbHNlIGlmICggbG9ja2luZyApCiAgICAgICAgICAgICAgICAgc3Bpbl91bmxvY2soJm1hcF9w Z2Rpcl9sb2NrKTsKICAgICAgICAgfQogICAgIGVuZF9vZl9sb29wOgorICAgICAgICBVTk1BUF9Y RU5fUEFHRVRBQkxFX05FVyhwbDJlKTsKICAgICAgICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVco cGwzZSk7CiAgICAgfQogCkBAIC01NjcwLDYgKzU2NzksNyBAQCBpbnQgbW9kaWZ5X3hlbl9tYXBw aW5ncyh1bnNpZ25lZCBsb25nIHMsIHVuc2lnbmVkIGxvbmcgZSwgdW5zaWduZWQgaW50IG5mKQog ICAgIHJjID0gMDsKIAogIG91dDoKKyAgICBVTk1BUF9YRU5fUEFHRVRBQkxFX05FVyhwbDJlKTsK ICAgICBVTk1BUF9YRU5fUEFHRVRBQkxFX05FVyhwbDNlKTsKICAgICByZXR1cm4gcmM7CiB9Ci0t IAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs