From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC 16/55] x86/mm: switch to new APIs in map_pages_to_xen Date: Thu, 7 Feb 2019 16:44:17 +0000 Message-ID: <20190207164456.9260-17-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 1grn1t-0001dj-FQ for xen-devel@lists.xenproject.org; Thu, 07 Feb 2019 17:00:01 +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 UGFnZSB0YWJsZXMgYWxsb2NhdGVkIGluIHRoYXQgZnVuY3Rpb24gc2hvdWxkIGJlIG1hcHBlZCBh bmQgdW5tYXBwZWQKbm93LgoKU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4 LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0uYyB8IDMxICsrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMKaW5k ZXggMzU2ZDU2MWEwNi4uYzRjYjZmYmI2MCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMK KysrIGIveGVuL2FyY2gveDg2L21tLmMKQEAgLTUwNTgsNiArNTA1OCw3IEBAIGludCBtYXBfcGFn ZXNfdG9feGVuKAogICAgICAgICAgICAgdW5zaWduZWQgaW50IGZsdXNoX2ZsYWdzID0KICAgICAg ICAgICAgICAgICBGTFVTSF9UTEIgfCBGTFVTSF9PUkRFUigyICogUEFHRVRBQkxFX09SREVSKTsK ICAgICAgICAgICAgIGwyX3BnZW50cnlfdCAqbDJ0OworICAgICAgICAgICAgbWZuX3QgbWZuOwog CiAgICAgICAgICAgICAvKiBTa2lwIHRoaXMgUFRFIGlmIHRoZXJlIGlzIG5vIGNoYW5nZS4gKi8K ICAgICAgICAgICAgIGlmICggKChsM2VfZ2V0X3BmbihvbDNlKSAmIH4oTDJfUEFHRVRBQkxFX0VO VFJJRVMgKgpAQCAtNTA3OSwxMyArNTA4MCwxNSBAQCBpbnQgbWFwX3BhZ2VzX3RvX3hlbigKICAg ICAgICAgICAgICAgICBnb3RvIGVuZF9vZl9sb29wOwogICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICBsMnQgPSBhbGxvY194ZW5fcGFnZXRhYmxlKCk7Ci0gICAgICAgICAgICBpZiAoIGwydCA9 PSBOVUxMICkKKyAgICAgICAgICAgIG1mbiA9IGFsbG9jX3hlbl9wYWdldGFibGVfbmV3KCk7Cisg ICAgICAgICAgICBpZiAoIG1mbl9lcShtZm4sIElOVkFMSURfTUZOKSApCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJjID09IC1FTk9NRU0pOwogICAgICAgICAgICAgICAg IGdvdG8gb3V0OwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBsMnQgPSBtYXBfeGVuX3Bh Z2V0YWJsZV9uZXcobWZuKTsKKwogICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCBMMl9QQUdF VEFCTEVfRU5UUklFUzsgaSsrICkKICAgICAgICAgICAgICAgICBsMmVfd3JpdGUobDJ0ICsgaSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgbDJlX2Zyb21fcGZuKGwzZV9nZXRfcGZuKG9sM2Up ICsKQEAgLTUxMDAsMTUgKzUxMDMsMTggQEAgaW50IG1hcF9wYWdlc190b194ZW4oCiAgICAgICAg ICAgICBpZiAoIChsM2VfZ2V0X2ZsYWdzKCpwbDNlKSAmIF9QQUdFX1BSRVNFTlQpICYmCiAgICAg ICAgICAgICAgICAgIChsM2VfZ2V0X2ZsYWdzKCpwbDNlKSAmIF9QQUdFX1BTRSkgKQogICAgICAg ICAgICAgewotICAgICAgICAgICAgICAgIGwzZV93cml0ZV9hdG9taWMocGwzZSwgbDNlX2Zyb21f bWZuKHZpcnRfdG9fbWZuKGwydCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgX19QQUdFX0hZUEVSVklTT1IpKTsKKyAgICAgICAgICAgICAgICBs M2Vfd3JpdGVfYXRvbWljKHBsM2UsIGwzZV9mcm9tX21mbihtZm4sIF9fUEFHRV9IWVBFUlZJU09S KSk7CisgICAgICAgICAgICAgICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVcobDJ0KTsKICAgICAg ICAgICAgICAgICBsMnQgPSBOVUxMOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKCBs b2NraW5nICkKICAgICAgICAgICAgICAgICBzcGluX3VubG9jaygmbWFwX3BnZGlyX2xvY2spOwog ICAgICAgICAgICAgZmx1c2hfYXJlYSh2aXJ0LCBmbHVzaF9mbGFncyk7CiAgICAgICAgICAgICBp ZiAoIGwydCApCi0gICAgICAgICAgICAgICAgZnJlZV94ZW5fcGFnZXRhYmxlKGwydCk7CisgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVcobDJ0KTsK KyAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGVfbmV3KG1mbik7CisgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAogICAgICAgICBwbDJlID0gdmlydF90b194ZW5fbDJlKHZpcnQpOwpA QCAtNTE3MSw2ICs1MTc3LDcgQEAgaW50IG1hcF9wYWdlc190b194ZW4oCiAgICAgICAgICAgICAg ICAgdW5zaWduZWQgaW50IGZsdXNoX2ZsYWdzID0KICAgICAgICAgICAgICAgICAgICAgRkxVU0hf VExCIHwgRkxVU0hfT1JERVIoUEFHRVRBQkxFX09SREVSKTsKICAgICAgICAgICAgICAgICBsMV9w Z2VudHJ5X3QgKmwxdDsKKyAgICAgICAgICAgICAgICBtZm5fdCBtZm47CiAKICAgICAgICAgICAg ICAgICAvKiBTa2lwIHRoaXMgUFRFIGlmIHRoZXJlIGlzIG5vIGNoYW5nZS4gKi8KICAgICAgICAg ICAgICAgICBpZiAoICgoKGwyZV9nZXRfcGZuKCpwbDJlKSAmIH4oTDFfUEFHRVRBQkxFX0VOVFJJ RVMgLSAxKSkgKwpAQCAtNTE5MCwxMyArNTE5NywxNSBAQCBpbnQgbWFwX3BhZ2VzX3RvX3hlbigK ICAgICAgICAgICAgICAgICAgICAgZ290byBjaGVja19sMzsKICAgICAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgICAgICBsMXQgPSBhbGxvY194ZW5fcGFnZXRhYmxlKCk7Ci0gICAgICAgICAg ICAgICAgaWYgKCBsMXQgPT0gTlVMTCApCisgICAgICAgICAgICAgICAgbWZuID0gYWxsb2NfeGVu X3BhZ2V0YWJsZV9uZXcoKTsKKyAgICAgICAgICAgICAgICBpZiAoIG1mbl9lcShtZm4sIElOVkFM SURfTUZOKSApCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBBU1NFUlQo cmMgPT0gLUVOT01FTSk7CiAgICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICAg ICAgICAgIH0KIAorICAgICAgICAgICAgICAgIGwxdCA9IG1hcF94ZW5fcGFnZXRhYmxlX25ldyht Zm4pOworCiAgICAgICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCBMMV9QQUdFVEFCTEVfRU5U UklFUzsgaSsrICkKICAgICAgICAgICAgICAgICAgICAgbDFlX3dyaXRlKCZsMXRbaV0sCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsMWVfZnJvbV9wZm4obDJlX2dldF9wZm4oKnBsMmUp ICsgaSwKQEAgLTUyMTAsMTUgKzUyMTksMTkgQEAgaW50IG1hcF9wYWdlc190b194ZW4oCiAgICAg ICAgICAgICAgICAgaWYgKCAobDJlX2dldF9mbGFncygqcGwyZSkgJiBfUEFHRV9QUkVTRU5UKSAm JgogICAgICAgICAgICAgICAgICAgICAgKGwyZV9nZXRfZmxhZ3MoKnBsMmUpICYgX1BBR0VfUFNF KSApCiAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBsMmVfd3JpdGVfYXRv bWljKHBsMmUsIGwyZV9mcm9tX21mbih2aXJ0X3RvX21mbihsMXQpLAorICAgICAgICAgICAgICAg ICAgICBsMmVfd3JpdGVfYXRvbWljKHBsMmUsIGwyZV9mcm9tX21mbihtZm4sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9fUEFHRV9IWVBF UlZJU09SKSk7CisgICAgICAgICAgICAgICAgICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVfTkVXKGwx dCk7CiAgICAgICAgICAgICAgICAgICAgIGwxdCA9IE5VTEw7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIGlmICggbG9ja2luZyApCiAgICAgICAgICAgICAgICAgICAgIHNwaW5f dW5sb2NrKCZtYXBfcGdkaXJfbG9jayk7CiAgICAgICAgICAgICAgICAgZmx1c2hfYXJlYSh2aXJ0 LCBmbHVzaF9mbGFncyk7CiAgICAgICAgICAgICAgICAgaWYgKCBsMXQgKQotICAgICAgICAgICAg ICAgICAgICBmcmVlX3hlbl9wYWdldGFibGUobDF0KTsKKyAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVfTkVXKGwxdCk7CisgICAgICAgICAg ICAgICAgICAgIGZyZWVfeGVuX3BhZ2V0YWJsZV9uZXcobWZuKTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHBsMWUgID0gbDJlX3RvX2wxZSgqcGwyZSkg KyBsMV90YWJsZV9vZmZzZXQodmlydCk7Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21h aWxtYW4vbGlzdGluZm8veGVuLWRldmVs