From: Luwei Kang Subject: [PATCH] x86/vpmu: fix vpmu can't enabled in guest Date: Tue, 14 Feb 2017 10:19:22 +0800 Message-ID: <1487038762-24020-1-git-send-email-luwei.kang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: andrew.cooper3@citrix.com, Luwei Kang , jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org dnBtdV9lbmFibGUoKSBjYW4gbm90IHVzZSBmb3IgY2hlY2sgaWYgdnBtdSBpcyBlbmFibGVkIGlu IGd1ZXN0IGR1cmluZwpib290aW5nIHVwLiBCZWNhdXNlIGxpbnV4IGtlcm5lbCBnZXQgdGhlIHN0 YXR1cyBvZiBpZiBzdXBwb3J0ZWQgcG11CmlzIGVhcmxlciB0aGFuIHhlbiB2cG11IGluaXRpYWxp c2UuIHZwbXVfZW5hYmxlKCkgd2lsbCByZXR1cm4gZmFsc2UKZXZlbiBpZiB2cG11IGhhcyBiZWVu IGVuYWJsZWQgaW4gZ3Vlc3QuCgpTaWduZWQtb2ZmLWJ5OiBMdXdlaSBLYW5nIDxsdXdlaS5rYW5n QGludGVsLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvY3B1L3ZwbXUuYyAgICB8ICAyICstCiB4ZW4v YXJjaC94ODYvY3B1aWQuYyAgICAgICB8IDExICsrKysrLS0tLS0tCiB4ZW4vaW5jbHVkZS9hc20t eDg2L3ZwbXUuaCB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvY3B1L3ZwbXUuYyBiL3hlbi9h cmNoL3g4Ni9jcHUvdnBtdS5jCmluZGV4IDM1YTk0MDMuLjhjOGZmYzkgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9jcHUvdnBtdS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9jcHUvdnBtdS5jCkBAIC01 MCw3ICs1MCw3IEBAIENIRUNLX3BtdV9wYXJhbXM7CiAgKiAidnBtdT1hcmNoIiA6IHZwbXUgZW5h YmxlZCBmb3IgcHJlZGVmIGFyY2ggY291bnRlcnMgb25seSAocmVzdHJpY3RpdmUpCiAgKiBmbGFn IGNvbWJpbmF0aW9ucyBhcmUgYWxsb3dlZCwgZWcsICJ2cG11PWlwYyxidHMiLgogICovCi1zdGF0 aWMgdW5zaWduZWQgaW50IF9fcmVhZF9tb3N0bHkgb3B0X3ZwbXVfZW5hYmxlZDsKK3Vuc2lnbmVk IGludCBfX3JlYWRfbW9zdGx5IG9wdF92cG11X2VuYWJsZWQ7CiB1bnNpZ25lZCBpbnQgX19yZWFk X21vc3RseSB2cG11X21vZGUgPSBYRU5QTVVfTU9ERV9PRkY7CiB1bnNpZ25lZCBpbnQgX19yZWFk X21vc3RseSB2cG11X2ZlYXR1cmVzID0gMDsKIHN0YXRpYyB2b2lkIHBhcnNlX3ZwbXVfcGFyYW1z KGNoYXIgKnMpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2NwdWlkLmMgYi94ZW4vYXJjaC94 ODYvY3B1aWQuYwppbmRleCBlMGEzODdlLi5iNjNjNWQ4IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94 ODYvY3B1aWQuYworKysgYi94ZW4vYXJjaC94ODYvY3B1aWQuYwpAQCAtNzEzLDggKzcxMyw3IEBA IHN0YXRpYyB2b2lkIHB2X2NwdWlkKHVpbnQzMl90IGxlYWYsIHVpbnQzMl90IHN1YmxlYWYsIHN0 cnVjdCBjcHVpZF9sZWFmICpyZXMpCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoIHZwbXVfZW5hYmxlZChjdXJyKSAmJgotICAgICAgICAgICAgIHZwbXVfaXNfc2V0KHZj cHVfdnBtdShjdXJyKSwgVlBNVV9DUFVfSEFTX0RTKSApCisgICAgICAgIGlmICggb3B0X3ZwbXVf ZW5hYmxlZCAmJiBib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfRFMpICkKICAgICAgICAgewogICAg ICAgICAgICAgcmVzLT5kIHw9IGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9EUyk7CiAgICAgICAg ICAgICBpZiAoIGNwdV9oYXMoJmN1cnJlbnRfY3B1X2RhdGEsIFg4Nl9GRUFUVVJFX0RURVM2NCkg KQpAQCAtNzI2LDcgKzcyNSw3IEBAIHN0YXRpYyB2b2lkIHB2X2NwdWlkKHVpbnQzMl90IGxlYWYs IHVpbnQzMl90IHN1YmxlYWYsIHN0cnVjdCBjcHVpZF9sZWFmICpyZXMpCiAKICAgICBjYXNlIDB4 MDAwMDAwMGE6IC8qIEFyY2hpdGVjdHVyYWwgUGVyZm9ybWFuY2UgTW9uaXRvciBGZWF0dXJlcyAo SW50ZWwpICovCiAgICAgICAgIGlmICggYm9vdF9jcHVfZGF0YS54ODZfdmVuZG9yICE9IFg4Nl9W RU5ET1JfSU5URUwgfHwKLSAgICAgICAgICAgICAhdnBtdV9lbmFibGVkKGN1cnIpICkKKyAgICAg ICAgICAgICAhb3B0X3ZwbXVfZW5hYmxlZCApCiAgICAgICAgICAgICBnb3RvIHVuc3VwcG9ydGVk OwogCiAgICAgICAgIC8qIFJlcG9ydCBhdCBtb3N0IHZlcnNpb24gMyBzaW5jZSB0aGF0J3MgYWxs IHdlIGN1cnJlbnRseSBlbXVsYXRlLiAqLwpAQCAtNzkzLDggKzc5Miw3IEBAIHN0YXRpYyB2b2lk IGh2bV9jcHVpZCh1aW50MzJfdCBsZWFmLCB1aW50MzJfdCBzdWJsZWFmLCBzdHJ1Y3QgY3B1aWRf bGVhZiAqcmVzKQogICAgICAgICBpZiAoICFoYXBfZW5hYmxlZChkKSAmJiAhaHZtX3BhZV9lbmFi bGVkKHYpICkKICAgICAgICAgICAgIHJlcy0+ZCAmPSB+Y3B1ZmVhdF9tYXNrKFg4Nl9GRUFUVVJF X1BTRTM2KTsKIAotICAgICAgICBpZiAoIHZwbXVfZW5hYmxlZCh2KSAmJgotICAgICAgICAgICAg IHZwbXVfaXNfc2V0KHZjcHVfdnBtdSh2KSwgVlBNVV9DUFVfSEFTX0RTKSApCisgICAgICAgIGlm ICggb3B0X3ZwbXVfZW5hYmxlZCAmJiBib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfRFMpICkKICAg ICAgICAgewogICAgICAgICAgICAgcmVzLT5kIHw9IGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9E Uyk7CiAgICAgICAgICAgICBpZiAoIGNwdV9oYXMoJmN1cnJlbnRfY3B1X2RhdGEsIFg4Nl9GRUFU VVJFX0RURVM2NCkgKQpAQCAtODExLDcgKzgwOSw4IEBAIHN0YXRpYyB2b2lkIGh2bV9jcHVpZCh1 aW50MzJfdCBsZWFmLCB1aW50MzJfdCBzdWJsZWFmLCBzdHJ1Y3QgY3B1aWRfbGVhZiAqcmVzKQog ICAgICAgICBicmVhazsKIAogICAgIGNhc2UgMHgwMDAwMDAwYTogLyogQXJjaGl0ZWN0dXJhbCBQ ZXJmb3JtYW5jZSBNb25pdG9yIEZlYXR1cmVzIChJbnRlbCkgKi8KLSAgICAgICAgaWYgKCBib290 X2NwdV9kYXRhLng4Nl92ZW5kb3IgIT0gWDg2X1ZFTkRPUl9JTlRFTCB8fCAhdnBtdV9lbmFibGVk KHYpICkKKyAgICAgICAgaWYgKCBib290X2NwdV9kYXRhLng4Nl92ZW5kb3IgIT0gWDg2X1ZFTkRP Ul9JTlRFTCB8fAorCQkhb3B0X3ZwbXVfZW5hYmxlZCApCiAgICAgICAgIHsKICAgICAgICAgICAg ICpyZXMgPSBFTVBUWV9MRUFGOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS94ZW4v aW5jbHVkZS9hc20teDg2L3ZwbXUuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvdnBtdS5oCmluZGV4 IGU1MDYxOGYuLjExNDhkNjYgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvdnBtdS5o CisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvdnBtdS5oCkBAIC0yNSw3ICsyNSw2IEBACiAKICNk ZWZpbmUgdmNwdV92cG11KHZjcHUpICAgKCYodmNwdSktPmFyY2gudnBtdSkKICNkZWZpbmUgdnBt dV92Y3B1KHZwbXUpICAgY29udGFpbmVyX29mKCh2cG11KSwgc3RydWN0IHZjcHUsIGFyY2gudnBt dSkKLSNkZWZpbmUgdnBtdV9lbmFibGVkKHZjcHUpIHZwbXVfaXNfc2V0KHZjcHVfdnBtdSh2Y3B1 KSwgVlBNVV9DT05URVhUX0FMTE9DQVRFRCkKIAogI2RlZmluZSBNU1JfVFlQRV9DT1VOVEVSICAg ICAgICAgICAgMAogI2RlZmluZSBNU1JfVFlQRV9DVFJMICAgICAgICAgICAgICAgMQpAQCAtMTIx LDYgKzEyMCw3IEBAIHN0YXRpYyBpbmxpbmUgaW50IHZwbXVfZG9fcmRtc3IodW5zaWduZWQgaW50 IG1zciwgdWludDY0X3QgKm1zcl9jb250ZW50KQogICAgIHJldHVybiB2cG11X2RvX21zcihtc3Is IG1zcl9jb250ZW50LCAwLCAwKTsKIH0KIAorZXh0ZXJuIHVuc2lnbmVkIGludCBvcHRfdnBtdV9l bmFibGVkOwogZXh0ZXJuIHVuc2lnbmVkIGludCB2cG11X21vZGU7CiBleHRlcm4gdW5zaWduZWQg aW50IHZwbXVfZmVhdHVyZXM7CiAKLS0gCjEuOC4zLjEKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK