From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC 18/55] x86/mm: switch to new APIs in modify_xen_mappings Date: Thu, 7 Feb 2019 16:44:19 +0000 Message-ID: <20190207164456.9260-19-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 1grn2L-0003CS-76 for xen-devel@lists.xenproject.org; Thu, 07 Feb 2019 17:00:29 +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 ZXggMWVhMjk3NGMxZi4uMThjN2I0MzcwNSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMK KysrIGIveGVuL2FyY2gveDg2L21tLmMKQEAgLTU0MzYsNiArNTQzNiw3IEBAIGludCBtb2RpZnlf eGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcgcywgdW5zaWduZWQgbG9uZyBlLCB1bnNpZ25lZCBp bnQgbmYpCiAgICAgICAgIGlmICggbDNlX2dldF9mbGFncygqcGwzZSkgJiBfUEFHRV9QU0UgKQog ICAgICAgICB7CiAgICAgICAgICAgICBsMl9wZ2VudHJ5X3QgKmwydDsKKyAgICAgICAgICAgIG1m bl90IG1mbjsKIAogICAgICAgICAgICAgaWYgKCBsMl90YWJsZV9vZmZzZXQodikgPT0gMCAmJgog ICAgICAgICAgICAgICAgICBsMV90YWJsZV9vZmZzZXQodikgPT0gMCAmJgpAQCAtNTQ1MiwxMyAr NTQ1MywxNSBAQCBpbnQgbW9kaWZ5X3hlbl9tYXBwaW5ncyh1bnNpZ25lZCBsb25nIHMsIHVuc2ln bmVkIGxvbmcgZSwgdW5zaWduZWQgaW50IG5mKQogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICAvKiBQQUdFMUdCOiBzaGF0dGVyIHRoZSBzdXBlcnBhZ2UgYW5kIGZhbGwgdGhyb3VnaC4gKi8K LSAgICAgICAgICAgIGwydCA9IGFsbG9jX3hlbl9wYWdldGFibGUoKTsKLSAgICAgICAgICAgIGlm ICggIWwydCApCisgICAgICAgICAgICBtZm4gPSBhbGxvY194ZW5fcGFnZXRhYmxlX25ldygpOwor ICAgICAgICAgICAgaWYgKCBtZm5fZXEobWZuLCBJTlZBTElEX01GTikgKQogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIEFTU0VSVChyYyA9PSAtRU5PTUVNKTsKICAgICAgICAgICAgICAg ICBnb3RvIG91dDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgbDJ0ID0gbWFwX3hlbl9w YWdldGFibGVfbmV3KG1mbik7CisKICAgICAgICAgICAgIGZvciAoIGkgPSAwOyBpIDwgTDJfUEFH RVRBQkxFX0VOVFJJRVM7IGkrKyApCiAgICAgICAgICAgICAgICAgbDJlX3dyaXRlKGwydCArIGks CiAgICAgICAgICAgICAgICAgICAgICAgICAgIGwyZV9mcm9tX3BmbihsM2VfZ2V0X3BmbigqcGwz ZSkgKwpAQCAtNTQ2OSwxNCArNTQ3MiwxNyBAQCBpbnQgbW9kaWZ5X3hlbl9tYXBwaW5ncyh1bnNp Z25lZCBsb25nIHMsIHVuc2lnbmVkIGxvbmcgZSwgdW5zaWduZWQgaW50IG5mKQogICAgICAgICAg ICAgaWYgKCAobDNlX2dldF9mbGFncygqcGwzZSkgJiBfUEFHRV9QUkVTRU5UKSAmJgogICAgICAg ICAgICAgICAgICAobDNlX2dldF9mbGFncygqcGwzZSkgJiBfUEFHRV9QU0UpICkKICAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICBsM2Vfd3JpdGVfYXRvbWljKHBsM2UsIGwzZV9mcm9tX21m bih2aXJ0X3RvX21mbihsMnQpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIF9fUEFHRV9IWVBFUlZJU09SKSk7CisgICAgICAgICAgICAgICAgbDNl X3dyaXRlX2F0b21pYyhwbDNlLCBsM2VfZnJvbV9tZm4obWZuLCBfX1BBR0VfSFlQRVJWSVNPUikp OworICAgICAgICAgICAgICAgIFVOTUFQX1hFTl9QQUdFVEFCTEVfTkVXKGwydCk7CiAgICAgICAg ICAgICAgICAgbDJ0ID0gTlVMTDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICggbG9j a2luZyApCiAgICAgICAgICAgICAgICAgc3Bpbl91bmxvY2soJm1hcF9wZ2Rpcl9sb2NrKTsKICAg ICAgICAgICAgIGlmICggbDJ0ICkKLSAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGUo bDJ0KTsKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBVTk1BUF9YRU5fUEFHRVRBQkxF X05FVyhsMnQpOworICAgICAgICAgICAgICAgIGZyZWVfeGVuX3BhZ2V0YWJsZV9uZXcobWZuKTsK KyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIC8qCkBAIC01NTExLDE1ICs1NTE3 LDE4IEBAIGludCBtb2RpZnlfeGVuX21hcHBpbmdzKHVuc2lnbmVkIGxvbmcgcywgdW5zaWduZWQg bG9uZyBlLCB1bnNpZ25lZCBpbnQgbmYpCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpsMXQ7CisgICAgICAgICAgICAgICAgbWZu X3QgbWZuOwogCiAgICAgICAgICAgICAgICAgLyogUFNFOiBzaGF0dGVyIHRoZSBzdXBlcnBhZ2Ug YW5kIHRyeSBhZ2Fpbi4gKi8KLSAgICAgICAgICAgICAgICBsMXQgPSBhbGxvY194ZW5fcGFnZXRh YmxlKCk7Ci0gICAgICAgICAgICAgICAgaWYgKCAhbDF0ICkKKyAgICAgICAgICAgICAgICBtZm4g PSBhbGxvY194ZW5fcGFnZXRhYmxlX25ldygpOworICAgICAgICAgICAgICAgIGlmICggbWZuX2Vx KG1mbiwgSU5WQUxJRF9NRk4pICkKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg ICAgIEFTU0VSVChyYyA9PSAtRU5PTUVNKTsKICAgICAgICAgICAgICAgICAgICAgZ290byBvdXQ7 CiAgICAgICAgICAgICAgICAgfQogCisgICAgICAgICAgICAgICAgbDF0ID0gbWFwX3hlbl9wYWdl dGFibGVfbmV3KG1mbik7CisKICAgICAgICAgICAgICAgICBmb3IgKCBpID0gMDsgaSA8IEwxX1BB R0VUQUJMRV9FTlRSSUVTOyBpKysgKQogICAgICAgICAgICAgICAgICAgICBsMWVfd3JpdGUoJmwx dFtpXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGwxZV9mcm9tX3BmbihsMmVfZ2V0 X3BmbigqcGwyZSkgKyBpLApAQCAtNTUyOSwxNCArNTUzOCwxOCBAQCBpbnQgbW9kaWZ5X3hlbl9t YXBwaW5ncyh1bnNpZ25lZCBsb25nIHMsIHVuc2lnbmVkIGxvbmcgZSwgdW5zaWduZWQgaW50IG5m KQogICAgICAgICAgICAgICAgIGlmICggKGwyZV9nZXRfZmxhZ3MoKnBsMmUpICYgX1BBR0VfUFJF U0VOVCkgJiYKICAgICAgICAgICAgICAgICAgICAgIChsMmVfZ2V0X2ZsYWdzKCpwbDJlKSAmIF9Q QUdFX1BTRSkgKQogICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgbDJlX3dy aXRlX2F0b21pYyhwbDJlLCBsMmVfZnJvbV9tZm4odmlydF90b19tZm4obDF0KSwKKyAgICAgICAg ICAgICAgICAgICAgbDJlX3dyaXRlX2F0b21pYyhwbDJlLCBsMmVfZnJvbV9tZm4obWZuLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfX1BB R0VfSFlQRVJWSVNPUikpOworICAgICAgICAgICAgICAgICAgICBVTk1BUF9YRU5fUEFHRVRBQkxF X05FVyhsMXQpOwogICAgICAgICAgICAgICAgICAgICBsMXQgPSBOVUxMOwogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICBpZiAoIGxvY2tpbmcgKQogICAgICAgICAgICAgICAgICAg ICBzcGluX3VubG9jaygmbWFwX3BnZGlyX2xvY2spOwogICAgICAgICAgICAgICAgIGlmICggbDF0 ICkKLSAgICAgICAgICAgICAgICAgICAgZnJlZV94ZW5fcGFnZXRhYmxlKGwxdCk7CisgICAgICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBVTk1BUF9YRU5fUEFHRVRBQkxFX05FVyhs MXQpOworICAgICAgICAgICAgICAgICAgICBmcmVlX3hlbl9wYWdldGFibGVfbmV3KG1mbik7Cisg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGVsc2UK LS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3Jn Cmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=