From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 2/3] x86/mm: don't wrap x86_emulate_ctxt in ptwr_emulate_ctxt Date: Wed, 30 Aug 2017 18:11:11 +0100 Message-ID: <20170830171112.3634-3-wei.liu2@citrix.com> References: <20170830171112.3634-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dn6Wo-0002GE-F9 for xen-devel@lists.xenproject.org; Wed, 30 Aug 2017 17:11:46 +0000 In-Reply-To: <20170830171112.3634-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org UmV3cml0ZSB0aGUgY29kZSBzbyB0aGF0IGl0IGhhcyB0aGUgc2FtZSBzdHJ1Y3R1cmUgYXMKbW1p b19yb19lbXVhbHRlX2N0eHQuIFRoZSBuZXcgY29kZSBkb2Vzbid0IGNvbnRhaW4geDg2X2VtdWxh dGVfY3R4dAphbnltb3JlIGJ1dCBhIHBvaW50ZXIgdG8gdGhlIHg4Nl9lbXVsYXRlX2N0eHQ7IHg4 Nl9lbXVsYXRlX2N0eHQgbm93CmFsc28gcG9pbnRzIHRvIHB0d3JfZW11bGF0ZV9jdHh0IHZpYSBp dHMgZGF0YSBwb2ludGVyLgoKVGhpcyBwYXRjaCB3aWxsIGhlbHAgdW5pZnkgbW1pb19ybyBhbmQg cHR3ciBjb2RlIHBhdGhzIGxhdGVyLgoKU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJA Y2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0uYyB8IDQ3ICsrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0 aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tLmMg Yi94ZW4vYXJjaC94ODYvbW0uYwppbmRleCBlZDgwZGYwMmZhLi41Yjg0MGNjNjAzIDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvbW0uYworKysgYi94ZW4vYXJjaC94ODYvbW0uYwpAQCAtNDk1Niw5 ICs0OTU2LDkgQEAgbG9uZyBhcmNoX21lbW9yeV9vcCh1bnNpZ25lZCBsb25nIGNtZCwgWEVOX0dV RVNUX0hBTkRMRV9QQVJBTSh2b2lkKSBhcmcpCiAgKi8KIAogc3RydWN0IHB0d3JfZW11bGF0ZV9j dHh0IHsKLSAgICBzdHJ1Y3QgeDg2X2VtdWxhdGVfY3R4dCBjdHh0OwogICAgIHVuc2lnbmVkIGxv bmcgY3IyOwogICAgIGwxX3BnZW50cnlfdCAgcHRlOworICAgIHN0cnVjdCB4ODZfZW11bGF0ZV9j dHh0ICpjdHh0OwogfTsKIAogc3RhdGljIGludCBwdHdyX2VtdWxhdGVkX3JlYWQoCkBAIC01MDE4 LDcgKzUwMTgsNyBAQCBzdGF0aWMgaW50IHB0d3JfZW11bGF0ZWRfdXBkYXRlKAogICAgICAgICB7 CiAgICAgICAgICAgICB4ODZfZW11bF9wYWdlZmF1bHQoMCwgLyogUmVhZCBmYXVsdC4gKi8KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhZGRyICsgc2l6ZW9mKHBhZGRyX3QpIC0gcmMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnB0d3JfY3R4dC0+Y3R4dCk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHR3cl9jdHh0LT5jdHh0KTsKICAgICAgICAgICAg IHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKICAgICAgICAgfQogICAgICAgICAvKiBNYXNrIG91 dCBiaXRzIHByb3ZpZGVkIGJ5IGNhbGxlci4gKi8KQEAgLTUxMzMsOSArNTEzMyw3IEBAIHN0YXRp YyBpbnQgcHR3cl9lbXVsYXRlZF93cml0ZSgKIAogICAgIG1lbWNweSgmdmFsLCBwX2RhdGEsIGJ5 dGVzKTsKIAotICAgIHJldHVybiBwdHdyX2VtdWxhdGVkX3VwZGF0ZSgKLSAgICAgICAgb2Zmc2V0 LCAwLCB2YWwsIGJ5dGVzLCAwLAotICAgICAgICBjb250YWluZXJfb2YoY3R4dCwgc3RydWN0IHB0 d3JfZW11bGF0ZV9jdHh0LCBjdHh0KSk7CisgICAgcmV0dXJuIHB0d3JfZW11bGF0ZWRfdXBkYXRl KG9mZnNldCwgMCwgdmFsLCBieXRlcywgMCwgY3R4dC0+ZGF0YSk7CiB9CiAKIHN0YXRpYyBpbnQg cHR3cl9lbXVsYXRlZF9jbXB4Y2hnKApAQCAtNTE1OCw5ICs1MTU2LDcgQEAgc3RhdGljIGludCBw dHdyX2VtdWxhdGVkX2NtcHhjaGcoCiAgICAgbWVtY3B5KCZvbGQsIHBfb2xkLCBieXRlcyk7CiAg ICAgbWVtY3B5KCZuZXcsIHBfbmV3LCBieXRlcyk7CiAKLSAgICByZXR1cm4gcHR3cl9lbXVsYXRl ZF91cGRhdGUoCi0gICAgICAgIG9mZnNldCwgb2xkLCBuZXcsIGJ5dGVzLCAxLAotICAgICAgICBj b250YWluZXJfb2YoY3R4dCwgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0LCBjdHh0KSk7CisgICAg cmV0dXJuIHB0d3JfZW11bGF0ZWRfdXBkYXRlKG9mZnNldCwgb2xkLCBuZXcsIGJ5dGVzLCAxLCBj dHh0LT5kYXRhKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCB4ODZfZW11bGF0ZV9vcHMgcHR3 cl9lbXVsYXRlX29wcyA9IHsKQEAgLTUxNzksMTQgKzUxNzUsMTQgQEAgaW50IHB0d3JfZG9fcGFn ZV9mYXVsdChzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRyLAogICAgIHN0cnVjdCBk b21haW4gKmQgPSB2LT5kb21haW47CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZTsKICAgICBs MV9wZ2VudHJ5X3QgICAgICBwdGU7Ci0gICAgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0IHB0d3Jf Y3R4dCA9IHsKLSAgICAgICAgLmN0eHQgPSB7Ci0gICAgICAgICAgICAucmVncyA9IHJlZ3MsCi0g ICAgICAgICAgICAudmVuZG9yID0gZC0+YXJjaC5jcHVpZC0+eDg2X3ZlbmRvciwKLSAgICAgICAg ICAgIC5hZGRyX3NpemUgPSBpc19wdl8zMmJpdF9kb21haW4oZCkgPyAzMiA6IEJJVFNfUEVSX0xP TkcsCi0gICAgICAgICAgICAuc3Bfc2l6ZSAgID0gaXNfcHZfMzJiaXRfZG9tYWluKGQpID8gMzIg OiBCSVRTX1BFUl9MT05HLAotICAgICAgICAgICAgLmxtYSAgICAgICA9ICFpc19wdl8zMmJpdF9k b21haW4oZCksCi0gICAgICAgIH0sCisgICAgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0IHB0d3Jf Y3R4dDsKKyAgICBzdHJ1Y3QgeDg2X2VtdWxhdGVfY3R4dCBjdHh0ID0geworICAgICAgIC5yZWdz ID0gcmVncywKKyAgICAgICAudmVuZG9yID0gZC0+YXJjaC5jcHVpZC0+eDg2X3ZlbmRvciwKKyAg ICAgICAuYWRkcl9zaXplID0gaXNfcHZfMzJiaXRfZG9tYWluKGQpID8gMzIgOiBCSVRTX1BFUl9M T05HLAorICAgICAgIC5zcF9zaXplICAgPSBpc19wdl8zMmJpdF9kb21haW4oZCkgPyAzMiA6IEJJ VFNfUEVSX0xPTkcsCisgICAgICAgLmxtYSAgICAgICA9ICFpc19wdl8zMmJpdF9kb21haW4oZCks CisgICAgICAgLmRhdGEgICAgICA9ICZwdHdyX2N0eHQsCiAgICAgfTsKICAgICBpbnQgcmM7CiAK QEAgLTUyMTMsMTAgKzUyMDksMTMgQEAgaW50IHB0d3JfZG9fcGFnZV9mYXVsdChzdHJ1Y3QgdmNw dSAqdiwgdW5zaWduZWQgbG9uZyBhZGRyLAogICAgICAgICBnb3RvIGJhaWw7CiAgICAgfQogCi0g ICAgcHR3cl9jdHh0LmNyMiA9IGFkZHI7Ci0gICAgcHR3cl9jdHh0LnB0ZSA9IHB0ZTsKKyAgICBw dHdyX2N0eHQgPSAoc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0KSB7CisgICAgICAgIC5jcjIgPSBh ZGRyLAorICAgICAgICAucHRlID0gcHRlLAorICAgICAgICAuY3R4dCA9ICZjdHh0CisgICAgfTsK IAotICAgIHJjID0geDg2X2VtdWxhdGUoJnB0d3JfY3R4dC5jdHh0LCAmcHR3cl9lbXVsYXRlX29w cyk7CisgICAgcmMgPSB4ODZfZW11bGF0ZSgmY3R4dCwgJnB0d3JfZW11bGF0ZV9vcHMpOwogCiAg ICAgcGFnZV91bmxvY2socGFnZSk7CiAgICAgcHV0X3BhZ2UocGFnZSk7CkBAIC01MjMxLDE4ICs1 MjMwLDE4IEBAIGludCBwdHdyX2RvX3BhZ2VfZmF1bHQoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVk IGxvbmcgYWRkciwKICAgICAgICAgICogZW11bGF0aW9uIGJ1Zywgb3IgYSBndWVzdCBwbGF5aW5n IHdpdGggdGhlIGluc3RydWN0aW9uIHN0cmVhbSB1bmRlcgogICAgICAgICAgKiBYZW4ncyBmZWV0 LgogICAgICAgICAgKi8KLSAgICAgICAgaWYgKCBwdHdyX2N0eHQuY3R4dC5ldmVudC50eXBlID09 IFg4Nl9FVkVOVFRZUEVfSFdfRVhDRVBUSU9OICYmCi0gICAgICAgICAgICAgcHR3cl9jdHh0LmN0 eHQuZXZlbnQudmVjdG9yID09IFRSQVBfcGFnZV9mYXVsdCApCi0gICAgICAgICAgICBwdl9pbmpl Y3RfZXZlbnQoJnB0d3JfY3R4dC5jdHh0LmV2ZW50KTsKKyAgICAgICAgaWYgKCBjdHh0LmV2ZW50 LnR5cGUgPT0gWDg2X0VWRU5UVFlQRV9IV19FWENFUFRJT04gJiYKKyAgICAgICAgICAgICBjdHh0 LmV2ZW50LnZlY3RvciA9PSBUUkFQX3BhZ2VfZmF1bHQgKQorICAgICAgICAgICAgcHZfaW5qZWN0 X2V2ZW50KCZjdHh0LmV2ZW50KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZ2RwcmludGso WEVOTE9HX1dBUk5JTkcsCiAgICAgICAgICAgICAgICAgICAgICAiVW5leHBlY3RlZCBldmVudCAo dHlwZSAldSwgdmVjdG9yICUjeCkgZnJvbSBlbXVsYXRpb25cbiIsCi0gICAgICAgICAgICAgICAg ICAgICBwdHdyX2N0eHQuY3R4dC5ldmVudC50eXBlLCBwdHdyX2N0eHQuY3R4dC5ldmVudC52ZWN0 b3IpOworICAgICAgICAgICAgICAgICAgICAgY3R4dC5ldmVudC50eXBlLCBjdHh0LmV2ZW50LnZl Y3Rvcik7CiAKICAgICAgICAgLyogRmFsbHRocm91Z2ggKi8KICAgICBjYXNlIFg4NkVNVUxfT0tB WToKIAotICAgICAgICBpZiAoIHB0d3JfY3R4dC5jdHh0LnJldGlyZS5zaW5nbGVzdGVwICkKKyAg ICAgICAgaWYgKCBjdHh0LnJldGlyZS5zaW5nbGVzdGVwICkKICAgICAgICAgICAgIHB2X2luamVj dF9od19leGNlcHRpb24oVFJBUF9kZWJ1ZywgWDg2X0VWRU5UX05PX0VDKTsKIAogICAgICAgICAv KiBGYWxsdGhyb3VnaCAqLwotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==