From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC 17/55] x86/mm: drop lXe_to_lYe invocations in map_pages_to_xen Date: Thu, 7 Feb 2019 16:44:18 +0000 Message-ID: <20190207164456.9260-18-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 1grn25-0002Fo-HL for xen-devel@lists.xenproject.org; Thu, 07 Feb 2019 17:00:13 +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 TWFwIGFuZCB1bm1hcCBwYWdlIHRhYmxlcyB3aGVyZSBuZWNlc3NhcnkuCgpTaWduZWQtb2ZmLWJ5 OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9tbS5jIHwg NDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDI5IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMKaW5kZXggYzRjYjZmYmI2MC4uMWVhMjk3 NGMxZiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L21t LmMKQEAgLTUwMTQsOCArNTAxNCwxMCBAQCBpbnQgbWFwX3BhZ2VzX3RvX3hlbigKICAgICAgICAg ICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBsMl9w Z2VudHJ5X3QgKmwydDsKKyAgICAgICAgICAgICAgICAgICAgbWZuX3QgbDJ0X21mbiA9IGwzZV9n ZXRfbWZuKG9sM2UpOworCisgICAgICAgICAgICAgICAgICAgIGwydCA9IG1hcF94ZW5fcGFnZXRh YmxlX25ldyhsMnRfbWZuKTsKIAotICAgICAgICAgICAgICAgICAgICBsMnQgPSBsM2VfdG9fbDJl KG9sM2UpOwogICAgICAgICAgICAgICAgICAgICBmb3IgKCBpID0gMDsgaSA8IEwyX1BBR0VUQUJM RV9FTlRSSUVTOyBpKysgKQogICAgICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg ICAgICAgICBvbDJlID0gbDJ0W2ldOwpAQCAtNTAyNywxMCArNTAyOSwxMiBAQCBpbnQgbWFwX3Bh Z2VzX3RvX3hlbigKICAgICAgICAgICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCBpbnQgajsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs MV9wZ2VudHJ5X3QgKmwxdDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCBsMXRf bWZuID0gbDJlX2dldF9tZm4ob2wyZSk7CiAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBs MXQgPSBsMmVfdG9fbDFlKG9sMmUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGwxdCA9 IG1hcF94ZW5fcGFnZXRhYmxlX25ldyhsMXRfbWZuKTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmb3IgKCBqID0gMDsgaiA8IEwxX1BBR0VUQUJMRV9FTlRSSUVTOyBqKysgKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmbHVzaF9mbGFncyhsMWVfZ2V0X2ZsYWdzKGwxdFtq XSkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVfTkVX KGwxdCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICAgICAgZmx1c2hfYXJlYSh2aXJ0LCBmbHVzaF9mbGFncyk7CkBAIC01 MDM5LDkgKzUwNDMsOSBAQCBpbnQgbWFwX3BhZ2VzX3RvX3hlbigKICAgICAgICAgICAgICAgICAg ICAgICAgIG9sMmUgPSBsMnRbaV07CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIChsMmVf Z2V0X2ZsYWdzKG9sMmUpICYgX1BBR0VfUFJFU0VOVCkgJiYKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIShsMmVfZ2V0X2ZsYWdzKG9sMmUpICYgX1BBR0VfUFNFKSApCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgZnJlZV94ZW5fcGFnZXRhYmxlKGwyZV90b19sMWUob2wyZSkpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyZWVfeGVuX3BhZ2V0YWJsZV9uZXcobDJlX2dl dF9tZm4ob2wyZSkpOwogICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAg IGZyZWVfeGVuX3BhZ2V0YWJsZShsMnQpOworICAgICAgICAgICAgICAgICAgICBmcmVlX3hlbl9w YWdldGFibGVfbmV3KGwydF9tZm4pOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0K IApAQCAtNTE0NiwxMiArNTE1MCwxNCBAQCBpbnQgbWFwX3BhZ2VzX3RvX3hlbigKICAgICAgICAg ICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBsMV9w Z2VudHJ5X3QgKmwxdDsKKyAgICAgICAgICAgICAgICAgICAgbWZuX3QgbDF0X21mbiA9IGwyZV9n ZXRfbWZuKG9sMmUpOwogCi0gICAgICAgICAgICAgICAgICAgIGwxdCA9IGwyZV90b19sMWUob2wy ZSk7CisgICAgICAgICAgICAgICAgICAgIGwxdCA9IG1hcF94ZW5fcGFnZXRhYmxlX25ldyhsMXRf bWZuKTsKICAgICAgICAgICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCBMMV9QQUdFVEFCTEVf RU5UUklFUzsgaSsrICkKICAgICAgICAgICAgICAgICAgICAgICAgIGZsdXNoX2ZsYWdzKGwxZV9n ZXRfZmxhZ3MobDF0W2ldKSk7CiAgICAgICAgICAgICAgICAgICAgIGZsdXNoX2FyZWEodmlydCwg Zmx1c2hfZmxhZ3MpOwotICAgICAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGUobDF0 KTsKKyAgICAgICAgICAgICAgICAgICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVcobDF0KTsKKyAg ICAgICAgICAgICAgICAgICAgZnJlZV94ZW5fcGFnZXRhYmxlX25ldyhsMXRfbWZuKTsKICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKQEAgLTUxNjUsMTIgKzUxNzEsMTQgQEAgaW50 IG1hcF9wYWdlc190b194ZW4oCiAgICAgICAgICAgICAvKiBOb3JtYWwgcGFnZSBtYXBwaW5nLiAq LwogICAgICAgICAgICAgaWYgKCAhKGwyZV9nZXRfZmxhZ3MoKnBsMmUpICYgX1BBR0VfUFJFU0VO VCkgKQogICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIC8qIFhYWCBUaGlzIGZvcmNlcyBw YWdlIHRhYmxlIHRvIGJlIHBvcHVsYXRlZCAqLwogICAgICAgICAgICAgICAgIHBsMWUgPSB2aXJ0 X3RvX3hlbl9sMWUodmlydCk7CiAgICAgICAgICAgICAgICAgaWYgKCBwbDFlID09IE5VTEwgKQog ICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHJjID09IC1FTk9N RU0pOwogICAgICAgICAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVcocGwxZSk7CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBlbHNlIGlmICggbDJlX2dldF9mbGFncygqcGwyZSkgJiBfUEFHRV9Q U0UgKQogICAgICAgICAgICAgewpAQCAtNTIzNCw5ICs1MjQyLDExIEBAIGludCBtYXBfcGFnZXNf dG9feGVuKAogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg cGwxZSAgPSBsMmVfdG9fbDFlKCpwbDJlKSArIGwxX3RhYmxlX29mZnNldCh2aXJ0KTsKKyAgICAg ICAgICAgIHBsMWUgID0gbWFwX3hlbl9wYWdldGFibGVfbmV3KGwyZV9nZXRfbWZuKCgqcGwyZSkp KTsKKyAgICAgICAgICAgIHBsMWUgKz0gbDFfdGFibGVfb2Zmc2V0KHZpcnQpOwogICAgICAgICAg ICAgb2wxZSAgPSAqcGwxZTsKICAgICAgICAgICAgIGwxZV93cml0ZV9hdG9taWMocGwxZSwgbDFl X2Zyb21fbWZuKG1mbiwgZmxhZ3MpKTsKKyAgICAgICAgICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVf TkVXKHBsMWUpOwogICAgICAgICAgICAgaWYgKCAobDFlX2dldF9mbGFncyhvbDFlKSAmIF9QQUdF X1BSRVNFTlQpICkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQg Zmx1c2hfZmxhZ3MgPSBGTFVTSF9UTEIgfCBGTFVTSF9PUkRFUigwKTsKQEAgLTUyNTcsNiArNTI2 Nyw3IEBAIGludCBtYXBfcGFnZXNfdG9feGVuKAogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGxvbmcgYmFzZV9tZm47CiAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90 ICpsMXQ7CisgICAgICAgICAgICAgICAgbWZuX3QgbDF0X21mbjsKIAogICAgICAgICAgICAgICAg IGlmICggbG9ja2luZyApCiAgICAgICAgICAgICAgICAgICAgIHNwaW5fbG9jaygmbWFwX3BnZGly X2xvY2spOwpAQCAtNTI4MCwxMiArNTI5MSwxNSBAQCBpbnQgbWFwX3BhZ2VzX3RvX3hlbigKICAg ICAgICAgICAgICAgICAgICAgZ290byBjaGVja19sMzsKICAgICAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgICAgICBsMXQgPSBsMmVfdG9fbDFlKG9sMmUpOworICAgICAgICAgICAgICAgIGwx dF9tZm4gPSBsMmVfZ2V0X21mbihvbDJlKTsKKyAgICAgICAgICAgICAgICBsMXQgPSBtYXBfeGVu X3BhZ2V0YWJsZV9uZXcobDF0X21mbik7CisKICAgICAgICAgICAgICAgICBiYXNlX21mbiA9IGwx ZV9nZXRfcGZuKGwxdFswXSkgJiB+KEwxX1BBR0VUQUJMRV9FTlRSSUVTIC0gMSk7CiAgICAgICAg ICAgICAgICAgZm9yICggaSA9IDA7IGkgPCBMMV9QQUdFVEFCTEVfRU5UUklFUzsgaSsrICkKICAg ICAgICAgICAgICAgICAgICAgaWYgKCAobDFlX2dldF9wZm4obDF0W2ldKSAhPSAoYmFzZV9tZm4g KyBpKSkgfHwKICAgICAgICAgICAgICAgICAgICAgICAgICAobDFlX2dldF9mbGFncyhsMXRbaV0p ICE9IGZsYWdzKSApCiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg ICAgICBVTk1BUF9YRU5fUEFHRVRBQkxFX05FVyhsMXQpOwogICAgICAgICAgICAgICAgIGlmICgg aSA9PSBMMV9QQUdFVEFCTEVfRU5UUklFUyApCiAgICAgICAgICAgICAgICAgewogICAgICAgICAg ICAgICAgICAgICBsMmVfd3JpdGVfYXRvbWljKHBsMmUsIGwyZV9mcm9tX3BmbihiYXNlX21mbiwK QEAgLTUyOTUsNyArNTMwOSw3IEBAIGludCBtYXBfcGFnZXNfdG9feGVuKAogICAgICAgICAgICAg ICAgICAgICBmbHVzaF9hcmVhKHZpcnQgLSBQQUdFX1NJWkUsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgRkxVU0hfVExCX0dMT0JBTCB8CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgRkxVU0hfT1JERVIoUEFHRVRBQkxFX09SREVSKSk7Ci0gICAgICAgICAgICAgICAgICAg IGZyZWVfeGVuX3BhZ2V0YWJsZShsMmVfdG9fbDFlKG9sMmUpKTsKKyAgICAgICAgICAgICAgICAg ICAgZnJlZV94ZW5fcGFnZXRhYmxlX25ldyhsMXRfbWZuKTsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgZWxzZSBpZiAoIGxvY2tpbmcgKQogICAgICAgICAgICAgICAgICAgICBz cGluX3VubG9jaygmbWFwX3BnZGlyX2xvY2spOwpAQCAtNTMxMSw2ICs1MzI1LDcgQEAgaW50IG1h cF9wYWdlc190b194ZW4oCiAgICAgICAgIHsKICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgYmFz ZV9tZm47CiAgICAgICAgICAgICBsMl9wZ2VudHJ5X3QgKmwydDsKKyAgICAgICAgICAgIG1mbl90 IGwydF9tZm47CiAKICAgICAgICAgICAgIGlmICggbG9ja2luZyApCiAgICAgICAgICAgICAgICAg c3Bpbl9sb2NrKCZtYXBfcGdkaXJfbG9jayk7CkBAIC01MzI4LDcgKzUzNDMsOSBAQCBpbnQgbWFw X3BhZ2VzX3RvX3hlbigKICAgICAgICAgICAgICAgICBnb3RvIGVuZF9vZl9sb29wOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBsMnQgPSBsM2VfdG9fbDJlKG9sM2UpOworICAgICAgICAg ICAgbDJ0X21mbiA9IGwzZV9nZXRfbWZuKG9sM2UpOworICAgICAgICAgICAgbDJ0ID0gbWFwX3hl bl9wYWdldGFibGVfbmV3KGwydF9tZm4pOworCiAgICAgICAgICAgICBiYXNlX21mbiA9IGwyZV9n ZXRfcGZuKGwydFswXSkgJiB+KEwyX1BBR0VUQUJMRV9FTlRSSUVTICoKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMMV9QQUdFVEFCTEVfRU5UUklFUyAtIDEp OwogICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCBMMl9QQUdFVEFCTEVfRU5UUklFUzsgaSsr ICkKQEAgLTUzMzYsNiArNTM1Myw3IEBAIGludCBtYXBfcGFnZXNfdG9feGVuKAogICAgICAgICAg ICAgICAgICAgICAgIChiYXNlX21mbiArIChpIDw8IFBBR0VUQUJMRV9PUkRFUikpKSB8fAogICAg ICAgICAgICAgICAgICAgICAgKGwyZV9nZXRfZmxhZ3MobDJ0W2ldKSAhPSBsMWZfdG9fbE5mKGZs YWdzKSkgKQogICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIFVOTUFQX1hF Tl9QQUdFVEFCTEVfTkVXKGwydCk7CiAgICAgICAgICAgICBpZiAoIGkgPT0gTDJfUEFHRVRBQkxF X0VOVFJJRVMgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGwzZV93cml0ZV9hdG9t aWMocGwzZSwgbDNlX2Zyb21fcGZuKGJhc2VfbWZuLApAQCAtNTM0NSw3ICs1MzYzLDcgQEAgaW50 IG1hcF9wYWdlc190b194ZW4oCiAgICAgICAgICAgICAgICAgZmx1c2hfYXJlYSh2aXJ0IC0gUEFH RV9TSVpFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgRkxVU0hfVExCX0dMT0JBTCB8CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICBGTFVTSF9PUkRFUigyKlBBR0VUQUJMRV9PUkRFUikp OwotICAgICAgICAgICAgICAgIGZyZWVfeGVuX3BhZ2V0YWJsZShsM2VfdG9fbDJlKG9sM2UpKTsK KyAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGVfbmV3KGwydF9tZm4pOwogICAgICAg ICAgICAgfQogICAgICAgICAgICAgZWxzZSBpZiAoIGxvY2tpbmcgKQogICAgICAgICAgICAgICAg IHNwaW5fdW5sb2NrKCZtYXBfcGdkaXJfbG9jayk7Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qu b3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs