From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC 22/55] x86_64/mm: switch to new APIs in paging_init Date: Thu, 7 Feb 2019 16:44:23 +0000 Message-ID: <20190207164456.9260-23-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 1grn1w-0001ny-5q for xen-devel@lists.xenproject.org; Thu, 07 Feb 2019 17:00:04 +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 aC94ODYveDg2XzY0L21tLmMgfCA0OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYveDg2XzY0L21tLmMgYi94ZW4vYXJj aC94ODYveDg2XzY0L21tLmMKaW5kZXggODNkNjI2NzRjMC4uMDI5MTk0ODFlNCAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L3g4Nl82NC9tbS5jCisrKyBiL3hlbi9hcmNoL3g4Ni94ODZfNjQvbW0u YwpAQCAtNDk2LDkgKzQ5NiwxMCBAQCB2b2lkIF9faW5pdCBwYWdpbmdfaW5pdCh2b2lkKQogewog ICAgIHVuc2lnbmVkIGxvbmcgaSwgbXB0X3NpemUsIHZhOwogICAgIHVuc2lnbmVkIGludCBuLCBt ZW1mbGFnczsKLSAgICBsM19wZ2VudHJ5X3QgKmwzX3JvX21wdDsKLSAgICBsMl9wZ2VudHJ5X3Qg KnBsMmUgPSBOVUxMLCAqbDJfcm9fbXB0OworICAgIGwzX3BnZW50cnlfdCAqbDNfcm9fbXB0ID0g TlVMTDsKKyAgICBsMl9wZ2VudHJ5X3QgKnBsMmUgPSBOVUxMLCAqbDJfcm9fbXB0ID0gTlVMTDsK ICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpsMV9wZzsKKyAgICBtZm5fdCBsM19yb19tcHRfbWZuLCBs Ml9yb19tcHRfbWZuOwogCiAgICAgLyoKICAgICAgKiBXZSBzZXR1cCB0aGUgTDNzIGZvciAxOjEg bWFwcGluZyBpZiBob3N0IHN1cHBvcnQgbWVtb3J5IGhvdHBsdWcKQEAgLTUxMSwyMiArNTEyLDI5 IEBAIHZvaWQgX19pbml0IHBhZ2luZ19pbml0KHZvaWQpCiAgICAgICAgIGlmICggIShsNGVfZ2V0 X2ZsYWdzKGlkbGVfcGdfdGFibGVbbDRfdGFibGVfb2Zmc2V0KHZhKV0pICYKICAgICAgICAgICAg ICAgX1BBR0VfUFJFU0VOVCkgKQogICAgICAgICB7Ci0gICAgICAgICAgICBsM19wZ2VudHJ5X3Qg KnBsM3QgPSBhbGxvY194ZW5fcGFnZXRhYmxlKCk7CisgICAgICAgICAgICBsM19wZ2VudHJ5X3Qg KnBsM3Q7CisgICAgICAgICAgICBtZm5fdCBtZm47CiAKLSAgICAgICAgICAgIGlmICggIXBsM3Qg KQorICAgICAgICAgICAgbWZuID0gYWxsb2NfeGVuX3BhZ2V0YWJsZV9uZXcoKTsKKyAgICAgICAg ICAgIGlmICggbWZuX2VxKG1mbiwgSU5WQUxJRF9NRk4pICkKICAgICAgICAgICAgICAgICBnb3Rv IG5vbWVtOworCisgICAgICAgICAgICBwbDN0ID0gbWFwX3hlbl9wYWdldGFibGVfbmV3KG1mbik7 CiAgICAgICAgICAgICBjbGVhcl9wYWdlKHBsM3QpOwogICAgICAgICAgICAgbDRlX3dyaXRlKCZp ZGxlX3BnX3RhYmxlW2w0X3RhYmxlX29mZnNldCh2YSldLAotICAgICAgICAgICAgICAgICAgICAg IGw0ZV9mcm9tX3BhZGRyKF9fcGEocGwzdCksIF9fUEFHRV9IWVBFUlZJU09SX1JXKSk7CisgICAg ICAgICAgICAgICAgICAgICAgbDRlX2Zyb21fbWZuKG1mbiwgX19QQUdFX0hZUEVSVklTT1JfUlcp KTsKKyAgICAgICAgICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVfTkVXKHBsM3QpOwogICAgICAgICB9 CiAgICAgfQogCiAgICAgLyogQ3JlYXRlIHVzZXItYWNjZXNzaWJsZSBMMiBkaXJlY3RvcnkgdG8g bWFwIHRoZSBNUFQgZm9yIGd1ZXN0cy4gKi8KLSAgICBpZiAoIChsM19yb19tcHQgPSBhbGxvY194 ZW5fcGFnZXRhYmxlKCkpID09IE5VTEwgKQorICAgIGwzX3JvX21wdF9tZm4gPSBhbGxvY194ZW5f cGFnZXRhYmxlX25ldygpOworICAgIGlmICggbWZuX2VxKGwzX3JvX21wdF9tZm4sIElOVkFMSURf TUZOKSApCiAgICAgICAgIGdvdG8gbm9tZW07CisgICAgbDNfcm9fbXB0ID0gbWFwX3hlbl9wYWdl dGFibGVfbmV3KGwzX3JvX21wdF9tZm4pOwogICAgIGNsZWFyX3BhZ2UobDNfcm9fbXB0KTsKICAg ICBsNGVfd3JpdGUoJmlkbGVfcGdfdGFibGVbbDRfdGFibGVfb2Zmc2V0KFJPX01QVF9WSVJUX1NU QVJUKV0sCi0gICAgICAgICAgICAgIGw0ZV9mcm9tX3BhZGRyKF9fcGEobDNfcm9fbXB0KSwgX19Q QUdFX0hZUEVSVklTT1JfUk8gfCBfUEFHRV9VU0VSKSk7CisgICAgICAgICAgICAgIGw0ZV9mcm9t X21mbihsM19yb19tcHRfbWZuLCBfX1BBR0VfSFlQRVJWSVNPUl9STyB8IF9QQUdFX1VTRVIpKTsK IAogICAgIC8qCiAgICAgICogQWxsb2NhdGUgYW5kIG1hcCB0aGUgbWFjaGluZS10by1waHlzIHRh YmxlLgpAQCAtNjA4LDEyICs2MTYsMjEgQEAgdm9pZCBfX2luaXQgcGFnaW5nX2luaXQodm9pZCkK ICAgICAgICAgfQogICAgICAgICBpZiAoICEoKHVuc2lnbmVkIGxvbmcpcGwyZSAmIH5QQUdFX01B U0spICkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCAobDJfcm9fbXB0ID0gYWxsb2NfeGVu X3BhZ2V0YWJsZSgpKSA9PSBOVUxMICkKKyAgICAgICAgICAgIC8qCisgICAgICAgICAgICAgKiBV bm1hcCBsMl9yb19tcHQsIHdoaWNoIGNvdWxkJ3ZlIGJlZW4gbWFwcGVkIGluIHByZXZpb3VzCisg ICAgICAgICAgICAgKiBpdGVyYXRpb24uCisgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgIHVu bWFwX3hlbl9wYWdldGFibGVfbmV3KGwyX3JvX21wdCk7CisKKyAgICAgICAgICAgIGwyX3JvX21w dF9tZm4gPSBhbGxvY194ZW5fcGFnZXRhYmxlX25ldygpOworICAgICAgICAgICAgaWYgKCBtZm5f ZXEobDJfcm9fbXB0X21mbiwgSU5WQUxJRF9NRk4pICkKICAgICAgICAgICAgICAgICBnb3RvIG5v bWVtOworCisgICAgICAgICAgICBsMl9yb19tcHQgPSBtYXBfeGVuX3BhZ2V0YWJsZV9uZXcobDJf cm9fbXB0X21mbik7CiAgICAgICAgICAgICBjbGVhcl9wYWdlKGwyX3JvX21wdCk7CiAgICAgICAg ICAgICBsM2Vfd3JpdGUoJmwzX3JvX21wdFtsM190YWJsZV9vZmZzZXQodmEpXSwKLSAgICAgICAg ICAgICAgICAgICAgICBsM2VfZnJvbV9wYWRkcihfX3BhKGwyX3JvX21wdCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgX19QQUdFX0hZUEVSVklTT1JfUk8gfCBfUEFHRV9V U0VSKSk7CisgICAgICAgICAgICAgICAgICAgICAgbDNlX2Zyb21fbWZuKGwyX3JvX21wdF9tZm4s CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9fUEFHRV9IWVBFUlZJU09SX1JP IHwgX1BBR0VfVVNFUikpOwogICAgICAgICAgICAgcGwyZSA9IGwyX3JvX21wdDsKICAgICAgICAg ICAgIEFTU0VSVCghbDJfdGFibGVfb2Zmc2V0KHZhKSk7CiAgICAgICAgIH0KQEAgLTYyNSwxOCAr NjQyLDIzIEBAIHZvaWQgX19pbml0IHBhZ2luZ19pbml0KHZvaWQpCiAgICAgfQogI3VuZGVmIENO VAogI3VuZGVmIE1GTgorICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVfTkVXKGwyX3JvX21wdCk7Cisg ICAgVU5NQVBfWEVOX1BBR0VUQUJMRV9ORVcobDNfcm9fbXB0KTsKIAogICAgIC8qIENyZWF0ZSB1 c2VyLWFjY2Vzc2libGUgTDIgZGlyZWN0b3J5IHRvIG1hcCB0aGUgTVBUIGZvciBjb21wYXQgZ3Vl c3RzLiAqLwogICAgIEJVSUxEX0JVR19PTihsNF90YWJsZV9vZmZzZXQoUkRXUl9NUFRfVklSVF9T VEFSVCkgIT0KICAgICAgICAgICAgICAgICAgbDRfdGFibGVfb2Zmc2V0KEhJUk9fQ09NUEFUX01Q VF9WSVJUX1NUQVJUKSk7CiAgICAgbDNfcm9fbXB0ID0gbDRlX3RvX2wzZShpZGxlX3BnX3RhYmxl W2w0X3RhYmxlX29mZnNldCgKICAgICAgICAgSElST19DT01QQVRfTVBUX1ZJUlRfU1RBUlQpXSk7 Ci0gICAgaWYgKCAobDJfcm9fbXB0ID0gYWxsb2NfeGVuX3BhZ2V0YWJsZSgpKSA9PSBOVUxMICkK KworICAgIGwyX3JvX21wdF9tZm4gPSBhbGxvY194ZW5fcGFnZXRhYmxlX25ldygpOworICAgIGlm ICggbWZuX2VxKGwyX3JvX21wdF9tZm4sIElOVkFMSURfTUZOKSApCiAgICAgICAgIGdvdG8gbm9t ZW07CisgICAgbDJfcm9fbXB0ID0gbWFwX3hlbl9wYWdldGFibGVfbmV3KGwyX3JvX21wdF9tZm4p OwogICAgIGNvbXBhdF9pZGxlX3BnX3RhYmxlX2wyID0gbDJfcm9fbXB0OwogICAgIGNsZWFyX3Bh Z2UobDJfcm9fbXB0KTsKICAgICBsM2Vfd3JpdGUoJmwzX3JvX21wdFtsM190YWJsZV9vZmZzZXQo SElST19DT01QQVRfTVBUX1ZJUlRfU1RBUlQpXSwKLSAgICAgICAgICAgICAgbDNlX2Zyb21fcGFk ZHIoX19wYShsMl9yb19tcHQpLCBfX1BBR0VfSFlQRVJWSVNPUl9STykpOworICAgICAgICAgICAg ICBsM2VfZnJvbV9tZm4obDJfcm9fbXB0X21mbiwgX19QQUdFX0hZUEVSVklTT1JfUk8pKTsKICAg ICBwbDJlID0gbDJfcm9fbXB0OwogICAgIHBsMmUgKz0gbDJfdGFibGVfb2Zmc2V0KEhJUk9fQ09N UEFUX01QVF9WSVJUX1NUQVJUKTsKICAgICAvKiBBbGxvY2F0ZSBhbmQgbWFwIHRoZSBjb21wYXRp YmlsaXR5IG1vZGUgbWFjaGluZS10by1waHlzIHRhYmxlLiAqLwpAQCAtNjc4LDYgKzcwMCw4IEBA IHZvaWQgX19pbml0IHBhZ2luZ19pbml0KHZvaWQpCiAjdW5kZWYgQ05UCiAjdW5kZWYgTUZOCiAK KyAgICBVTk1BUF9YRU5fUEFHRVRBQkxFX05FVyhsMl9yb19tcHQpOworCiAgICAgbWFjaGluZV90 b19waHlzX21hcHBpbmdfdmFsaWQgPSAxOwogCiAgICAgLyogU2V0IHVwIGxpbmVhciBwYWdlIHRh YmxlIG1hcHBpbmcuICovCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0 cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8veGVuLWRldmVs