From: Brian Woods Subject: [PATCH 3/3] x86/svm: correct EFER.SVME intercept checks Date: Wed, 31 Jan 2018 14:35:25 -0600 Message-ID: <20180131203525.21660-4-brian.woods@amd.com> References: <20180131203525.21660-1-brian.woods@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180131203525.21660-1-brian.woods@amd.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Andrew Cooper , Boris Ostrovsky , Brian Woods , Jan Beulich , Suravee Suthikulpanit List-Id: xen-devel@lists.xenproject.org Q29ycmVjdHMgc29tZSBFRkVSLlNWTUUgY2hlY2tzIGluIGludGVyY2VwdHMuICBTZWUgQU1EIEFQ TSB2b2wyIHNlY3Rpb24KMTUuNCBmb3IgbW9yZSBkZXRhaWxzLiAgVk1NQ0FMTCBpc24ndCBjaGVj a2VkIGR1ZSB0byBndWVzdHMgbmVlZGluZyBpdAp0byBib290LgoKUmVwb3J0ZWQtYnk6IEFuZHJl dyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+ClNpZ25lZC1vZmYtYnk6IEJyaWFu IFdvb2RzIDxicmlhbi53b29kc0BhbWQuY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9odm0vc3ZtL25l c3RlZHN2bS5jIHwgMTAgKysrKysrKystLQogeGVuL2FyY2gveDg2L2h2bS9zdm0vc3ZtLmMgICAg ICAgfCAgOCArKysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vc3ZtL25lc3RlZHN2bS5j IGIveGVuL2FyY2gveDg2L2h2bS9zdm0vbmVzdGVkc3ZtLmMKaW5kZXggMWY3YjBkM2U4OC4uMWY1 OTgxZmMxOCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS9zdm0vbmVzdGVkc3ZtLmMKKysr IGIveGVuL2FyY2gveDg2L2h2bS9zdm0vbmVzdGVkc3ZtLmMKQEAgLTE2MjAsNyArMTYyMCwxMiBA QCB2b2lkIHN2bV92bWV4aXRfZG9fc3RnaShzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncywgc3Ry dWN0IHZjcHUgKnYpCiB7CiAgICAgdW5zaWduZWQgaW50IGluc3RfbGVuOwogCi0gICAgaWYgKCAh bmVzdGVkaHZtX2VuYWJsZWQodi0+ZG9tYWluKSApIHsKKyAgICAvKgorICAgICAqIFNUR0kgZG9l c24ndCByZXF1aXJlIFNWTUUgdG8gYmUgc2V0IHRvIGJlIHVzZWQuICBTZWUgQU1EIEFQTSB2b2wK KyAgICAgKiAyIHNlY3Rpb24gMTUuNCBmb3IgZGV0YWlscy4KKyAgICAgKi8KKyAgICBpZiAoICFu ZXN0ZWRodm1fZW5hYmxlZCh2LT5kb21haW4pICkKKyAgICB7CiAgICAgICAgIGh2bV9pbmplY3Rf aHdfZXhjZXB0aW9uKFRSQVBfaW52YWxpZF9vcCwgWDg2X0VWRU5UX05PX0VDKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KQEAgLTE2NDAsNyArMTY0NSw4IEBAIHZvaWQgc3ZtX3ZtZXhpdF9kb19j bGdpKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzLCBzdHJ1Y3QgdmNwdSAqdikKICAgICB1aW50 MzJfdCBnZW5lcmFsMV9pbnRlcmNlcHRzID0gdm1jYl9nZXRfZ2VuZXJhbDFfaW50ZXJjZXB0cyh2 bWNiKTsKICAgICB2aW50cl90IGludHI7CiAKLSAgICBpZiAoICFuZXN0ZWRodm1fZW5hYmxlZCh2 LT5kb21haW4pICkgeworICAgIGlmICggIW5zdm1fZWZlcl9zdm1fZW5hYmxlZCh2KSApCisgICAg ewogICAgICAgICBodm1faW5qZWN0X2h3X2V4Y2VwdGlvbihUUkFQX2ludmFsaWRfb3AsIFg4Nl9F VkVOVF9OT19FQyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvaHZtL3N2bS9zdm0uYyBiL3hlbi9hcmNoL3g4Ni9odm0vc3ZtL3N2bS5jCmluZGV4IDc4 NjRlZTM5YWUuLjI1OTlmMDJhYjYgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vc3ZtL3N2 bS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vc3ZtL3N2bS5jCkBAIC0yMjU1LDcgKzIyNTUsNiBA QCBzdm1fdm1leGl0X2RvX3ZtcnVuKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzLAogewogICAg IGlmICggIW5zdm1fZWZlcl9zdm1fZW5hYmxlZCh2KSApCiAgICAgewotICAgICAgICBnZHByaW50 ayhYRU5MT0dfRVJSLCAiVk1SVU46IG5lc3RlZGh2bSBkaXNhYmxlZCwgaW5qZWN0aW5nICNVRFxu Iik7CiAgICAgICAgIGh2bV9pbmplY3RfaHdfZXhjZXB0aW9uKFRSQVBfaW52YWxpZF9vcCwgWDg2 X0VWRU5UX05PX0VDKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIzMTAsNyArMjMwOSw2 IEBAIHN2bV92bWV4aXRfZG9fdm1sb2FkKHN0cnVjdCB2bWNiX3N0cnVjdCAqdm1jYiwKIAogICAg IGlmICggIW5zdm1fZWZlcl9zdm1fZW5hYmxlZCh2KSApIAogICAgIHsKLSAgICAgICAgZ2Rwcmlu dGsoWEVOTE9HX0VSUiwgIlZNTE9BRDogbmVzdGVkaHZtIGRpc2FibGVkLCBpbmplY3RpbmcgI1VE XG4iKTsKICAgICAgICAgaHZtX2luamVjdF9od19leGNlcHRpb24oVFJBUF9pbnZhbGlkX29wLCBY ODZfRVZFTlRfTk9fRUMpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjM0Niw3ICsyMzQ0 LDYgQEAgc3ZtX3ZtZXhpdF9kb192bXNhdmUoc3RydWN0IHZtY2Jfc3RydWN0ICp2bWNiLAogCiAg ICAgaWYgKCAhbnN2bV9lZmVyX3N2bV9lbmFibGVkKHYpICkgCiAgICAgewotICAgICAgICBnZHBy aW50ayhYRU5MT0dfRVJSLCAiVk1TQVZFOiBuZXN0ZWRodm0gZGlzYWJsZWQsIGluamVjdGluZyAj VURcbiIpOwogICAgICAgICBodm1faW5qZWN0X2h3X2V4Y2VwdGlvbihUUkFQX2ludmFsaWRfb3As IFg4Nl9FVkVOVF9OT19FQyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yODIwLDYgKzI4 MTcsMTEgQEAgdm9pZCBzdm1fdm1leGl0X2hhbmRsZXIoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJl Z3MpCiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBWTUVYSVRfSU5WTFBHQToKKyAgICAgICAg aWYgKCAhbnN2bV9lZmVyX3N2bV9lbmFibGVkKHYpICkKKyAgICAgICAgeworICAgICAgICAgICAg aHZtX2luamVjdF9od19leGNlcHRpb24oVFJBUF9pbnZhbGlkX29wLCBYODZfRVZFTlRfTk9fRUMp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAgaWYgKCAoaW5zdF9sZW4g PSBfX2dldF9pbnN0cnVjdGlvbl9sZW5ndGgodiwgSU5TVFJfSU5WTFBHQSkpID09IDAgKQogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIHN2bV9pbnZscGdhX2ludGVyY2VwdCh2LCByZWdzLT5y YXgsIHJlZ3MtPmVjeCk7Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0 cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8veGVuLWRldmVs