From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 1/6] x86/msr: Clean up the MSR_EFER constants Date: Tue, 26 Jun 2018 14:18:13 +0100 Message-ID: <1530019098-7058-2-git-send-email-andrew.cooper3@citrix.com> References: <1530019098-7058-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: <1530019098-7058-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org VGhlIGJpdCBwb3NpdGlvbiBjb25zdGFudHMgYXJlIG9ubHkgdXNlZCBieSB0aGUgdHJhbXBvbGlu ZSBhc20sIGJ1dCB0aGUKY29kZSBpcyBzaG9ydGVyIGFuZCBjbGVhcmVyIHdoZW4gdXNpbmcgdGhl IG1hc2sgY29uc3RhbnRzLiAgVGhpcyBoYWx2ZXMKdGhlIG51bWJlciBvZiBjb25zdGFudHMgdXNl ZC4KCkNvbnNpc3RlbnRseSB1c2UgX0FDKCkgZm9yIHRoZSBiaXQgY29uc3RhbnRzLCBhbmQgc3Rh cnQgdG8gdXNlIHNwYWNlcwpmb3IgaW5kZW50YXRpb24uICBGdXJ0aGVybW9yZSwgRUZFUiBjb250 YWlucyB0aGUgTlgtRW5hYmxlIGJpdCwgdG8KcmVuYW1lIHRoZSBjb25zdGFudCB0byBFRkVSX05Y RSB0byBtYXRjaCBib3RoIHRoZSBBTUQgYW5kIEludGVsIHNwZWNzLgoKU2lnbmVkLW9mZi1ieTog QW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1 bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29t PgpDQzogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+Ci0tLQogeGVuL2Fy Y2gveDg2L2Jvb3QvdHJhbXBvbGluZS5TICB8ICAyICstCiB4ZW4vYXJjaC94ODYvYm9vdC93YWtl dXAuUyAgICAgIHwgIDcgKysrLS0tLQogeGVuL2FyY2gveDg2L2NwdS9pbnRlbC5jICAgICAgICB8 ICAyICstCiB4ZW4vYXJjaC94ODYvZWZpL2VmaS1ib290LmggICAgIHwgIDIgKy0KIHhlbi9hcmNo L3g4Ni9odm0vaHZtLmMgICAgICAgICAgfCAgNCArKy0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L2h2 bS9odm0uaCAgIHwgIDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvbXNyLWluZGV4LmggfCAzMyAr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDcgZmlsZXMgY2hhbmdlZCwgMjEgaW5z ZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2Jv b3QvdHJhbXBvbGluZS5TIGIveGVuL2FyY2gveDg2L2Jvb3QvdHJhbXBvbGluZS5TCmluZGV4IDU1 ODhjNzkuLjdlNzdlNjFlIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvYm9vdC90cmFtcG9saW5l LlMKKysrIGIveGVuL2FyY2gveDg2L2Jvb3QvdHJhbXBvbGluZS5TCkBAIC0xMzgsNyArMTM4LDcg QEAgdHJhbXBvbGluZV9wcm90bW9kZV9lbnRyeToKICAgICAgICAgb3IgICAgICAkRUZFUl9MTUV8 RUZFUl9TQ0UsJWVheCAgIC8qIExvbmcgTW9kZSArIFNZU0NBTEwvU1lTUkVUICovCiAgICAgICAg IGJ0ICAgICAgJGNwdWZlYXRfYml0KFg4Nl9GRUFUVVJFX05YKSwlZWRpIC8qIE5vIEV4ZWN1dGU/ ICovCiAgICAgICAgIGpuYyAgICAgMWYKLSAgICAgICAgYnRzbCAgICAkX0VGRVJfTlgsJWVheCAg LyogTm8gRXhlY3V0ZSAgICAgKi8KKyAgICAgICAgb3IgICAgICAkRUZFUl9OWEUsICVlYXggLyog Tm8gRXhlY3V0ZSAqLwogMTogICAgICB3cm1zcgogCiAgICAgICAgIG1vdiAgICAgJChYODZfQ1Iw X1BHIHwgWDg2X0NSMF9BTSB8IFg4Nl9DUjBfV1AgfCBYODZfQ1IwX05FIHxcCmRpZmYgLS1naXQg YS94ZW4vYXJjaC94ODYvYm9vdC93YWtldXAuUyBiL3hlbi9hcmNoL3g4Ni9ib290L3dha2V1cC5T CmluZGV4IGY5NjMyZWUuLmEzNzY4MGIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9ib290L3dh a2V1cC5TCisrKyBiL3hlbi9hcmNoL3g4Ni9ib290L3dha2V1cC5TCkBAIC0xNDQsMTEgKzE0NCwx MCBAQCB3YWtldXBfMzI6CiAgICAgICAgIGp6ICAgICAgLkxza2lwX2VmZXJ3CiAgICAgICAgIG1v dmwgICAgJE1TUl9FRkVSLCVlY3gKICAgICAgICAgcmRtc3IKLSAgICAgICAgYnRzbCAgICAkX0VG RVJfTE1FLCVlYXggLyogTG9uZyBNb2RlICAgICAgKi8KLSAgICAgICAgYnRzbCAgICAkX0VGRVJf U0NFLCVlYXggLyogU1lTQ0FMTC9TWVNSRVQgKi8KLSAgICAgICAgYnRsICAgICAkMjAsJWVkaSAg ICAgICAgLyogTm8gRXhlY3V0ZT8gICAgKi8KKyAgICAgICAgb3IgICAgICAkRUZFUl9MTUUgfCBF RkVSX1NDRSwgJWVheCAvKiBMb25nIE1vZGUgKyBTWVNDQUxML1NZU1JFVCAqLworICAgICAgICBi dCAgICAgICRjcHVmZWF0X2JpdChYODZfRkVBVFVSRV9OWCksICVlZGkgLyogTm8gRXhlY3V0ZT8g Ki8KICAgICAgICAgam5jICAgICAxZgotICAgICAgICBidHNsICAgICRfRUZFUl9OWCwlZWF4ICAv KiBObyBFeGVjdXRlICAgICAqLworICAgICAgICBvciAgICAgICRFRkVSX05YRSwgJWVheCAgLyog Tm8gRXhlY3V0ZSAqLwogMTogICAgICB3cm1zcgogLkxza2lwX2VmZXJ3OgogCmRpZmYgLS1naXQg YS94ZW4vYXJjaC94ODYvY3B1L2ludGVsLmMgYi94ZW4vYXJjaC94ODYvY3B1L2ludGVsLmMKaW5k ZXggOTQ3Nzk2NS4uZjNiMDRmZSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2NwdS9pbnRlbC5j CisrKyBiL3hlbi9hcmNoL3g4Ni9jcHUvaW50ZWwuYwpAQCAtMjQ3LDcgKzI0Nyw3IEBAIHN0YXRp YyB2b2lkIGVhcmx5X2luaXRfaW50ZWwoc3RydWN0IGNwdWluZm9feDg2ICpjKQogCQlwcmludGso S0VSTl9JTkZPICJyZXZpc2VkIGNwdWlkIGxldmVsOiAlZFxuIiwKIAkJICAgICAgIGNwdWlkX2Vh eCgwKSk7CiAJaWYgKGRpc2FibGUgJiBNU1JfSUEzMl9NSVNDX0VOQUJMRV9YRF9ESVNBQkxFKSB7 Ci0JCXdyaXRlX2VmZXIocmVhZF9lZmVyKCkgfCBFRkVSX05YKTsKKwkJd3JpdGVfZWZlcihyZWFk X2VmZXIoKSB8IEVGRVJfTlhFKTsKIAkJcHJpbnRrKEtFUk5fSU5GTwogCQkgICAgICAgInJlLWVu YWJsZWQgTlggKEV4ZWN1dGUgRGlzYWJsZSkgcHJvdGVjdGlvblxuIik7CiAJfQpkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L2VmaS9lZmktYm9vdC5oIGIveGVuL2FyY2gveDg2L2VmaS9lZmktYm9v dC5oCmluZGV4IDU3ODlkMmMuLjA5YmIzZjQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9lZmkv ZWZpLWJvb3QuaAorKysgYi94ZW4vYXJjaC94ODYvZWZpL2VmaS1ib290LmgKQEAgLTIzOSw3ICsy MzksNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgbm9yZXR1cm4gZWZpX2FyY2hfcG9zdF9leGl0X2Jv b3Qodm9pZCkKICAgICByZG1zcmwoTVNSX0VGRVIsIGVmZXIpOwogICAgIGVmZXIgfD0gRUZFUl9T Q0U7CiAgICAgaWYgKCBjcHVpZF9leHRfZmVhdHVyZXMgJiBjcHVmZWF0X21hc2soWDg2X0ZFQVRV UkVfTlgpICkKLSAgICAgICAgZWZlciB8PSBFRkVSX05YOworICAgICAgICBlZmVyIHw9IEVGRVJf TlhFOwogICAgIHdybXNybChNU1JfRUZFUiwgZWZlcik7CiAgICAgd3JpdGVfY3IwKFg4Nl9DUjBf UEUgfCBYODZfQ1IwX01QIHwgWDg2X0NSMF9FVCB8IFg4Nl9DUjBfTkUgfCBYODZfQ1IwX1dQIHwK ICAgICAgICAgICAgICAgWDg2X0NSMF9BTSB8IFg4Nl9DUjBfUEcpOwpkaWZmIC0tZ2l0IGEveGVu L2FyY2gveDg2L2h2bS9odm0uYyBiL3hlbi9hcmNoL3g4Ni9odm0vaHZtLmMKaW5kZXggYzIzOTgz Yy4uNGUyNDdkMCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS9odm0uYworKysgYi94ZW4v YXJjaC94ODYvaHZtL2h2bS5jCkBAIC05MTYsOCArOTE2LDggQEAgY29uc3QgY2hhciAqaHZtX2Vm ZXJfdmFsaWQoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQ2NF90IHZhbHVlLAogICAgIGlmICgg KHZhbHVlICYgRUZFUl9MTUEpICYmICghKHZhbHVlICYgRUZFUl9MTUUpIHx8ICFjcjBfcGcpICkK ICAgICAgICAgcmV0dXJuICJMTUEvTE1FL0NSMC5QRyBpbmNvbnNpc3RlbmN5IjsKIAotICAgIGlm ICggKHZhbHVlICYgRUZFUl9OWCkgJiYgIXAtPmV4dGQubnggKQotICAgICAgICByZXR1cm4gIk5Y IHdpdGhvdXQgZmVhdHVyZSI7CisgICAgaWYgKCAodmFsdWUgJiBFRkVSX05YRSkgJiYgIXAtPmV4 dGQubnggKQorICAgICAgICByZXR1cm4gIk5YRSB3aXRob3V0IGZlYXR1cmUiOwogCiAgICAgaWYg KCAodmFsdWUgJiBFRkVSX1NWTUUpICYmICghcC0+ZXh0ZC5zdm0gfHwgIW5lc3RlZGh2bV9lbmFi bGVkKGQpKSApCiAgICAgICAgIHJldHVybiAiU1ZNRSB3aXRob3V0IG5lc3RlZCB2aXJ0IjsKZGlm ZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2h2bS5oIGIveGVuL2luY2x1ZGUvYXNt LXg4Ni9odm0vaHZtLmgKaW5kZXggZWY1ZTE5OC4uYzk1MTFjMyAxMDA2NDQKLS0tIGEveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZt LmgKQEAgLTI5OSw3ICsyOTksNyBAQCBpbnQgaHZtX2dpcnFfZGVzdF8yX3ZjcHVfaWQoc3RydWN0 IGRvbWFpbiAqZCwgdWludDhfdCBkZXN0LCB1aW50OF90IGRlc3RfbW9kZSk7CiAvKiBIVk0gZ3Vl c3RzIG9uIEludGVsIGhhcmR3YXJlIGxlYWsgWGVuJ3MgTlggc2V0dGluZ3MgaW50byBndWVzdCBj b250ZXh0LiAqLwogI2RlZmluZSBodm1fbnhfZW5hYmxlZCh2KSBcCiAgICAgKChib290X2NwdV9k YXRhLng4Nl92ZW5kb3IgPT0gWDg2X1ZFTkRPUl9JTlRFTCAmJiBjcHVfaGFzX254KSB8fCAgICBc Ci0gICAgICgodiktPmFyY2guaHZtX3ZjcHUuZ3Vlc3RfZWZlciAmIEVGRVJfTlgpKQorICAgICAo KHYpLT5hcmNoLmh2bV92Y3B1Lmd1ZXN0X2VmZXIgJiBFRkVSX05YRSkpCiAjZGVmaW5lIGh2bV9w a3VfZW5hYmxlZCh2KSBcCiAgICAgKGh2bV9wYWdpbmdfZW5hYmxlZCh2KSAmJiAoKHYpLT5hcmNo Lmh2bV92Y3B1Lmd1ZXN0X2NyWzRdICYgWDg2X0NSNF9QS0UpKQogCmRpZmYgLS1naXQgYS94ZW4v aW5jbHVkZS9hc20teDg2L21zci1pbmRleC5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9tc3ItaW5k ZXguaAppbmRleCA4ZmJjY2M4Li4xYjEwZjNlIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20t eDg2L21zci1pbmRleC5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvbXNyLWluZGV4LmgKQEAg LTQsNyArNCw2IEBACiAvKiBDUFUgbW9kZWwgc3BlY2lmaWMgcmVnaXN0ZXIgKE1TUikgbnVtYmVy cyAqLwogCiAvKiB4ODYtNjQgc3BlY2lmaWMgTVNScyAqLwotI2RlZmluZSBNU1JfRUZFUgkJMHhj MDAwMDA4MCAvKiBleHRlbmRlZCBmZWF0dXJlIHJlZ2lzdGVyICovCiAjZGVmaW5lIE1TUl9TVEFS CQkweGMwMDAwMDgxIC8qIGxlZ2FjeSBtb2RlIFNZU0NBTEwgdGFyZ2V0ICovCiAjZGVmaW5lIE1T Ul9MU1RBUgkJMHhjMDAwMDA4MiAvKiBsb25nIG1vZGUgU1lTQ0FMTCB0YXJnZXQgKi8KICNkZWZp bmUgTVNSX0NTVEFSCQkweGMwMDAwMDgzIC8qIGNvbXBhdCBtb2RlIFNZU0NBTEwgdGFyZ2V0ICov CkBAIC0xNCwyNiArMTMsNiBAQAogI2RlZmluZSBNU1JfU0hBRE9XX0dTX0JBU0UJMHhjMDAwMDEw MiAvKiBTd2FwR1MgR1Mgc2hhZG93ICovCiAjZGVmaW5lIE1TUl9UU0NfQVVYCQkweGMwMDAwMTAz IC8qIEF1eGlsaWFyeSBUU0MgKi8KIAotLyogRUZFUiBiaXRzOiAqLwotI2RlZmluZSBfRUZFUl9T Q0UJCTAgIC8qIFNZU0NBTEwvU1lTUkVUICovCi0jZGVmaW5lIF9FRkVSX0xNRQkJOCAgLyogTG9u ZyBtb2RlIGVuYWJsZSAqLwotI2RlZmluZSBfRUZFUl9MTUEJCTEwIC8qIExvbmcgbW9kZSBhY3Rp dmUgKHJlYWQtb25seSkgKi8KLSNkZWZpbmUgX0VGRVJfTlgJCTExIC8qIE5vIGV4ZWN1dGUgZW5h YmxlICovCi0jZGVmaW5lIF9FRkVSX1NWTUUJCTEyIC8qIEFNRDogU1ZNIGVuYWJsZSAqLwotI2Rl ZmluZSBfRUZFUl9MTVNMRQkJMTMgLyogQU1EOiBMb25nLW1vZGUgc2VnbWVudCBsaW1pdCBlbmFi bGUgKi8KLSNkZWZpbmUgX0VGRVJfRkZYU0UJCTE0IC8qIEFNRDogRmFzdCBGWFNBVkUvRlhSU1RP UiBlbmFibGUgKi8KLQotI2RlZmluZSBFRkVSX1NDRQkJKDE8PF9FRkVSX1NDRSkKLSNkZWZpbmUg RUZFUl9MTUUJCSgxPDxfRUZFUl9MTUUpCi0jZGVmaW5lIEVGRVJfTE1BCQkoMTw8X0VGRVJfTE1B KQotI2RlZmluZSBFRkVSX05YCQkJKDE8PF9FRkVSX05YKQotI2RlZmluZSBFRkVSX1NWTUUJCSgx PDxfRUZFUl9TVk1FKQotI2RlZmluZSBFRkVSX0xNU0xFCQkoMTw8X0VGRVJfTE1TTEUpCi0jZGVm aW5lIEVGRVJfRkZYU0UJCSgxPDxfRUZFUl9GRlhTRSkKLQotI2RlZmluZSBFRkVSX0tOT1dOX01B U0sJCShFRkVSX1NDRSB8IEVGRVJfTE1FIHwgRUZFUl9MTUEgfCBFRkVSX05YIHwgXAotCQkJCSBF RkVSX1NWTUUgfCBFRkVSX0xNU0xFIHwgRUZFUl9GRlhTRSkKLQogLyogU3BlY3VsYXRpb24gQ29u dHJvbHMuICovCiAjZGVmaW5lIE1TUl9TUEVDX0NUUkwJCQkweDAwMDAwMDQ4CiAjZGVmaW5lIFNQ RUNfQ1RSTF9JQlJTCQkJKF9BQygxLCBVTEwpIDw8IDApCkBAIC00OSw2ICsyOCwxOCBAQAogI2Rl ZmluZSBBUkNIX0NBUFNfUlNCQQkJCShfQUMoMSwgVUxMKSA8PCAyKQogI2RlZmluZSBBUkNIX0NB UFNfU1NCX05PCQkoX0FDKDEsIFVMTCkgPDwgNCkKIAorI2RlZmluZSBNU1JfRUZFUiAgICAgICAg ICAgICAgICAgICAgICAgIDB4YzAwMDAwODAgLyogRXh0ZW5kZWQgRmVhdHVyZSBFbmFibGUgUmVn aXN0ZXIgKi8KKyNkZWZpbmUgRUZFUl9TQ0UgICAgICAgICAgICAgICAgICAgICAgICAoX0FDKDEs IFVMTCkgPDwgIDApIC8qIFNZU0NBTEwgRW5hYmxlICovCisjZGVmaW5lIEVGRVJfTE1FICAgICAg ICAgICAgICAgICAgICAgICAgKF9BQygxLCBVTEwpIDw8ICA4KSAvKiBMb25nIE1vZGUgRW5hYmxl ICovCisjZGVmaW5lIEVGRVJfTE1BICAgICAgICAgICAgICAgICAgICAgICAgKF9BQygxLCBVTEwp IDw8IDEwKSAvKiBMb25nIE1vZGUgQWN0aXZlICovCisjZGVmaW5lIEVGRVJfTlhFICAgICAgICAg ICAgICAgICAgICAgICAgKF9BQygxLCBVTEwpIDw8IDExKSAvKiBObyBFeGVjdXRlIEVuYWJsZSAq LworI2RlZmluZSBFRkVSX1NWTUUgICAgICAgICAgICAgICAgICAgICAgIChfQUMoMSwgVUxMKSA8 PCAxMikgLyogU2VjdXJlIFZpcnR1YWwgTWFjaGluZSBFbmFibGUgKi8KKyNkZWZpbmUgRUZFUl9M TVNMRSAgICAgICAgICAgICAgICAgICAgICAoX0FDKDEsIFVMTCkgPDwgMTMpIC8qIExvbmcgTW9k ZSBTZWdtZW50IExpbWl0IEVuYWJsZSAqLworI2RlZmluZSBFRkVSX0ZGWFNFICAgICAgICAgICAg ICAgICAgICAgIChfQUMoMSwgVUxMKSA8PCAxNCkgLyogRmFzdCBGWFNBVkUvRlhSU1RPUiAqLwor CisjZGVmaW5lIEVGRVJfS05PV05fTUFTSyAoRUZFUl9TQ0UgfCBFRkVSX0xNRSB8IEVGRVJfTE1B IHwgRUZFUl9OWEUgfCBcCisgICAgICAgICAgICAgICAgICAgICAgICAgRUZFUl9TVk1FIHwgRUZF Ul9MTVNMRSB8IEVGRVJfRkZYU0UpCisKIC8qIEludGVsIE1TUnMuIFNvbWUgYWxzbyBhdmFpbGFi bGUgb24gb3RoZXIgQ1BVcyAqLwogI2RlZmluZSBNU1JfSUEzMl9QRVJGQ1RSMAkJMHgwMDAwMDBj MQogI2RlZmluZSBNU1JfSUEzMl9BX1BFUkZDVFIwCQkweDAwMDAwNGMxCi0tIAoyLjEuNAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=