From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH 2/7] x86/viridian: fix xen-hvmcrash when vp_assist page is present Date: Fri, 17 Mar 2017 09:57:08 +0000 Message-ID: <1489744633-28760-3-git-send-email-paul.durrant@citrix.com> References: <1489744633-28760-1-git-send-email-paul.durrant@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 1coodK-0000TF-Dc for xen-devel@lists.xenproject.org; Fri, 17 Mar 2017 09:57:18 +0000 In-Reply-To: <1489744633-28760-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org Q3VycmVudGx5IHVzZSBvZiB4ZW4taHZtY3Jhc2ggd2lsbCBjYXVzZSBhbiBpbW1lZGlhdGUgZG9t YWluX2NyYXNoKCkgaW4KaW5pdGlhbGl6ZV92cF9hc3Npc3QoKSBiZWNhdXNlIGl0IGlzIGNhbGxl ZCBmcm9tIHZpcmlkaWFuX2xvYWRfdmNwdV9jdHh0KCkKd2l0aG91dCBoYXZpbmcgZmlyc3QgY2xl YXJlZCBhbnkgcHJldmlvdXMgbWFwcGluZy4KClRoaXMgcGF0Y2ggbWFrZXMgaW5pdGlhbGl6ZV92 cF9hc3Npc3QoKSByZXNwb25zaWJsZSBmb3IgY2xlYXJpbmcgcHJldmlvdXMKbWFwcGluZ3MsIGlm IG5lY2Vzc2FyeS4KClNpZ25lZC1vZmYtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNp dHJpeC5jb20+Ci0tLQpDYzogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDYzogQW5k cmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYv aHZtL3ZpcmlkaWFuLmMgICAgICAgIHwgNTAgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmggfCAgMSArCiAyIGZp bGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4uYyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRp YW4uYwppbmRleCBkNzQxZTgxLi41OWQ3NmQ1IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZt L3ZpcmlkaWFuLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi5jCkBAIC0yNzYsNiAr Mjc2LDIyIEBAIHN0YXRpYyB2b2lkIGVuYWJsZV9oeXBlcmNhbGxfcGFnZShzdHJ1Y3QgZG9tYWlu ICpkKQogICAgIHB1dF9wYWdlX2FuZF90eXBlKHBhZ2UpOwogfQogCitzdGF0aWMgdm9pZCB0ZWFy ZG93bl92cF9hc3Npc3Qoc3RydWN0IHZjcHUgKnYpCit7CisgICAgdm9pZCAqdmEgPSB2LT5hcmNo Lmh2bV92Y3B1LnZpcmlkaWFuLnZwX2Fzc2lzdC52YTsKKyAgICBzdHJ1Y3QgcGFnZV9pbmZvICpw YWdlOworCisgICAgaWYgKCAhdmEgKQorICAgICAgICByZXR1cm47CisKKyAgICB2LT5hcmNoLmh2 bV92Y3B1LnZpcmlkaWFuLnZwX2Fzc2lzdC52YSA9IE5VTEw7CisKKyAgICBwYWdlID0gbWZuX3Rv X3BhZ2UoZG9tYWluX3BhZ2VfbWFwX3RvX21mbih2YSkpOworCisgICAgdW5tYXBfZG9tYWluX3Bh Z2VfZ2xvYmFsKHZhKTsKKyAgICBwdXRfcGFnZV9hbmRfdHlwZShwYWdlKTsKK30KKwogc3RhdGlj IHZvaWQgaW5pdGlhbGl6ZV92cF9hc3Npc3Qoc3RydWN0IHZjcHUgKnYpCiB7CiAgICAgc3RydWN0 IGRvbWFpbiAqZCA9IHYtPmRvbWFpbjsKQEAgLTI4OCw2ICszMDQsMTQgQEAgc3RhdGljIHZvaWQg aW5pdGlhbGl6ZV92cF9hc3Npc3Qoc3RydWN0IHZjcHUgKnYpCiAgICAgICogZW5saWdodGVubWVu dC4KICAgICAgKi8KIAorICAgIGlmICggdi0+YXJjaC5odm1fdmNwdS52aXJpZGlhbi52cF9hc3Np c3QudmEgKQorICAgIHsKKyAgICAgICAgaWYgKCB2LT5hcmNoLmh2bV92Y3B1LnZpcmlkaWFuLnZw X2Fzc2lzdC5nbWZuID09IGdtZm4gKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRl YXJkb3duX3ZwX2Fzc2lzdCh2KTsKKyAgICB9CisKICAgICBpZiAoICFwYWdlICkKICAgICAgICAg Z290byBmYWlsOwogCkBAIC0zMDYsMTUgKzMzMCw4IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVf dnBfYXNzaXN0KHN0cnVjdCB2Y3B1ICp2KQogCiAgICAgY2xlYXJfcGFnZSh2YSk7CiAKLSAgICAv KgotICAgICAqIElmIHdlIG92ZXJ3cml0ZSBhbiBleGlzdGluZyBhZGRyZXNzIGhlcmUgdGhlbiBz b21ldGhpbmcgaGFzCi0gICAgICogZ29uZSB3cm9uZyBhbmQgYSBkb21haW4gcGFnZSB3aWxsIGxl YWsuIEluc3RlYWQgY3Jhc2ggdGhlCi0gICAgICogZG9tYWluIHRvIG1ha2UgdGhlIHByb2JsZW0g b2J2aW91cy4KLSAgICAgKi8KLSAgICBpZiAoIHYtPmFyY2guaHZtX3ZjcHUudmlyaWRpYW4udnBf YXNzaXN0LnZhICkKLSAgICAgICAgZG9tYWluX2NyYXNoKGQpOwotCiAgICAgdi0+YXJjaC5odm1f dmNwdS52aXJpZGlhbi52cF9hc3Npc3QudmEgPSB2YTsKKyAgICB2LT5hcmNoLmh2bV92Y3B1LnZp cmlkaWFuLnZwX2Fzc2lzdC5nbWZuID0gZ21mbjsKICAgICByZXR1cm47CiAKICBmYWlsOgpAQCAt MzIyLDIyICszMzksNiBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplX3ZwX2Fzc2lzdChzdHJ1Y3Qg dmNwdSAqdikKICAgICAgICAgICAgICBwYWdlID8gcGFnZV90b19tZm4ocGFnZSkgOiBtZm5feChJ TlZBTElEX01GTikpOwogfQogCi1zdGF0aWMgdm9pZCB0ZWFyZG93bl92cF9hc3Npc3Qoc3RydWN0 IHZjcHUgKnYpCi17Ci0gICAgdm9pZCAqdmEgPSB2LT5hcmNoLmh2bV92Y3B1LnZpcmlkaWFuLnZw X2Fzc2lzdC52YTsKLSAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlOwotCi0gICAgaWYgKCAhdmEg KQotICAgICAgICByZXR1cm47Ci0KLSAgICB2LT5hcmNoLmh2bV92Y3B1LnZpcmlkaWFuLnZwX2Fz c2lzdC52YSA9IE5VTEw7Ci0KLSAgICBwYWdlID0gbWZuX3RvX3BhZ2UoZG9tYWluX3BhZ2VfbWFw X3RvX21mbih2YSkpOwotCi0gICAgdW5tYXBfZG9tYWluX3BhZ2VfZ2xvYmFsKHZhKTsKLSAgICBw dXRfcGFnZV9hbmRfdHlwZShwYWdlKTsKLX0KLQogdm9pZCB2aXJpZGlhbl9zdGFydF9hcGljX2Fz c2lzdChzdHJ1Y3QgdmNwdSAqdiwgaW50IHZlY3RvcikKIHsKICAgICB1aW50MzJfdCAqdmEgPSB2 LT5hcmNoLmh2bV92Y3B1LnZpcmlkaWFuLnZwX2Fzc2lzdC52YTsKQEAgLTUxMyw3ICs1MTQsNiBA QCBpbnQgd3Jtc3JfdmlyaWRpYW5fcmVncyh1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKIAog ICAgIGNhc2UgSFZfWDY0X01TUl9WUF9BU1NJU1RfUEFHRToKICAgICAgICAgcGVyZmNfaW5jciht c2h2X3dybXNyX2FwaWNfbXNyKTsKLSAgICAgICAgdGVhcmRvd25fdnBfYXNzaXN0KHYpOyAvKiBy ZWxlYXNlIGFueSBwcmV2aW91cyBtYXBwaW5nICovCiAgICAgICAgIHYtPmFyY2guaHZtX3ZjcHUu dmlyaWRpYW4udnBfYXNzaXN0Lm1zci5yYXcgPSB2YWw7CiAgICAgICAgIGR1bXBfdnBfYXNzaXN0 KHYpOwogICAgICAgICBpZiAoIHYtPmFyY2guaHZtX3ZjcHUudmlyaWRpYW4udnBfYXNzaXN0Lm1z ci5maWVsZHMuZW5hYmxlZCApCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92 aXJpZGlhbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmlyaWRpYW4uaAppbmRleCAyNzFj MzZkLi4xOGYxZjFhIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92aXJpZGlh bi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmgKQEAgLTIzLDYgKzIz LDcgQEAgc3RydWN0IHZpcmlkaWFuX3ZjcHUKIHsKICAgICBzdHJ1Y3QgewogICAgICAgICB1bmlv biB2aXJpZGlhbl92cF9hc3Npc3QgbXNyOworICAgICAgICB1bnNpZ25lZCBsb25nIGdtZm47CiAg ICAgICAgIHZvaWQgKnZhOwogICAgICAgICBpbnQgdmVjdG9yOwogICAgIH0gdnBfYXNzaXN0Owot LSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8v bGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK