From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 09/19] x86/vmx: Use hvm_{get, set}_segment_register() rather than vmx_{get, set}_segment_register() Date: Mon, 28 Nov 2016 11:13:26 +0000 Message-ID: <1480331616-6165-10-git-send-email-andrew.cooper3@citrix.com> References: <1480331616-6165-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: <1480331616-6165-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 List-Id: xen-devel@lists.xenproject.org Tm8gZnVuY3Rpb25hbCBjaGFuZ2UgYXQgdGhpcyBwb2ludCwgYnV0IHRoaXMgaXMgYSBwcmVyZXF1 aXNpdGUgZm9yIGZvcnRoY29taW5nCmZ1bmN0aW9uYWwgY2hhbmdlcy4KCk1ha2Ugdm14X2dldF9z ZWdtZW50X3JlZ2lzdGVyKCkgcHJpdmF0ZSB0byB2bXguYyBsaWtlIGFsbCB0aGUgb3RoZXIgVmVu ZG9yCmdldC9zZXQgZnVuY3Rpb25zLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5k cmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGlj aEBzdXNlLmNvbT4KUmV2aWV3ZWQtYnk6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAY2l0 cml4LmNvbT4KQWNrZWQtYnk6IEtldmluIFRpYW4gPGtldmluLnRpYW5AaW50ZWwuY29tPgotLS0K IHhlbi9hcmNoL3g4Ni9odm0vdm14L3ZteC5jICAgICAgICB8IDE0ICsrKysrKystLS0tLS0tCiB4 ZW4vYXJjaC94ODYvaHZtL3ZteC92dm14LmMgICAgICAgfCAgNiArKystLS0KIHhlbi9pbmNsdWRl L2FzbS14ODYvaHZtL3ZteC92bXguaCB8ICAyIC0tCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0v dm14L3ZteC5jIGIveGVuL2FyY2gveDg2L2h2bS92bXgvdm14LmMKaW5kZXggMzFmMDhkMi4uMzc3 Yzc4OSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92bXgvdm14LmMKKysrIGIveGVuL2Fy Y2gveDg2L2h2bS92bXgvdm14LmMKQEAgLTk0MCw4ICs5NDAsOCBAQCBzdGF0aWMgdm9pZCB2bXhf Y3R4dF9zd2l0Y2hfdG8oc3RydWN0IHZjcHUgKnYpCiAgICAgICAgIC5maWVsZHMgPSB7IC50eXBl ID0gMHhiLCAucyA9IDAsIC5kcGwgPSAwLCAucCA9IDEsIC5hdmwgPSAwLCAgICBcCiAgICAgICAg ICAgICAgICAgICAgIC5sID0gMCwgLmRiID0gMCwgLmcgPSAwLCAucGFkID0gMCB9IH0pLmJ5dGVz KQogCi12b2lkIHZteF9nZXRfc2VnbWVudF9yZWdpc3RlcihzdHJ1Y3QgdmNwdSAqdiwgZW51bSB4 ODZfc2VnbWVudCBzZWcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qgc2Vn bWVudF9yZWdpc3RlciAqcmVnKQorc3RhdGljIHZvaWQgdm14X2dldF9zZWdtZW50X3JlZ2lzdGVy KHN0cnVjdCB2Y3B1ICp2LCBlbnVtIHg4Nl9zZWdtZW50IHNlZywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qgc2VnbWVudF9yZWdpc3RlciAqcmVnKQogewogICAg IHVuc2lnbmVkIGxvbmcgYXR0ciA9IDAsIHNlbCA9IDAsIGxpbWl0OwogCkBAIC0xNTA0LDE5ICsx NTA0LDE5IEBAIHN0YXRpYyB2b2lkIHZteF91cGRhdGVfZ3Vlc3RfY3Ioc3RydWN0IHZjcHUgKnYs IHVuc2lnbmVkIGludCBjcikKICAgICAgICAgICAgICAqIE5lZWQgdG8gcmVhZCB0aGVtIGFsbCBl aXRoZXIgd2F5LCBhcyByZWFsbW9kZSByZWFkcyBjYW4gdXBkYXRlCiAgICAgICAgICAgICAgKiB0 aGUgc2F2ZWQgdmFsdWVzIHdlJ2xsIHVzZSB3aGVuIHJldHVybmluZyB0byBwcm90IG1vZGUuICov CiAgICAgICAgICAgICBmb3IgKCBzID0gMDsgcyA8IEFSUkFZX1NJWkUocmVnKTsgcysrICkKLSAg ICAgICAgICAgICAgICB2bXhfZ2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgcywgJnJlZ1tzXSk7Cisg ICAgICAgICAgICAgICAgaHZtX2dldF9zZWdtZW50X3JlZ2lzdGVyKHYsIHMsICZyZWdbc10pOwog ICAgICAgICAgICAgdi0+YXJjaC5odm1fdm14LnZteF9yZWFsbW9kZSA9IHJlYWxtb2RlOwogICAg ICAgICAgICAgCiAgICAgICAgICAgICBpZiAoIHJlYWxtb2RlICkKICAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICBmb3IgKCBzID0gMDsgcyA8IEFSUkFZX1NJWkUocmVnKTsgcysrICkKLSAg ICAgICAgICAgICAgICAgICAgdm14X3NldF9zZWdtZW50X3JlZ2lzdGVyKHYsIHMsICZyZWdbc10p OworICAgICAgICAgICAgICAgICAgICBodm1fc2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgcywgJnJl Z1tzXSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBlbHNlIAogICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgIGZvciAoIHMgPSAwOyBzIDwgQVJSQVlfU0laRShyZWcpOyBzKysgKQog ICAgICAgICAgICAgICAgICAgICBpZiAoICEodi0+YXJjaC5odm1fdm14LnZtODZfc2VnbWVudF9t YXNrICYgKDE8PHMpKSApCi0gICAgICAgICAgICAgICAgICAgICAgICB2bXhfc2V0X3NlZ21lbnRf cmVnaXN0ZXIoCisgICAgICAgICAgICAgICAgICAgICAgICBodm1fc2V0X3NlZ21lbnRfcmVnaXN0 ZXIoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdiwgcywgJnYtPmFyY2guaHZtX3ZteC52 bTg2X3NhdmVkX3NlZ1tzXSk7CiAgICAgICAgICAgICB9CiAKQEAgLTM5MDcsNyArMzkwNyw3IEBA IHZvaWQgdm14X3ZtZXhpdF9oYW5kbGVyKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKQogICAg ICAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsICJCYWQgdm1leGl0IChyZWFzb24gJSNs eClcbiIsCiAgICAgICAgICAgICAgICAgICAgICBleGl0X3JlYXNvbik7CiAKLSAgICAgICAgICAg IHZteF9nZXRfc2VnbWVudF9yZWdpc3Rlcih2LCB4ODZfc2VnX3NzLCAmc3MpOworICAgICAgICAg ICAgaHZtX2dldF9zZWdtZW50X3JlZ2lzdGVyKHYsIHg4Nl9zZWdfc3MsICZzcyk7CiAgICAgICAg ICAgICBpZiAoIHNzLmF0dHIuZmllbGRzLmRwbCApCiAgICAgICAgICAgICAgICAgaHZtX2luamVj dF9od19leGNlcHRpb24oVFJBUF9pbnZhbGlkX29wLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFg4Nl9FVkVOVF9OT19FQyk7CkBAIC0zOTM5LDcgKzM5MzksNyBAQCB2 b2lkIHZteF92bWV4aXRfaGFuZGxlcihzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKIAogICAg ICAgICBncHJpbnRrKFhFTkxPR19XQVJOSU5HLCAiQmFkIHJJUCAlbHggZm9yIG1vZGUgJXVcbiIs IHJlZ3MtPnJpcCwgbW9kZSk7CiAKLSAgICAgICAgdm14X2dldF9zZWdtZW50X3JlZ2lzdGVyKHYs IHg4Nl9zZWdfc3MsICZzcyk7CisgICAgICAgIGh2bV9nZXRfc2VnbWVudF9yZWdpc3Rlcih2LCB4 ODZfc2VnX3NzLCAmc3MpOwogICAgICAgICBpZiAoIHNzLmF0dHIuZmllbGRzLmRwbCApCiAgICAg ICAgIHsKICAgICAgICAgICAgIF9fdm1yZWFkKFZNX0VOVFJZX0lOVFJfSU5GTywgJmludHJfaW5m byk7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92dm14LmMgYi94ZW4vYXJjaC94 ODYvaHZtL3ZteC92dm14LmMKaW5kZXggZWZhZjU0Yy4uYmNjNGE5NyAxMDA2NDQKLS0tIGEveGVu L2FyY2gveDg2L2h2bS92bXgvdnZteC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdm14L3Z2bXgu YwpAQCAtMzYwLDcgKzM2MCw3IEBAIHN0YXRpYyBpbnQgdm14X2luc3RfY2hlY2tfcHJpdmlsZWdl KHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzLCBpbnQgdm14b3BfY2hlY2spCiAgICAgZWxzZSBp ZiAoICF2Y3B1XzJfbnZteCh2KS52bXhvbl9yZWdpb25fcGEgKQogICAgICAgICBnb3RvIGludmFs aWRfb3A7CiAKLSAgICB2bXhfZ2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgeDg2X3NlZ19jcywgJmNz KTsKKyAgICBodm1fZ2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgeDg2X3NlZ19jcywgJmNzKTsKIAog ICAgIGlmICggKHJlZ3MtPmVmbGFncyAmIFg4Nl9FRkxBR1NfVk0pIHx8CiAgICAgICAgICAoaHZt X2xvbmdfbW9kZV9lbmFibGVkKHYpICYmIGNzLmF0dHIuZmllbGRzLmwgPT0gMCkgKQpAQCAtNDE5 LDEzICs0MTksMTMgQEAgc3RhdGljIGludCBkZWNvZGVfdm14X2luc3Qoc3RydWN0IGNwdV91c2Vy X3JlZ3MgKnJlZ3MsCiAKICAgICAgICAgaWYgKCBodm1fbG9uZ19tb2RlX2VuYWJsZWQodikgKQog ICAgICAgICB7Ci0gICAgICAgICAgICB2bXhfZ2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgeDg2X3Nl Z19jcywgJnNlZyk7CisgICAgICAgICAgICBodm1fZ2V0X3NlZ21lbnRfcmVnaXN0ZXIodiwgeDg2 X3NlZ19jcywgJnNlZyk7CiAgICAgICAgICAgICBtb2RlXzY0Yml0ID0gc2VnLmF0dHIuZmllbGRz Lmw7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIGluZm8uZmllbGRzLnNlZ21lbnQgPiBWTVhf U1JFR19HUyApCiAgICAgICAgICAgICBnb3RvIGdwX2ZhdWx0OwotICAgICAgICB2bXhfZ2V0X3Nl Z21lbnRfcmVnaXN0ZXIodiwgc3JlZ190b19pbmRleFtpbmZvLmZpZWxkcy5zZWdtZW50XSwgJnNl Zyk7CisgICAgICAgIGh2bV9nZXRfc2VnbWVudF9yZWdpc3Rlcih2LCBzcmVnX3RvX2luZGV4W2lu Zm8uZmllbGRzLnNlZ21lbnRdLCAmc2VnKTsKICAgICAgICAgc2VnX2Jhc2UgPSBzZWcuYmFzZTsK IAogICAgICAgICBiYXNlID0gaW5mby5maWVsZHMuYmFzZV9yZWdfaW52YWxpZCA/IDAgOgpkaWZm IC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdm14L3ZteC5oIGIveGVuL2luY2x1ZGUv YXNtLXg4Ni9odm0vdm14L3ZteC5oCmluZGV4IDRjZGQ5YjEuLjBlNTkwMmQgMTAwNjQ0Ci0tLSBh L3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZteC92bXguaAorKysgYi94ZW4vaW5jbHVkZS9hc20t eDg2L2h2bS92bXgvdm14LmgKQEAgLTU1MCw4ICs1NTAsNiBAQCBzdGF0aWMgaW5saW5lIGludCBf X3ZteG9uKHU2NCBhZGRyKQogICAgIHJldHVybiByYzsKIH0KIAotdm9pZCB2bXhfZ2V0X3NlZ21l bnRfcmVnaXN0ZXIoc3RydWN0IHZjcHUgKiwgZW51bSB4ODZfc2VnbWVudCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN0cnVjdCBzZWdtZW50X3JlZ2lzdGVyICopOwogdm9pZCB2bXhf aW5qZWN0X2V4dGludChpbnQgdHJhcCwgdWludDhfdCBzb3VyY2UpOwogdm9pZCB2bXhfaW5qZWN0 X25taSh2b2lkKTsKIAotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK