From: Dietmar Hahn Subject: Re: [PATCH] vpmu intel: Add cpuid handling when vpmu disabled Date: Wed, 20 Mar 2013 07:40:58 +0100 Message-ID: <1486142.9kgXaF8ZbC@amur> References: <10932493.oBcqbPszgs@amur> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <10932493.oBcqbPszgs@amur> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Eddie Dong , Jun Nakajima List-Id: xen-devel@lists.xenproject.org QW0gTWl0dHdvY2ggMTMgTcOkcnogMjAxMywgMTA6NTU6Mjkgc2NocmllYiBEaWV0bWFyIEhhaG46 Cj4gRXZlbiB0aG91Z2ggdnBtdSBpcyBkaXNhYmxlZCBpbiB0aGUgaHlwZXJ2aXNvciBpbiB0aGUg SFZNIGd1ZXN0IHRoZSBjYWxsIG9mCj4gY3B1aWQoMHhhKSByZXR1cm5zIGluZm9ybWF0aW9ucyBh Ym91dCB1c2FibGUgcGVyZm9ybWFuY2UgY291bnRlcnMuCj4gVGhpcyBtYXkgY29uZnVzZSBndWVz dCBzb2Z0d2FyZSB3aGVuIHRyeWluZyB0byB1c2UgdGhlIGNvdW50ZXJzIGFuZCBub3RoaW5nCj4g aGFwcGVucy4KPiBUaGlzIHBhdGNoIGNsZWFycyBtb3N0IGJpdHMgaW4gcmVnaXN0ZXJzIGVheCBh bmQgZWR4IG9mIGNwdWlkKDB4YSkgaW5zdHJ1Y3Rpb24KPiBmb3IgdGhlIGd1ZXN0IHdoZW4gdnBt dSBpcyBkaXNhYmxlZDoKPiAgLSB2ZXJzaW9uIElEIG9mIGFyY2hpdGVjdHVyYWwgcGVyZm9ybWFu Y2UgY291bnRpbmcKPiAgLSBudW1iZXIgb2YgZ2VuZXJhbCBwbXUgcmVnaXN0ZXJzCj4gIC0gd2lk dGggb2YgZ2VuZXJhbCBwbXUgcmVnaXN0ZXJzCj4gIC0gbnVtYmVyIG9mIGZpeGVkIHBtdSByZWdp c3RlcnMKPiAgLSB3aWR0aCBvZiBpeGVkIHBtdSByZWdpc3RlcnMKPiAKPiBUaGFua3MuCj4gCj4g RGlldG1hci4KClBpbmc/Cgo+IAo+IFNpZ25lZC1vZmYtYnk6IERpZXRtYXIgSGFobiA8ZGlldG1h ci5oYWhuQHRzLmZ1aml0c3UuY29tPgo+IAo+IGRpZmYgLXIgYTZiODEyMzRiMTg5IHhlbi9hcmNo L3g4Ni9odm0vc3ZtL3ZwbXUuYwo+IC0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vc3ZtL3ZwbXUuYwlN b24gTWFyIDExIDE2OjEzOjQyIDIwMTMgKzAwMDAKPiArKysgYi94ZW4vYXJjaC94ODYvaHZtL3N2 bS92cG11LmMJV2VkIE1hciAxMyAwOTo1NDowMCAyMDEzICswMTAwCj4gQEAgLTM3MCw2ICszNzAs MTAgQEAgaW50IHN2bV92cG11X2luaXRpYWxpc2Uoc3RydWN0IHZjcHUgKnYsIAo+ICAgICAgdWlu dDhfdCBmYW1pbHkgPSBjdXJyZW50X2NwdV9kYXRhLng4NjsKPiAgICAgIGludCByZXQgPSAwOwo+ ICAKPiArICAgIC8qIHZwbXUgZW5hYmxlZD8gKi8KPiArICAgIGlmICghdnBtdV9mbGFncykKPiAr ICAgICAgICByZXR1cm4gMDsKPiArCj4gICAgICBzd2l0Y2ggKCBmYW1pbHkgKQo+ICAgICAgewo+ ICAgICAgY2FzZSAweDEwOgo+IGRpZmYgLXIgYTZiODEyMzRiMTg5IHhlbi9hcmNoL3g4Ni9odm0v dm14L3ZwbXVfY29yZTIuYwo+IC0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vdm14L3ZwbXVfY29yZTIu YwlNb24gTWFyIDExIDE2OjEzOjQyIDIwMTMgKzAwMDAKPiArKysgYi94ZW4vYXJjaC94ODYvaHZt L3ZteC92cG11X2NvcmUyLmMJV2VkIE1hciAxMyAwOTo1NDowMCAyMDEzICswMTAwCj4gQEAgLTcy Nyw2ICs3MjcsNTkgQEAgc3RydWN0IGFyY2hfdnBtdV9vcHMgY29yZTJfdnBtdV9vcHMgPSB7Cj4g ICAgICAuYXJjaF92cG11X2xvYWQgPSBjb3JlMl92cG11X2xvYWQKPiAgfTsKPiAgCj4gKy8qIGNw dWlkIDB4YSAtIGVheCAqLwo+ICsjZGVmaW5lIFg4Nl9GRUFUVVJFX1BNVV9WRVJfT0ZGICAgMCAg LyogVmVyc2lvbiAqLwo+ICsjZGVmaW5lIEZFQVRVUkVfUE1VX1ZFUl9CSVRTICAgICAgOCAgLyog OCBiaXRzICovCj4gKyNkZWZpbmUgWDg2X0ZFQVRVUkVfTlVNX0dFTl9PRkYgICA4ICAvKiBOdW1i ZXIgb2YgZ2VuZXJhbCBwbXUgcmVnaXN0ZXJzICovCj4gKyNkZWZpbmUgRkVBVFVSRV9OVU1fR0VO X0JJVFMgICAgICA4ICAvKiA4IGJpdHMgKi8KPiArI2RlZmluZSBYODZfRkVBVFVSRV9HRU5fV0lE VEhfT0ZGIDE2IC8qIFdpZHRoIG9mIGdlbmVyYWwgcG11IHJlZ2lzdGVycyAqLwo+ICsjZGVmaW5l IEZFQVRVUkVfR0VOX1dJRFRIX0JJVFMgICAgOCAgLyogOCBiaXRzICovCj4gKwo+ICsvKiBjcHVp ZCAweGEgLSBlZHggKi8KPiArI2RlZmluZSBYODZfRkVBVFVSRV9OVU1fRklYX09GRiAgIDAgIC8q IE51bWJlciBvZiBmaXhlZCBwbXUgcmVnaXN0ZXJzICovCj4gKyNkZWZpbmUgRkVBVFVSRV9OVU1f RklYX0JJVFMgICAgICA1ICAvKiA1IGJpdHMgKi8KPiArI2RlZmluZSBYODZfRkVBVFVSRV9GSVhf V0lEVEhfT0ZGIDUgIC8qIFdpZHRoIG9mIGZpeGVkIHBtdSByZWdpc3RlcnMgKi8KPiArI2RlZmlu ZSBGRUFUVVJFX0ZJWF9XSURUSF9CSVRTICAgIDggIC8qIDggYml0cyAqLwo+ICsKPiArc3RhdGlj IHZvaWQgY29yZTJfbm9fdnBtdV9kb19jcHVpZCh1bnNpZ25lZCBpbnQgaW5wdXQsCj4gKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50ICplYXgsIHVuc2lnbmVkIGlu dCAqZWJ4LAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCAq ZWN4LCB1bnNpZ25lZCBpbnQgKmVkeCkKPiArewo+ICsgICAgLyoKPiArICAgICAqIEFzIGluIHRo aXMgY2FzZSB0aGUgdnBtdSBpcyBub3QgZW5hYmxlZCByZXNldCBzb21lIGJpdHMgaW4gdGhlCj4g KyAgICAgKiBwbXUgcGFydCBvZiB0aGUgY3B1aWQuCj4gKyAgICAgKi8KPiArICAgIGlmIChpbnB1 dCA9PSAweGEpCj4gKyAgICB7Cj4gKyAgICAgICAgKmVheCAmPSB+KCgoMSA8PCBGRUFUVVJFX1BN VV9WRVJfQklUUykgLTEpIDw8IFg4Nl9GRUFUVVJFX1BNVV9WRVJfT0ZGKTsKPiArICAgICAgICAq ZWF4ICY9IH4oKCgxIDw8IEZFQVRVUkVfTlVNX0dFTl9CSVRTKSAtMSkgPDwgWDg2X0ZFQVRVUkVf TlVNX0dFTl9PRkYpOwo+ICsgICAgICAgICplYXggJj0gfigoKDEgPDwgRkVBVFVSRV9HRU5fV0lE VEhfQklUUykgLTEpIDw8IFg4Nl9GRUFUVVJFX0dFTl9XSURUSF9PRkYpOwo+ICsKPiArICAgICAg ICAqZWR4ICY9IH4oKCgxIDw8IEZFQVRVUkVfTlVNX0ZJWF9CSVRTKSAtMSkgPDwgWDg2X0ZFQVRV UkVfTlVNX0ZJWF9PRkYpOwo+ICsgICAgICAgICplZHggJj0gfigoKDEgPDwgRkVBVFVSRV9GSVhf V0lEVEhfQklUUykgLTEpIDw8IFg4Nl9GRUFUVVJFX0ZJWF9XSURUSF9PRkYpOwo+ICsgICAgfQo+ ICt9Cj4gKwo+ICsvKgo+ICsgKiBJZiBpdCdzIGEgdnBtdSBtc3Igc2V0IGl0IHRvIDAuCj4gKyAq Lwo+ICtzdGF0aWMgaW50IGNvcmUyX25vX3ZwbXVfZG9fcmRtc3IodW5zaWduZWQgaW50IG1zciwg dWludDY0X3QgKm1zcl9jb250ZW50KQo+ICt7Cj4gKyAgICBpbnQgdHlwZSA9IC0xLCBpbmRleCA9 IC0xOwo+ICsgICAgaWYgKCAhaXNfY29yZTJfdnBtdV9tc3IobXNyLCAmdHlwZSwgJmluZGV4KSAp Cj4gKyAgICAgICAgcmV0dXJuIDA7Cj4gKyAgICAqbXNyX2NvbnRlbnQgPSAwOwo+ICsgICAgcmV0 dXJuIDE7Cj4gK30KPiArCj4gKy8qCj4gKyAqIFRoZXNlIGZ1bmN0aW9ucyBhcmUgdXNlZCBpbiBj YXNlIHZwbXUgaXMgbm90IGVuYWJsZWQuCj4gKyAqLwo+ICtzdHJ1Y3QgYXJjaF92cG11X29wcyBj b3JlMl9ub192cG11X29wcyA9IHsKPiArICAgIC5kb19yZG1zciA9IGNvcmUyX25vX3ZwbXVfZG9f cmRtc3IsCj4gKyAgICAuZG9fY3B1aWQgPSBjb3JlMl9ub192cG11X2RvX2NwdWlkLAo+ICt9Owo+ ICsKPiAgaW50IHZteF92cG11X2luaXRpYWxpc2Uoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGlu dCB2cG11X2ZsYWdzKQo+ICB7Cj4gICAgICBzdHJ1Y3QgdnBtdV9zdHJ1Y3QgKnZwbXUgPSB2Y3B1 X3ZwbXUodik7Cj4gQEAgLTczNCw2ICs3ODcsMTAgQEAgaW50IHZteF92cG11X2luaXRpYWxpc2Uo c3RydWN0IHZjcHUgKnYsIAo+ICAgICAgdWludDhfdCBjcHVfbW9kZWwgPSBjdXJyZW50X2NwdV9k YXRhLng4Nl9tb2RlbDsKPiAgICAgIGludCByZXQgPSAwOwo+ICAKPiArICAgIHZwbXUtPmFyY2hf dnBtdV9vcHMgPSAmY29yZTJfbm9fdnBtdV9vcHM7Cj4gKyAgICBpZiAoICF2cG11X2ZsYWdzICkK PiArICAgICAgICByZXR1cm4gMDsKPiArCj4gICAgICBpZiAoIGZhbWlseSA9PSA2ICkKPiAgICAg IHsKPiAgICAgICAgICBzd2l0Y2ggKCBjcHVfbW9kZWwgKQo+IGRpZmYgLXIgYTZiODEyMzRiMTg5 IHhlbi9hcmNoL3g4Ni9odm0vdnBtdS5jCj4gLS0tIGEveGVuL2FyY2gveDg2L2h2bS92cG11LmMJ TW9uIE1hciAxMSAxNjoxMzo0MiAyMDEzICswMDAwCj4gKysrIGIveGVuL2FyY2gveDg2L2h2bS92 cG11LmMJV2VkIE1hciAxMyAwOTo1NDowMCAyMDEzICswMTAwCj4gQEAgLTY3LDcgKzY3LDcgQEAg aW50IHZwbXVfZG9fd3Jtc3IodW5zaWduZWQgaW50IG1zciwgdWludAo+ICB7Cj4gICAgICBzdHJ1 Y3QgdnBtdV9zdHJ1Y3QgKnZwbXUgPSB2Y3B1X3ZwbXUoY3VycmVudCk7Cj4gIAo+IC0gICAgaWYg KCB2cG11LT5hcmNoX3ZwbXVfb3BzICkKPiArICAgIGlmICggdnBtdS0+YXJjaF92cG11X29wcyAm JiB2cG11LT5hcmNoX3ZwbXVfb3BzLT5kb193cm1zciApCj4gICAgICAgICAgcmV0dXJuIHZwbXUt PmFyY2hfdnBtdV9vcHMtPmRvX3dybXNyKG1zciwgbXNyX2NvbnRlbnQpOwo+ICAgICAgcmV0dXJu IDA7Cj4gIH0KPiBAQCAtNzYsNyArNzYsNyBAQCBpbnQgdnBtdV9kb19yZG1zcih1bnNpZ25lZCBp bnQgbXNyLCB1aW50Cj4gIHsKPiAgICAgIHN0cnVjdCB2cG11X3N0cnVjdCAqdnBtdSA9IHZjcHVf dnBtdShjdXJyZW50KTsKPiAgCj4gLSAgICBpZiAoIHZwbXUtPmFyY2hfdnBtdV9vcHMgKQo+ICsg ICAgaWYgKCB2cG11LT5hcmNoX3ZwbXVfb3BzICYmIHZwbXUtPmFyY2hfdnBtdV9vcHMtPmRvX3Jk bXNyICkKPiAgICAgICAgICByZXR1cm4gdnBtdS0+YXJjaF92cG11X29wcy0+ZG9fcmRtc3IobXNy LCBtc3JfY29udGVudCk7Cj4gICAgICByZXR1cm4gMDsKPiAgfQo+IEBAIC04NSw3ICs4NSw3IEBA IGludCB2cG11X2RvX2ludGVycnVwdChzdHJ1Y3QgY3B1X3VzZXJfcmUKPiAgewo+ICAgICAgc3Ry dWN0IHZwbXVfc3RydWN0ICp2cG11ID0gdmNwdV92cG11KGN1cnJlbnQpOwo+ICAKPiAtICAgIGlm ICggdnBtdS0+YXJjaF92cG11X29wcyApCj4gKyAgICBpZiAoIHZwbXUtPmFyY2hfdnBtdV9vcHMg JiYgdnBtdS0+YXJjaF92cG11X29wcy0+ZG9faW50ZXJydXB0ICkKPiAgICAgICAgICByZXR1cm4g dnBtdS0+YXJjaF92cG11X29wcy0+ZG9faW50ZXJydXB0KHJlZ3MpOwo+ICAgICAgcmV0dXJuIDA7 Cj4gIH0KPiBAQCAtMTA0LDcgKzEwNCw3IEBAIHZvaWQgdnBtdV9zYXZlKHN0cnVjdCB2Y3B1ICp2 KQo+ICB7Cj4gICAgICBzdHJ1Y3QgdnBtdV9zdHJ1Y3QgKnZwbXUgPSB2Y3B1X3ZwbXUodik7Cj4g IAo+IC0gICAgaWYgKCB2cG11LT5hcmNoX3ZwbXVfb3BzICkKPiArICAgIGlmICggdnBtdS0+YXJj aF92cG11X29wcyAmJiB2cG11LT5hcmNoX3ZwbXVfb3BzLT5hcmNoX3ZwbXVfc2F2ZSApCj4gICAg ICAgICAgdnBtdS0+YXJjaF92cG11X29wcy0+YXJjaF92cG11X3NhdmUodik7Cj4gIH0KPiAgCj4g QEAgLTExMiw3ICsxMTIsNyBAQCB2b2lkIHZwbXVfbG9hZChzdHJ1Y3QgdmNwdSAqdikKPiAgewo+ ICAgICAgc3RydWN0IHZwbXVfc3RydWN0ICp2cG11ID0gdmNwdV92cG11KHYpOwo+ICAKPiAtICAg IGlmICggdnBtdS0+YXJjaF92cG11X29wcyApCj4gKyAgICBpZiAoIHZwbXUtPmFyY2hfdnBtdV9v cHMgJiYgdnBtdS0+YXJjaF92cG11X29wcy0+YXJjaF92cG11X2xvYWQgKQo+ICAgICAgICAgIHZw bXUtPmFyY2hfdnBtdV9vcHMtPmFyY2hfdnBtdV9sb2FkKHYpOwo+ICB9Cj4gIAo+IEBAIC0xMjEs OSArMTIxLDYgQEAgdm9pZCB2cG11X2luaXRpYWxpc2Uoc3RydWN0IHZjcHUgKnYpCj4gICAgICBz dHJ1Y3QgdnBtdV9zdHJ1Y3QgKnZwbXUgPSB2Y3B1X3ZwbXUodik7Cj4gICAgICB1aW50OF90IHZl bmRvciA9IGN1cnJlbnRfY3B1X2RhdGEueDg2X3ZlbmRvcjsKPiAgCj4gLSAgICBpZiAoICFvcHRf dnBtdV9lbmFibGVkICkKPiAtICAgICAgICByZXR1cm47Cj4gLQo+ICAgICAgaWYgKCB2cG11X2lz X3NldCh2cG11LCBWUE1VX0NPTlRFWFRfQUxMT0NBVEVEKSApCj4gICAgICAgICAgdnBtdV9kZXN0 cm95KHYpOwo+ICAgICAgdnBtdV9jbGVhcih2cG11KTsKPiBAQCAtMTUzLDcgKzE1MCw3IEBAIHZv aWQgdnBtdV9kZXN0cm95KHN0cnVjdCB2Y3B1ICp2KQo+ICB7Cj4gICAgICBzdHJ1Y3QgdnBtdV9z dHJ1Y3QgKnZwbXUgPSB2Y3B1X3ZwbXUodik7Cj4gIAo+IC0gICAgaWYgKCB2cG11LT5hcmNoX3Zw bXVfb3BzICkKPiArICAgIGlmICggdnBtdS0+YXJjaF92cG11X29wcyAmJiB2cG11LT5hcmNoX3Zw bXVfb3BzLT5hcmNoX3ZwbXVfZGVzdHJveSApCj4gICAgICAgICAgdnBtdS0+YXJjaF92cG11X29w cy0+YXJjaF92cG11X2Rlc3Ryb3kodik7Cj4gIH0KPiAgCj4gCj4gCi0tIApDb21wYW55IGRldGFp bHM6IGh0dHA6Ly90cy5mdWppdHN1LmNvbS9pbXByaW50Lmh0bWwKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==