From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 1/3] x86/vmx: Misc cleanup to vmx_update_guest_cr() Date: Fri, 29 Sep 2017 19:31:01 +0100 Message-ID: <1506709863-12291-2-git-send-email-andrew.cooper3@citrix.com> References: <1506709863-12291-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1506709863-12291-1-git-send-email-andrew.cooper3@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 , Kevin Tian , Jun Nakajima , Jan Beulich List-Id: xen-devel@lists.xenproject.org ICogRHJvcCB0cmFpbGluZyB3aGl0ZXNwYWNlCiAqIEZpeCBpbmRlbmRhdGlvbiBhbmQgbmV3bGlu ZXMKICogVXNlIGJvb2wgd2hlcmUgYXBwcm9wcmlhdGUKCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoK U2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4K LS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBKdW4gTmFrYWppbWEg PGp1bi5uYWthamltYUBpbnRlbC5jb20+CkNDOiBLZXZpbiBUaWFuIDxrZXZpbi50aWFuQGludGVs LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYyB8IDI1ICsrKysrKysrKysrKysr Ky0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYyBiL3hlbi9hcmNo L3g4Ni9odm0vdm14L3ZteC5jCmluZGV4IDljZmE5YjYuLjYxMDQ3ZTAgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9odm0vdm14L3ZteC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdm14L3ZteC5j CkBAIC0xNTQ3LDE1ICsxNTQ3LDE2IEBAIHN0YXRpYyB2b2lkIHZteF91cGRhdGVfZ3Vlc3RfY3Io c3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGludCBjcikKIAogICAgIHN3aXRjaCAoIGNyICkKICAg ICB7Ci0gICAgY2FzZSAwOiB7Ci0gICAgICAgIGludCByZWFsbW9kZTsKKyAgICBjYXNlIDA6Cisg ICAgeworICAgICAgICBib29sIHJlYWxtb2RlOwogICAgICAgICB1bnNpZ25lZCBsb25nIGh3X2Ny MF9tYXNrID0gWDg2X0NSMF9ORTsKIAogICAgICAgICBpZiAoICF2bXhfdW5yZXN0cmljdGVkX2d1 ZXN0KHYpICkKICAgICAgICAgICAgIGh3X2NyMF9tYXNrIHw9IFg4Nl9DUjBfUEcgfCBYODZfQ1Iw X1BFOwogCiAgICAgICAgIGlmICggcGFnaW5nX21vZGVfc2hhZG93KHYtPmRvbWFpbikgKQotICAg ICAgICAgICBod19jcjBfbWFzayB8PSBYODZfQ1IwX1dQOworICAgICAgICAgICAgaHdfY3IwX21h c2sgfD0gWDg2X0NSMF9XUDsKIAogICAgICAgICBpZiAoIHBhZ2luZ19tb2RlX2hhcCh2LT5kb21h aW4pICkKICAgICAgICAgewpAQCAtMTU5MCwxMiArMTU5MSwxMiBAQCBzdGF0aWMgdm9pZCB2bXhf dXBkYXRlX2d1ZXN0X2NyKHN0cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBpbnQgY3IpCiAgICAgICAg ICAgICAgICAgdm14X2ZwdV9lbnRlcih2KTsKICAgICAgICAgfQogCi0gICAgICAgIHJlYWxtb2Rl ID0gISh2LT5hcmNoLmh2bV92Y3B1Lmd1ZXN0X2NyWzBdICYgWDg2X0NSMF9QRSk7IAorICAgICAg ICByZWFsbW9kZSA9ICEodi0+YXJjaC5odm1fdmNwdS5ndWVzdF9jclswXSAmIFg4Nl9DUjBfUEUp OwogCi0gICAgICAgIGlmICggKCF2bXhfdW5yZXN0cmljdGVkX2d1ZXN0KHYpKSAmJgorICAgICAg ICBpZiAoICF2bXhfdW5yZXN0cmljdGVkX2d1ZXN0KHYpICYmCiAgICAgICAgICAgICAgKHJlYWxt b2RlICE9IHYtPmFyY2guaHZtX3ZteC52bXhfcmVhbG1vZGUpICkKICAgICAgICAgewotICAgICAg ICAgICAgZW51bSB4ODZfc2VnbWVudCBzOyAKKyAgICAgICAgICAgIGVudW0geDg2X3NlZ21lbnQg czsKICAgICAgICAgICAgIHN0cnVjdCBzZWdtZW50X3JlZ2lzdGVyIHJlZ1t4ODZfc2VnX3RyICsg MV07CiAKICAgICAgICAgICAgIEJVSUxEX0JVR19PTih4ODZfc2VnX3RyICE9IHg4Nl9zZWdfZ3Mg KyAxKTsKQEAgLTE2MDYsMTMgKzE2MDcsMTMgQEAgc3RhdGljIHZvaWQgdm14X3VwZGF0ZV9ndWVz dF9jcihzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgaW50IGNyKQogICAgICAgICAgICAgZm9yICgg cyA9IDA7IHMgPCBBUlJBWV9TSVpFKHJlZyk7IHMrKyApCiAgICAgICAgICAgICAgICAgaHZtX2dl dF9zZWdtZW50X3JlZ2lzdGVyKHYsIHMsICZyZWdbc10pOwogICAgICAgICAgICAgdi0+YXJjaC5o dm1fdm14LnZteF9yZWFsbW9kZSA9IHJlYWxtb2RlOwotICAgICAgICAgICAgCisKICAgICAgICAg ICAgIGlmICggcmVhbG1vZGUgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGZvciAo IHMgPSAwOyBzIDwgQVJSQVlfU0laRShyZWcpOyBzKysgKQogICAgICAgICAgICAgICAgICAgICBo dm1fc2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgcywgJnJlZ1tzXSk7CiAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICBlbHNlIAorICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgIGZvciAoIHMgPSAwOyBzIDwgQVJSQVlfU0laRShyZWcpOyBzKysgKQogICAgICAg ICAgICAgICAgICAgICBpZiAoICEodi0+YXJjaC5odm1fdm14LnZtODZfc2VnbWVudF9tYXNrICYg KDE8PHMpKSApCkBAIC0xNjMxLDkgKzE2MzIsMTEgQEAgc3RhdGljIHZvaWQgdm14X3VwZGF0ZV9n dWVzdF9jcihzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgaW50IGNyKQogICAgICAgICB2bXhfdXBk YXRlX2d1ZXN0X2NyKHYsIDQpOwogICAgICAgICBicmVhazsKICAgICB9CisKICAgICBjYXNlIDI6 CiAgICAgICAgIC8qIENSMiBpcyB1cGRhdGVkIGluIGV4aXQgc3R1Yi4gKi8KICAgICAgICAgYnJl YWs7CisKICAgICBjYXNlIDM6CiAgICAgICAgIGlmICggcGFnaW5nX21vZGVfaGFwKHYtPmRvbWFp bikgKQogICAgICAgICB7CkBAIC0xNjQyLDEwICsxNjQ1LDExIEBAIHN0YXRpYyB2b2lkIHZteF91 cGRhdGVfZ3Vlc3RfY3Ioc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGludCBjcikKICAgICAgICAg ICAgICAgICAgICAgdi0+ZG9tYWluLT5hcmNoLmh2bV9kb21haW4ucGFyYW1zW0hWTV9QQVJBTV9J REVOVF9QVF07CiAgICAgICAgICAgICB2bXhfbG9hZF9wZHB0cnModik7CiAgICAgICAgIH0KLSAK KwogICAgICAgICBfX3Ztd3JpdGUoR1VFU1RfQ1IzLCB2LT5hcmNoLmh2bV92Y3B1Lmh3X2NyWzNd KTsKICAgICAgICAgaHZtX2FzaWRfZmx1c2hfdmNwdSh2KTsKICAgICAgICAgYnJlYWs7CisKICAg ICBjYXNlIDQ6CiAgICAgICAgIHYtPmFyY2guaHZtX3ZjcHUuaHdfY3JbNF0gPSBIVk1fQ1I0X0hP U1RfTUFTSzsKICAgICAgICAgaWYgKCBwYWdpbmdfbW9kZV9oYXAodi0+ZG9tYWluKSApCkBAIC0x NjU3LDcgKzE2NjEsNyBAQCBzdGF0aWMgdm9pZCB2bXhfdXBkYXRlX2d1ZXN0X2NyKHN0cnVjdCB2 Y3B1ICp2LCB1bnNpZ25lZCBpbnQgY3IpCiAgICAgICAgICAgICBudm14X3NldF9jcl9yZWFkX3No YWRvdyh2LCA0KTsKIAogICAgICAgICB2LT5hcmNoLmh2bV92Y3B1Lmh3X2NyWzRdIHw9IHYtPmFy Y2guaHZtX3ZjcHUuZ3Vlc3RfY3JbNF07Ci0gICAgICAgIGlmICggdi0+YXJjaC5odm1fdm14LnZt eF9yZWFsbW9kZSApIAorICAgICAgICBpZiAoIHYtPmFyY2guaHZtX3ZteC52bXhfcmVhbG1vZGUg KQogICAgICAgICAgICAgdi0+YXJjaC5odm1fdmNwdS5od19jcls0XSB8PSBYODZfQ1I0X1ZNRTsK ICAgICAgICAgaWYgKCBwYWdpbmdfbW9kZV9oYXAodi0+ZG9tYWluKSAmJiAhaHZtX3BhZ2luZ19l bmFibGVkKHYpICkKICAgICAgICAgewpAQCAtMTY3Niw2ICsxNjgwLDcgQEAgc3RhdGljIHZvaWQg dm14X3VwZGF0ZV9ndWVzdF9jcihzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgaW50IGNyKQogICAg ICAgICB9CiAgICAgICAgIF9fdm13cml0ZShHVUVTVF9DUjQsIHYtPmFyY2guaHZtX3ZjcHUuaHdf Y3JbNF0pOwogICAgICAgICBicmVhazsKKwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEJVRygpOwog ICAgIH0KLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==