From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/9] x86/vmx: Internal cleanup for MSR load/save infrastructure Date: Tue, 22 May 2018 12:20:39 +0100 Message-ID: <1526988046-22948-3-git-send-email-andrew.cooper3@citrix.com> References: <1526988046-22948-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: <1526988046-22948-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: Kevin Tian , Wei Liu , Jan Beulich , Andrew Cooper , Jun Nakajima , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org ICogVXNlIGFuIGFyY2hfdm14X3N0cnVjdCBsb2NhbCB2YXJpYWJsZSB0byByZWR1Y2UgbGF0ZXIg Y29kZSB2b2x1bWUuCiAqIFVzZSBzdGFydC90b3RhbCBpbnN0ZWFkIG9mIG1zcl9hcmVhL21zcl9j b3VudC4gIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yCiAgIG1vcmUgZmluZWdyYWluZWQgaGFu ZGxpbmcgd2l0aCBsYXRlciBjaGFuZ2VzLgogKiBVc2UgZW50L2VuZCBwb2ludGVycyAoYWdhaW4g Zm9yIHByZXBhcmF0aW9uKSwgYW5kIHRvIG1ha2UgdGhlIHZteF9hZGRfbXNyKCkKICAgbG9naWMg ZWFzaWVyIHRvIGZvbGxvdy4KICogTWFrZSB0aGUgbWVtb3J5IGFsbG9jYXRpb24gYmxvY2sgb2Yg dm14X2FkZF9tc3IoKSB1bmxpa2VseSwgYW5kIGNhbGN1bGF0ZQogICB2aXJ0X3RvX21hZGRyKCkg anVzdCBvbmNlLgoKTm8gcHJhY3RpY2FsIGNoYW5nZSB0byBmdW5jdGlvbmFsaXR5LgoKU2lnbmVk LW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkND OiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBKdW4gTmFrYWppbWEgPGp1bi5u YWthamltYUBpbnRlbC5jb20+CkNDOiBLZXZpbiBUaWFuIDxrZXZpbi50aWFuQGludGVsLmNvbT4K Q0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBSb2dlciBQYXUgTW9ubsOpIDxy b2dlci5wYXVAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHZtL3ZteC92bWNzLmMgfCA3 NCArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94 ZW4vYXJjaC94ODYvaHZtL3ZteC92bWNzLmMgYi94ZW4vYXJjaC94ODYvaHZtL3ZteC92bWNzLmMK aW5kZXggYTVkY2Y1Yy4uZjU1Nzg1NyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92bXgv dm1jcy5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdm14L3ZtY3MuYwpAQCAtMTI5Miw0OCArMTI5 Miw1MCBAQCBzdGF0aWMgaW50IHZteF9tc3JfZW50cnlfa2V5X2NtcChjb25zdCB2b2lkICprZXks IGNvbnN0IHZvaWQgKmVsdCkKIHN0cnVjdCB2bXhfbXNyX2VudHJ5ICp2bXhfZmluZF9tc3IodWlu dDMyX3QgbXNyLCBlbnVtIHZteF9tc3JfbGlzdF90eXBlIHR5cGUpCiB7CiAgICAgc3RydWN0IHZj cHUgKmN1cnIgPSBjdXJyZW50OwotICAgIHVuc2lnbmVkIGludCBtc3JfY291bnQ7Ci0gICAgc3Ry dWN0IHZteF9tc3JfZW50cnkgKm1zcl9hcmVhID0gTlVMTDsKKyAgICBzdHJ1Y3QgYXJjaF92bXhf c3RydWN0ICphcmNoX3ZteCA9ICZjdXJyLT5hcmNoLmh2bV92bXg7CisgICAgc3RydWN0IHZteF9t c3JfZW50cnkgKnN0YXJ0ID0gTlVMTDsKKyAgICB1bnNpZ25lZCBpbnQgdG90YWw7CiAKICAgICBz d2l0Y2ggKCB0eXBlICkKICAgICB7CiAgICAgY2FzZSBWTVhfTVNSX0hPU1Q6Ci0gICAgICAgIG1z cl9jb3VudCA9IGN1cnItPmFyY2guaHZtX3ZteC5ob3N0X21zcl9jb3VudDsKLSAgICAgICAgbXNy X2FyZWEgPSBjdXJyLT5hcmNoLmh2bV92bXguaG9zdF9tc3JfYXJlYTsKKyAgICAgICAgc3RhcnQg ICAgPSBhcmNoX3ZteC0+aG9zdF9tc3JfYXJlYTsKKyAgICAgICAgdG90YWwgICAgPSBhcmNoX3Zt eC0+aG9zdF9tc3JfY291bnQ7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBWTVhfTVNSX0dV RVNUOgotICAgICAgICBtc3JfY291bnQgPSBjdXJyLT5hcmNoLmh2bV92bXgubXNyX2NvdW50Owot ICAgICAgICBtc3JfYXJlYSA9IGN1cnItPmFyY2guaHZtX3ZteC5tc3JfYXJlYTsKKyAgICAgICAg c3RhcnQgICAgPSBhcmNoX3ZteC0+bXNyX2FyZWE7CisgICAgICAgIHRvdGFsICAgID0gYXJjaF92 bXgtPm1zcl9jb3VudDsKICAgICAgICAgYnJlYWs7CiAKICAgICBkZWZhdWx0OgogICAgICAgICBB U1NFUlRfVU5SRUFDSEFCTEUoKTsKICAgICB9CiAKLSAgICBpZiAoIG1zcl9hcmVhID09IE5VTEwg KQorICAgIGlmICggIXN0YXJ0ICkKICAgICAgICAgcmV0dXJuIE5VTEw7CiAKLSAgICByZXR1cm4g YnNlYXJjaCgmbXNyLCBtc3JfYXJlYSwgbXNyX2NvdW50LCBzaXplb2Yoc3RydWN0IHZteF9tc3Jf ZW50cnkpLAorICAgIHJldHVybiBic2VhcmNoKCZtc3IsIHN0YXJ0LCB0b3RhbCwgc2l6ZW9mKHN0 cnVjdCB2bXhfbXNyX2VudHJ5KSwKICAgICAgICAgICAgICAgICAgICB2bXhfbXNyX2VudHJ5X2tl eV9jbXApOwogfQogCiBpbnQgdm14X2FkZF9tc3IodWludDMyX3QgbXNyLCBlbnVtIHZteF9tc3Jf bGlzdF90eXBlIHR5cGUpCiB7CiAgICAgc3RydWN0IHZjcHUgKmN1cnIgPSBjdXJyZW50OwotICAg IHVuc2lnbmVkIGludCBpZHgsICptc3JfY291bnQ7Ci0gICAgc3RydWN0IHZteF9tc3JfZW50cnkg Kiptc3JfYXJlYSwgKm1zcl9hcmVhX2VsZW07CisgICAgc3RydWN0IGFyY2hfdm14X3N0cnVjdCAq YXJjaF92bXggPSAmY3Vyci0+YXJjaC5odm1fdm14OworICAgIHN0cnVjdCB2bXhfbXNyX2VudHJ5 ICoqcHRyLCAqc3RhcnQgPSBOVUxMLCAqZW50LCAqZW5kOworICAgIHVuc2lnbmVkIGludCB0b3Rh bDsKIAogICAgIHN3aXRjaCAoIHR5cGUgKQogICAgIHsKICAgICBjYXNlIFZNWF9NU1JfSE9TVDoK LSAgICAgICAgbXNyX2NvdW50ID0gJmN1cnItPmFyY2guaHZtX3ZteC5ob3N0X21zcl9jb3VudDsK LSAgICAgICAgbXNyX2FyZWEgPSAmY3Vyci0+YXJjaC5odm1fdm14Lmhvc3RfbXNyX2FyZWE7Cisg ICAgICAgIHB0ciAgICAgID0gJmFyY2hfdm14LT5ob3N0X21zcl9hcmVhOworICAgICAgICB0b3Rh bCAgICA9IGFyY2hfdm14LT5ob3N0X21zcl9jb3VudDsKICAgICAgICAgYnJlYWs7CiAKICAgICBj YXNlIFZNWF9NU1JfR1VFU1Q6Ci0gICAgICAgIG1zcl9jb3VudCA9ICZjdXJyLT5hcmNoLmh2bV92 bXgubXNyX2NvdW50OwotICAgICAgICBtc3JfYXJlYSA9ICZjdXJyLT5hcmNoLmh2bV92bXgubXNy X2FyZWE7CisgICAgICAgIHB0ciAgICAgID0gJmFyY2hfdm14LT5tc3JfYXJlYTsKKyAgICAgICAg dG90YWwgICAgPSBhcmNoX3ZteC0+bXNyX2NvdW50OwogICAgICAgICBicmVhazsKIAogICAgIGRl ZmF1bHQ6CkBAIC0xMzQxLDUxICsxMzQzLDU1IEBAIGludCB2bXhfYWRkX21zcih1aW50MzJfdCBt c3IsIGVudW0gdm14X21zcl9saXN0X3R5cGUgdHlwZSkKICAgICAgICAgcmV0dXJuIC1FSU5WQUw7 CiAgICAgfQogCi0gICAgaWYgKCAqbXNyX2FyZWEgPT0gTlVMTCApCisgICAgLyogQWxsb2NhdGUg bWVtb3J5IG9uIGZpcnN0IHVzZS4gKi8KKyAgICBpZiAoIHVubGlrZWx5KCEqcHRyKSApCiAgICAg ewotICAgICAgICBpZiAoICgqbXNyX2FyZWEgPSBhbGxvY194ZW5oZWFwX3BhZ2UoKSkgPT0gTlVM TCApCisgICAgICAgIHBhZGRyX3QgYWRkcjsKKworICAgICAgICBpZiAoICgqcHRyID0gYWxsb2Nf eGVuaGVhcF9wYWdlKCkpID09IE5VTEwgKQogICAgICAgICAgICAgcmV0dXJuIC1FTk9NRU07CiAK KyAgICAgICAgYWRkciA9IHZpcnRfdG9fbWFkZHIoKnB0cik7CisKICAgICAgICAgc3dpdGNoICgg dHlwZSApCiAgICAgICAgIHsKICAgICAgICAgY2FzZSBWTVhfTVNSX0hPU1Q6Ci0gICAgICAgICAg ICBfX3Ztd3JpdGUoVk1fRVhJVF9NU1JfTE9BRF9BRERSLCB2aXJ0X3RvX21hZGRyKCptc3JfYXJl YSkpOworICAgICAgICAgICAgX192bXdyaXRlKFZNX0VYSVRfTVNSX0xPQURfQUREUiwgYWRkcik7 CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFZNWF9NU1JfR1VFU1Q6Ci0gICAg ICAgICAgICBfX3Ztd3JpdGUoVk1fRVhJVF9NU1JfU1RPUkVfQUREUiwgdmlydF90b19tYWRkcigq bXNyX2FyZWEpKTsKLSAgICAgICAgICAgIF9fdm13cml0ZShWTV9FTlRSWV9NU1JfTE9BRF9BRERS LCB2aXJ0X3RvX21hZGRyKCptc3JfYXJlYSkpOworICAgICAgICAgICAgX192bXdyaXRlKFZNX0VY SVRfTVNSX1NUT1JFX0FERFIsIGFkZHIpOworICAgICAgICAgICAgX192bXdyaXRlKFZNX0VOVFJZ X01TUl9MT0FEX0FERFIsIGFkZHIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAg ICB9CiAKLSAgICBmb3IgKCBpZHggPSAwOyBpZHggPCAqbXNyX2NvdW50ICYmICgqbXNyX2FyZWEp W2lkeF0uaW5kZXggPD0gbXNyOyBpZHgrKyApCi0gICAgICAgIGlmICggKCptc3JfYXJlYSlbaWR4 XS5pbmRleCA9PSBtc3IgKQorICAgIHN0YXJ0ID0gKnB0cjsKKyAgICBlbmQgICA9IHN0YXJ0ICsg dG90YWw7CisKKyAgICBmb3IgKCBlbnQgPSBzdGFydDsgZW50IDwgZW5kICYmIGVudC0+aW5kZXgg PD0gbXNyOyArK2VudCApCisgICAgICAgIGlmICggZW50LT5pbmRleCA9PSBtc3IgKQogICAgICAg ICAgICAgcmV0dXJuIDA7CiAKLSAgICBpZiAoICptc3JfY291bnQgPT0gKFBBR0VfU0laRSAvIHNp emVvZihzdHJ1Y3Qgdm14X21zcl9lbnRyeSkpICkKKyAgICBpZiAoIHRvdGFsID09IChQQUdFX1NJ WkUgLyBzaXplb2YoKmVudCkpICkKICAgICAgICAgcmV0dXJuIC1FTk9TUEM7CiAKLSAgICBtZW1t b3ZlKCptc3JfYXJlYSArIGlkeCArIDEsICptc3JfYXJlYSArIGlkeCwKLSAgICAgICAgICAgIHNp emVvZigqbXNyX2FyZWFfZWxlbSkgKiAoKm1zcl9jb3VudCAtIGlkeCkpOwotCi0gICAgbXNyX2Fy ZWFfZWxlbSA9ICptc3JfYXJlYSArIGlkeDsKLSAgICBtc3JfYXJlYV9lbGVtLT5pbmRleCA9IG1z cjsKLSAgICBtc3JfYXJlYV9lbGVtLT5tYnogPSAwOworICAgIG1lbW1vdmUoZW50ICsgMSwgZW50 LCBzaXplb2YoKmVudCkgKiAoZW5kIC0gZW50KSk7CiAKLSAgICArKyptc3JfY291bnQ7CisgICAg ZW50LT5pbmRleCA9IG1zcjsKKyAgICBlbnQtPm1ieiA9IDA7CiAKICAgICBzd2l0Y2ggKCB0eXBl ICkKICAgICB7CiAgICAgY2FzZSBWTVhfTVNSX0hPU1Q6Ci0gICAgICAgIHJkbXNybChtc3IsIG1z cl9hcmVhX2VsZW0tPmRhdGEpOwotICAgICAgICBfX3Ztd3JpdGUoVk1fRVhJVF9NU1JfTE9BRF9D T1VOVCwgKm1zcl9jb3VudCk7CisgICAgICAgIHJkbXNybChtc3IsIGVudC0+ZGF0YSk7CisgICAg ICAgIF9fdm13cml0ZShWTV9FWElUX01TUl9MT0FEX0NPVU5ULCArK2FyY2hfdm14LT5ob3N0X21z cl9jb3VudCk7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBWTVhfTVNSX0dVRVNUOgotICAg ICAgICBtc3JfYXJlYV9lbGVtLT5kYXRhID0gMDsKLSAgICAgICAgX192bXdyaXRlKFZNX0VYSVRf TVNSX1NUT1JFX0NPVU5ULCAqbXNyX2NvdW50KTsKLSAgICAgICAgX192bXdyaXRlKFZNX0VOVFJZ X01TUl9MT0FEX0NPVU5ULCAqbXNyX2NvdW50KTsKKyAgICAgICAgZW50LT5kYXRhID0gMDsKKyAg ICAgICAgX192bXdyaXRlKFZNX0VYSVRfTVNSX1NUT1JFX0NPVU5ULCArK2FyY2hfdm14LT5tc3Jf Y291bnQpOworICAgICAgICBfX3Ztd3JpdGUoVk1fRU5UUllfTVNSX0xPQURfQ09VTlQsIGFyY2hf dm14LT5tc3JfY291bnQpOwogICAgICAgICBicmVhazsKICAgICB9CiAKLS0gCjIuMS40CgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1h aWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54 ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==