From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 1/2] x86/mm: don't wrap x86_emulate_ctxt in ptwr_emulate_ctxt Date: Thu, 31 Aug 2017 12:22:22 +0100 Message-ID: <20170831112223.24761-2-wei.liu2@citrix.com> References: <20170831112223.24761-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 1dnNYK-0002Sy-LZ for xen-devel@lists.xenproject.org; Thu, 31 Aug 2017 11:22:28 +0000 In-Reply-To: <20170831112223.24761-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 b19yb19lbXVhbHRlX2N0eHQuIHg4Nl9lbXVsYXRlX2N0eHQgbm93IHBvaW50cyB0byBwdHdyX2Vt dWxhdGVfY3R4dAp2aWEgaXRzIGRhdGEgcG9pbnRlci4KClRoaXMgcGF0Y2ggd2lsbCBoZWxwIHVu aWZ5IG1taW9fcm8gYW5kIHB0d3IgY29kZSBwYXRocyBsYXRlci4KClNpZ25lZC1vZmYtYnk6IFdl aSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQp2MjogZG8gYXdheSB3aXRoIHBvaW50ZXIg aW4gcHR3cl9lbXVsYXRlX2N0eHQKLS0tCiB4ZW4vYXJjaC94ODYvbW0uYyB8IDQ4ICsrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDIzIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNo L3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMKaW5kZXggZjRiOTc0N2FiYS4uMzMwNjA4ODI1 NSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L21tLmMK QEAgLTQ5NjQsNyArNDk2NCw2IEBAIGxvbmcgYXJjaF9tZW1vcnlfb3AodW5zaWduZWQgbG9uZyBj bWQsIFhFTl9HVUVTVF9IQU5ETEVfUEFSQU0odm9pZCkgYXJnKQogICovCiAKIHN0cnVjdCBwdHdy X2VtdWxhdGVfY3R4dCB7Ci0gICAgc3RydWN0IHg4Nl9lbXVsYXRlX2N0eHQgY3R4dDsKICAgICB1 bnNpZ25lZCBsb25nIGNyMjsKICAgICBsMV9wZ2VudHJ5X3QgIHB0ZTsKIH07CkBAIC00OTk1LDcg KzQ5OTQsNyBAQCBzdGF0aWMgaW50IHB0d3JfZW11bGF0ZWRfdXBkYXRlKAogICAgIHBhZGRyX3Qg dmFsLAogICAgIHVuc2lnbmVkIGludCBieXRlcywKICAgICB1bnNpZ25lZCBpbnQgZG9fY21weGNo ZywKLSAgICBzdHJ1Y3QgcHR3cl9lbXVsYXRlX2N0eHQgKnB0d3JfY3R4dCkKKyAgICBzdHJ1Y3Qg eDg2X2VtdWxhdGVfY3R4dCAqY3R4dCkKIHsKICAgICB1bnNpZ25lZCBsb25nIG1mbjsKICAgICB1 bnNpZ25lZCBsb25nIHVuYWxpZ25lZF9hZGRyID0gYWRkcjsKQEAgLTUwMDMsNiArNTAwMiw3IEBA IHN0YXRpYyBpbnQgcHR3cl9lbXVsYXRlZF91cGRhdGUoCiAgICAgbDFfcGdlbnRyeV90IHB0ZSwg b2wxZSwgbmwxZSwgKnBsMWU7CiAgICAgc3RydWN0IHZjcHUgKnYgPSBjdXJyZW50OwogICAgIHN0 cnVjdCBkb21haW4gKmQgPSB2LT5kb21haW47CisgICAgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0 ICpwdHdyX2N0eHQgPSBjdHh0LT5kYXRhOwogICAgIGludCByZXQ7CiAKICAgICAvKiBPbmx5IGFs bG93IG5hdHVyYWxseS1hbGlnbmVkIHN0b3JlcyB3aXRoaW4gdGhlIG9yaWdpbmFsICVjcjIgcGFn ZS4gKi8KQEAgLTUwMjYsNyArNTAyNiw3IEBAIHN0YXRpYyBpbnQgcHR3cl9lbXVsYXRlZF91cGRh dGUoCiAgICAgICAgIHsKICAgICAgICAgICAgIHg4Nl9lbXVsX3BhZ2VmYXVsdCgwLCAvKiBSZWFk IGZhdWx0LiAqLwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFkZHIgKyBzaXplb2Yo cGFkZHJfdCkgLSByYywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmcHR3cl9jdHh0 LT5jdHh0KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdHh0KTsKICAgICAgICAg ICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKICAgICAgICAgfQogICAgICAgICAvKiBNYXNr IG91dCBiaXRzIHByb3ZpZGVkIGJ5IGNhbGxlci4gKi8KQEAgLTUxNDEsOSArNTE0MSw3IEBAIHN0 YXRpYyBpbnQgcHR3cl9lbXVsYXRlZF93cml0ZSgKIAogICAgIG1lbWNweSgmdmFsLCBwX2RhdGEs IGJ5dGVzKTsKIAotICAgIHJldHVybiBwdHdyX2VtdWxhdGVkX3VwZGF0ZSgKLSAgICAgICAgb2Zm c2V0LCAwLCB2YWwsIGJ5dGVzLCAwLAotICAgICAgICBjb250YWluZXJfb2YoY3R4dCwgc3RydWN0 IHB0d3JfZW11bGF0ZV9jdHh0LCBjdHh0KSk7CisgICAgcmV0dXJuIHB0d3JfZW11bGF0ZWRfdXBk YXRlKG9mZnNldCwgMCwgdmFsLCBieXRlcywgMCwgY3R4dCk7CiB9CiAKIHN0YXRpYyBpbnQgcHR3 cl9lbXVsYXRlZF9jbXB4Y2hnKApAQCAtNTE2Niw5ICs1MTY0LDcgQEAgc3RhdGljIGludCBwdHdy X2VtdWxhdGVkX2NtcHhjaGcoCiAgICAgbWVtY3B5KCZvbGQsIHBfb2xkLCBieXRlcyk7CiAgICAg bWVtY3B5KCZuZXcsIHBfbmV3LCBieXRlcyk7CiAKLSAgICByZXR1cm4gcHR3cl9lbXVsYXRlZF91 cGRhdGUoCi0gICAgICAgIG9mZnNldCwgb2xkLCBuZXcsIGJ5dGVzLCAxLAotICAgICAgICBjb250 YWluZXJfb2YoY3R4dCwgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0LCBjdHh0KSk7CisgICAgcmV0 dXJuIHB0d3JfZW11bGF0ZWRfdXBkYXRlKG9mZnNldCwgb2xkLCBuZXcsIGJ5dGVzLCAxLCBjdHh0 KTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCB4ODZfZW11bGF0ZV9vcHMgcHR3cl9lbXVsYXRl X29wcyA9IHsKQEAgLTUxODcsMTQgKzUxODMsMTQgQEAgaW50IHB0d3JfZG9fcGFnZV9mYXVsdChz dHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRyLAogICAgIHN0cnVjdCBkb21haW4gKmQg PSB2LT5kb21haW47CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZTsKICAgICBsMV9wZ2VudHJ5 X3QgICAgICBwdGU7Ci0gICAgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0IHB0d3JfY3R4dCA9IHsK LSAgICAgICAgLmN0eHQgPSB7Ci0gICAgICAgICAgICAucmVncyA9IHJlZ3MsCi0gICAgICAgICAg ICAudmVuZG9yID0gZC0+YXJjaC5jcHVpZC0+eDg2X3ZlbmRvciwKLSAgICAgICAgICAgIC5hZGRy X3NpemUgPSBpc19wdl8zMmJpdF9kb21haW4oZCkgPyAzMiA6IEJJVFNfUEVSX0xPTkcsCi0gICAg ICAgICAgICAuc3Bfc2l6ZSAgID0gaXNfcHZfMzJiaXRfZG9tYWluKGQpID8gMzIgOiBCSVRTX1BF Ul9MT05HLAotICAgICAgICAgICAgLmxtYSAgICAgICA9ICFpc19wdl8zMmJpdF9kb21haW4oZCks Ci0gICAgICAgIH0sCisgICAgc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0IHB0d3JfY3R4dDsKKyAg ICBzdHJ1Y3QgeDg2X2VtdWxhdGVfY3R4dCBjdHh0ID0geworICAgICAgIC5yZWdzID0gcmVncywK KyAgICAgICAudmVuZG9yID0gZC0+YXJjaC5jcHVpZC0+eDg2X3ZlbmRvciwKKyAgICAgICAuYWRk cl9zaXplID0gaXNfcHZfMzJiaXRfZG9tYWluKGQpID8gMzIgOiBCSVRTX1BFUl9MT05HLAorICAg ICAgIC5zcF9zaXplICAgPSBpc19wdl8zMmJpdF9kb21haW4oZCkgPyAzMiA6IEJJVFNfUEVSX0xP TkcsCisgICAgICAgLmxtYSAgICAgICA9ICFpc19wdl8zMmJpdF9kb21haW4oZCksCisgICAgICAg LmRhdGEgICAgICA9ICZwdHdyX2N0eHQsCiAgICAgfTsKICAgICBpbnQgcmM7CiAKQEAgLTUyMjEs MTAgKzUyMTcsMTIgQEAgaW50IHB0d3JfZG9fcGFnZV9mYXVsdChzdHJ1Y3QgdmNwdSAqdiwgdW5z aWduZWQgbG9uZyBhZGRyLAogICAgICAgICBnb3RvIGJhaWw7CiAgICAgfQogCi0gICAgcHR3cl9j dHh0LmNyMiA9IGFkZHI7Ci0gICAgcHR3cl9jdHh0LnB0ZSA9IHB0ZTsKKyAgICBwdHdyX2N0eHQg PSAoc3RydWN0IHB0d3JfZW11bGF0ZV9jdHh0KSB7CisgICAgICAgIC5jcjIgPSBhZGRyLAorICAg ICAgICAucHRlID0gcHRlLAorICAgIH07CiAKLSAgICByYyA9IHg4Nl9lbXVsYXRlKCZwdHdyX2N0 eHQuY3R4dCwgJnB0d3JfZW11bGF0ZV9vcHMpOworICAgIHJjID0geDg2X2VtdWxhdGUoJmN0eHQs ICZwdHdyX2VtdWxhdGVfb3BzKTsKIAogICAgIHBhZ2VfdW5sb2NrKHBhZ2UpOwogICAgIHB1dF9w YWdlKHBhZ2UpOwpAQCAtNTIzOSwxOCArNTIzNywxOCBAQCBpbnQgcHR3cl9kb19wYWdlX2ZhdWx0 KHN0cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCiAgICAgICAgICAqIGVtdWxhdGlv biBidWcsIG9yIGEgZ3Vlc3QgcGxheWluZyB3aXRoIHRoZSBpbnN0cnVjdGlvbiBzdHJlYW0gdW5k ZXIKICAgICAgICAgICogWGVuJ3MgZmVldC4KICAgICAgICAgICovCi0gICAgICAgIGlmICggcHR3 cl9jdHh0LmN0eHQuZXZlbnQudHlwZSA9PSBYODZfRVZFTlRUWVBFX0hXX0VYQ0VQVElPTiAmJgot ICAgICAgICAgICAgIHB0d3JfY3R4dC5jdHh0LmV2ZW50LnZlY3RvciA9PSBUUkFQX3BhZ2VfZmF1 bHQgKQotICAgICAgICAgICAgcHZfaW5qZWN0X2V2ZW50KCZwdHdyX2N0eHQuY3R4dC5ldmVudCk7 CisgICAgICAgIGlmICggY3R4dC5ldmVudC50eXBlID09IFg4Nl9FVkVOVFRZUEVfSFdfRVhDRVBU SU9OICYmCisgICAgICAgICAgICAgY3R4dC5ldmVudC52ZWN0b3IgPT0gVFJBUF9wYWdlX2ZhdWx0 ICkKKyAgICAgICAgICAgIHB2X2luamVjdF9ldmVudCgmY3R4dC5ldmVudCk7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19XQVJOSU5HLAogICAgICAgICAgICAgICAg ICAgICAgIlVuZXhwZWN0ZWQgZXZlbnQgKHR5cGUgJXUsIHZlY3RvciAlI3gpIGZyb20gZW11bGF0 aW9uXG4iLAotICAgICAgICAgICAgICAgICAgICAgcHR3cl9jdHh0LmN0eHQuZXZlbnQudHlwZSwg cHR3cl9jdHh0LmN0eHQuZXZlbnQudmVjdG9yKTsKKyAgICAgICAgICAgICAgICAgICAgIGN0eHQu ZXZlbnQudHlwZSwgY3R4dC5ldmVudC52ZWN0b3IpOwogCiAgICAgICAgIC8qIEZhbGx0aHJvdWdo ICovCiAgICAgY2FzZSBYODZFTVVMX09LQVk6CiAKLSAgICAgICAgaWYgKCBwdHdyX2N0eHQuY3R4 dC5yZXRpcmUuc2luZ2xlc3RlcCApCisgICAgICAgIGlmICggY3R4dC5yZXRpcmUuc2luZ2xlc3Rl cCApCiAgICAgICAgICAgICBwdl9pbmplY3RfaHdfZXhjZXB0aW9uKFRSQVBfZGVidWcsIFg4Nl9F VkVOVF9OT19FQyk7CiAKICAgICAgICAgLyogRmFsbHRocm91Z2ggKi8KLS0gCjIuMTEuMAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=