From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_debug() Date: Mon, 13 Apr 2015 16:29:53 +0100 Message-ID: <87zj6cjbbi.fsf@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-6-git-send-email-alex.bennee@linaro.org> <20150413143623.GP6186@cbox> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 593554CE7C for ; Mon, 13 Apr 2015 11:22:05 -0400 (EDT) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G5bZhED-l333 for ; Mon, 13 Apr 2015 11:22:03 -0400 (EDT) Received: from socrates.bennee.com (static.88-198-71-155.clients.your-server.de [88.198.71.155]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 662AA4CE0C for ; Mon, 13 Apr 2015 11:22:03 -0400 (EDT) In-reply-to: <20150413143623.GP6186@cbox> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Christoffer Dall Cc: Lorenzo Pieralisi , Russell King , kvm@vger.kernel.org, marc.zyngier@arm.com, jan.kiszka@siemens.com, Will Deacon , open list , dahi@linux.vnet.ibm.com, Andre Przywara , Catalin Marinas , zhichao.huang@linaro.org, r65777@freescale.com, pbonzini@redhat.com, bp@suse.de, Gleb Natapov , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org List-Id: kvmarm@lists.cs.columbia.edu CkNocmlzdG9mZmVyIERhbGwgPGNocmlzdG9mZmVyLmRhbGxAbGluYXJvLm9yZz4gd3JpdGVzOgoK PiBPbiBUdWUsIE1hciAzMSwgMjAxNSBhdCAwNDowODowM1BNICswMTAwLCBBbGV4IEJlbm7DqWUg d3JvdGU6Cj4+IFRoaXMgaXMgYSBwcmVjdXJzb3IgZm9yIGxhdGVyIHBhdGNoZXMgd2hpY2ggd2ls bCBuZWVkIHRvIGRvIG1vcmUgdG8KPj4gc2V0dXAgZGVidWcgc3RhdGUgYmVmb3JlIGVudGVyaW5n IHRoZSBoeXAuUyBzd2l0Y2ggY29kZS4gVGhlIGV4aXN0aW5nCj4+IGZ1bmN0aW9uYWxpdHkgZm9y IHNldHRpbmcgbWRjcl9lbDIgaGFzIGJlZW4gbW92ZWQgb3V0IG9mIGh5cC5TIGFuZCBub3cKPj4g dXNlcyB0aGUgdmFsdWUga2VwdCBpbiB2Y3B1LT5hcmNoLm1kY3JfZWwyLgo+PiAKPj4gVGhpcyBh bHNvIG1vdmVzIHRoZSBjb25kaXRpb25hbCBzZXR0aW5nIG9mIHRoZSBUREEgYml0IGZyb20gdGhl IGh5cCBjb2RlCj4+IGludG8gdGhlIEMgY29kZS4KPj4gCj4+IFNpZ25lZC1vZmYtYnk6IEFsZXgg QmVubsOpZSA8YWxleC5iZW5uZWVAbGluYXJvLm9yZz4KPj4gCj4+ICBjcmVhdGUgbW9kZSAxMDA2 NDQgYXJjaC9hcm02NC9rdm0vZGVidWcuYwo+PiAKPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2lu Y2x1ZGUvYXNtL2t2bV9ob3N0LmggYi9hcmNoL2FybS9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4+ IGluZGV4IDQxMDA4Y2QuLjhjMDFjOTcgMTAwNjQ0Cj4+IC0tLSBhL2FyY2gvYXJtL2luY2x1ZGUv YXNtL2t2bV9ob3N0LmgKPj4gKysrIGIvYXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX2hvc3QuaAo+ PiBAQCAtMjQyLDUgKzI0Miw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBrdm1fYXJjaF9oYXJkd2Fy ZV91bnNldHVwKHZvaWQpIHt9Cj4+ICBzdGF0aWMgaW5saW5lIHZvaWQga3ZtX2FyY2hfc3luY19l dmVudHMoc3RydWN0IGt2bSAqa3ZtKSB7fQo+PiAgc3RhdGljIGlubGluZSB2b2lkIGt2bV9hcmNo X3ZjcHVfdW5pbml0KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkge30KPj4gIHN0YXRpYyBpbmxpbmUg dm9pZCBrdm1fYXJjaF9zY2hlZF9pbihzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUsIGludCBjcHUpIHt9 Cj4+ICtzdGF0aWMgaW5saW5lIHZvaWQga3ZtX2FyY2hfc2V0dXBfZGVidWcoc3RydWN0IGt2bV92 Y3B1ICp2Y3B1KSB7fQo+PiArc3RhdGljIGlubGluZSB2b2lkIGt2bV9hcmNoX2NsZWFyX2RlYnVn KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkge30KPj4gIAo+PiAgI2VuZGlmIC8qIF9fQVJNX0tWTV9I T1NUX0hfXyAqLwo+PiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0va3ZtL2FybS5jIGIvYXJjaC9hcm0v a3ZtL2FybS5jCj4+IGluZGV4IDQ0NTkzM2QuLjdlYThiMGUgMTAwNjQ0Cj4+IC0tLSBhL2FyY2gv YXJtL2t2bS9hcm0uYwo+PiArKysgYi9hcmNoL2FybS9rdm0vYXJtLmMKPj4gQEAgLTUyMyw2ICs1 MjMsNyBAQCBpbnQga3ZtX2FyY2hfdmNwdV9pb2N0bF9ydW4oc3RydWN0IGt2bV92Y3B1ICp2Y3B1 LCBzdHJ1Y3Qga3ZtX3J1biAqcnVuKQo+PiAgCj4+ICAJCWt2bV92Z2ljX2ZsdXNoX2h3c3RhdGUo dmNwdSk7Cj4+ICAJCWt2bV90aW1lcl9mbHVzaF9od3N0YXRlKHZjcHUpOwo+PiArCQlrdm1fYXJj aF9zZXR1cF9kZWJ1Zyh2Y3B1KTsKPj4gIAo+PiAgCQlsb2NhbF9pcnFfZGlzYWJsZSgpOwo+PiAg Cj4+IEBAIC01NjksNiArNTcwLDcgQEAgaW50IGt2bV9hcmNoX3ZjcHVfaW9jdGxfcnVuKHN0cnVj dCBrdm1fdmNwdSAqdmNwdSwgc3RydWN0IGt2bV9ydW4gKnJ1bikKPj4gIAkJICogQmFjayBmcm9t IGd1ZXN0Cj4+ICAJCSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqLwo+PiAgCj4+ICsJCWt2bV9hcmNoX2NsZWFyX2RlYnVnKHZjcHUp Owo+PiAgCQlrdm1fdGltZXJfc3luY19od3N0YXRlKHZjcHUpOwo+PiAgCQlrdm1fdmdpY19zeW5j X2h3c3RhdGUodmNwdSk7Cj4+ICAKPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQvaW5jbHVkZS9h c20va3ZtX2hvc3QuaCBiL2FyY2gvYXJtNjQvaW5jbHVkZS9hc20va3ZtX2hvc3QuaAo+PiBpbmRl eCA4YWMzYzcwLi4wNjMxODQwIDEwMDY0NAo+PiAtLS0gYS9hcmNoL2FybTY0L2luY2x1ZGUvYXNt L2t2bV9ob3N0LmgKPj4gKysrIGIvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4+ IEBAIC0xMDEsNiArMTAxLDcgQEAgc3RydWN0IGt2bV92Y3B1X2FyY2ggewo+PiAgCj4+ICAJLyog SFlQIGNvbmZpZ3VyYXRpb24gKi8KPj4gIAl1NjQgaGNyX2VsMjsKPj4gKwl1MzIgbWRjcl9lbDI7 Cj4+ICAKPj4gIAkvKiBFeGNlcHRpb24gSW5mb3JtYXRpb24gKi8KPj4gIAlzdHJ1Y3Qga3ZtX3Zj cHVfZmF1bHRfaW5mbyBmYXVsdDsKPj4gQEAgLTI1Nyw0ICsyNTgsNyBAQCBzdGF0aWMgaW5saW5l IHZvaWQga3ZtX2FyY2hfc3luY19ldmVudHMoc3RydWN0IGt2bSAqa3ZtKSB7fQo+PiAgc3RhdGlj IGlubGluZSB2b2lkIGt2bV9hcmNoX3ZjcHVfdW5pbml0KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkg e30KPj4gIHN0YXRpYyBpbmxpbmUgdm9pZCBrdm1fYXJjaF9zY2hlZF9pbihzdHJ1Y3Qga3ZtX3Zj cHUgKnZjcHUsIGludCBjcHUpIHt9Cj4+ICAKPj4gK3ZvaWQga3ZtX2FyY2hfc2V0dXBfZGVidWco c3RydWN0IGt2bV92Y3B1ICp2Y3B1KTsKPj4gK3ZvaWQga3ZtX2FyY2hfY2xlYXJfZGVidWcoc3Ry dWN0IGt2bV92Y3B1ICp2Y3B1KTsKPj4gKwo+PiAgI2VuZGlmIC8qIF9fQVJNNjRfS1ZNX0hPU1Rf SF9fICovCj4+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2tlcm5lbC9hc20tb2Zmc2V0cy5jIGIv YXJjaC9hcm02NC9rZXJuZWwvYXNtLW9mZnNldHMuYwo+PiBpbmRleCBmN2ZhNjVkLi5jZDA2MjA5 IDEwMDY0NAo+PiAtLS0gYS9hcmNoL2FybTY0L2tlcm5lbC9hc20tb2Zmc2V0cy5jCj4+ICsrKyBi L2FyY2gvYXJtNjQva2VybmVsL2FzbS1vZmZzZXRzLmMKPj4gQEAgLTEyMiw2ICsxMjIsNyBAQCBp bnQgbWFpbih2b2lkKQo+PiAgICBERUZJTkUoVkNQVV9IUEZBUl9FTDIsCW9mZnNldG9mKHN0cnVj dCBrdm1fdmNwdSwgYXJjaC5mYXVsdC5ocGZhcl9lbDIpKTsKPj4gICAgREVGSU5FKFZDUFVfREVC VUdfRkxBR1MsCW9mZnNldG9mKHN0cnVjdCBrdm1fdmNwdSwgYXJjaC5kZWJ1Z19mbGFncykpOwo+ PiAgICBERUZJTkUoVkNQVV9IQ1JfRUwyLAkJb2Zmc2V0b2Yoc3RydWN0IGt2bV92Y3B1LCBhcmNo Lmhjcl9lbDIpKTsKPj4gKyAgREVGSU5FKFZDUFVfTURDUl9FTDIsCW9mZnNldG9mKHN0cnVjdCBr dm1fdmNwdSwgYXJjaC5tZGNyX2VsMikpOwo+PiAgICBERUZJTkUoVkNQVV9JUlFfTElORVMsCW9m ZnNldG9mKHN0cnVjdCBrdm1fdmNwdSwgYXJjaC5pcnFfbGluZXMpKTsKPj4gICAgREVGSU5FKFZD UFVfSE9TVF9DT05URVhULAlvZmZzZXRvZihzdHJ1Y3Qga3ZtX3ZjcHUsIGFyY2guaG9zdF9jcHVf Y29udGV4dCkpOwo+PiAgICBERUZJTkUoVkNQVV9USU1FUl9DTlRWX0NUTCwJb2Zmc2V0b2Yoc3Ry dWN0IGt2bV92Y3B1LCBhcmNoLnRpbWVyX2NwdS5jbnR2X2N0bCkpOwo+PiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm02NC9rdm0vTWFrZWZpbGUgYi9hcmNoL2FybTY0L2t2bS9NYWtlZmlsZQo+PiBpbmRl eCA0ZTZlMDllLi42Nzk2ZDRhIDEwMDY0NAo+PiAtLS0gYS9hcmNoL2FybTY0L2t2bS9NYWtlZmls ZQo+PiArKysgYi9hcmNoL2FybTY0L2t2bS9NYWtlZmlsZQo+PiBAQCAtMTcsNyArMTcsNyBAQCBr dm0tJChDT05GSUdfS1ZNX0FSTV9IT1NUKSArPSAkKEFSTSkvcHNjaS5vICQoQVJNKS9wZXJmLm8K Pj4gIAo+PiAga3ZtLSQoQ09ORklHX0tWTV9BUk1fSE9TVCkgKz0gZW11bGF0ZS5vIGluamVjdF9m YXVsdC5vIHJlZ21hcC5vCj4+ICBrdm0tJChDT05GSUdfS1ZNX0FSTV9IT1NUKSArPSBoeXAubyBo eXAtaW5pdC5vIGhhbmRsZV9leGl0Lm8KPj4gLWt2bS0kKENPTkZJR19LVk1fQVJNX0hPU1QpICs9 IGd1ZXN0Lm8gcmVzZXQubyBzeXNfcmVncy5vIHN5c19yZWdzX2dlbmVyaWNfdjgubwo+PiAra3Zt LSQoQ09ORklHX0tWTV9BUk1fSE9TVCkgKz0gZ3Vlc3QubyBkZWJ1Zy5vIHJlc2V0Lm8gc3lzX3Jl Z3MubyBzeXNfcmVnc19nZW5lcmljX3Y4Lm8KPj4gIAo+PiAga3ZtLSQoQ09ORklHX0tWTV9BUk1f VkdJQykgKz0gJChLVk0pL2FybS92Z2ljLm8KPj4gIGt2bS0kKENPTkZJR19LVk1fQVJNX1ZHSUMp ICs9ICQoS1ZNKS9hcm0vdmdpYy12Mi5vCj4+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9k ZWJ1Zy5jIGIvYXJjaC9hcm02NC9rdm0vZGVidWcuYwo+PiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+ PiBpbmRleCAwMDAwMDAwLi44YTI5ZDBiCj4+IC0tLSAvZGV2L251bGwKPj4gKysrIGIvYXJjaC9h cm02NC9rdm0vZGVidWcuYwo+PiBAQCAtMCwwICsxLDU4IEBACj4+ICsvKgo+PiArICogRGVidWcg YW5kIEd1ZXN0IERlYnVnIHN1cHBvcnQKPj4gKyAqCj4+ICsgKiBDb3B5cmlnaHQgKEMpIDIwMTUg LSBMaW5hcm8gTHRkCj4+ICsgKiBBdXRob3I6IEFsZXggQmVubsOpZSA8YWxleC5iZW5uZWVAbGlu YXJvLm9yZz4KPj4gKyAqCj4+ICsgKiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQo+PiArICogaXQgdW5kZXIgdGhlIHRl cm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2ZXJzaW9uIDIgYXMKPj4gKyAq IHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLgo+PiArICoKPj4gKyAq IFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUg dXNlZnVsLAo+PiArICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhl IGltcGxpZWQgd2FycmFudHkgb2YKPj4gKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKPj4gKyAqIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCj4+ICsgKgo+PiArICogWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKPj4gKyAq IGFsb25nIHdpdGggdGhpcyBwcm9ncmFtLiAgSWYgbm90LCBzZWUgPGh0dHA6Ly93d3cuZ251Lm9y Zy9saWNlbnNlcy8+Lgo+PiArICovCj4+ICsKPj4gKyNpbmNsdWRlIDxsaW51eC9rdm1faG9zdC5o Pgo+PiArCj4+ICsjaW5jbHVkZSA8YXNtL2t2bV9hcm0uaD4KPj4gKyNpbmNsdWRlIDxhc20va3Zt X2hvc3QuaD4KPj4gKwo+PiArLyoqCj4+ICsgKiBrdm1fYXJjaF9zZXR1cF9kZWJ1ZyAtIHNldC11 cCBkZWJ1ZyByZWxhdGVkIHN0dWZmCj4KPiBuaXQ6IEkgdGhpbmsgeW91IHdhbnQgInNldCB1cCIg d2hlbiBpdCdzIGEgdmVyYi4KPgo+PiArICoKPj4gKyAqIEB2Y3B1Ogl0aGUgdmNwdSBwb2ludGVy Cj4+ICsgKgo+PiArICogVGhpcyBpcyBjYWxsZWQgYmVmb3JlIGVhY2ggZW50cnkgaW4gdG8gdGhl IGh5cGVydmlzb3IgdG8gc2V0dXAgYW55Cj4KPiBzL2luIHRvL2ludG8vCj4gcy9zZXR1cC9zZXQg dXAvCj4KPj4gKyAqIGRlYnVnIHJlbGF0ZWQgcmVnaXN0ZXJzLiBDdXJyZW50bHkgdGhpcyBqdXN0 IGVuc3VyZXMgd2Ugd2lsbCB0cmFwCj4+ICsgKiBhY2Nlc3MgdG86Cj4KPiBndWVzdCBhY2Nlc3Nl cyB0bzoKPgo+PiArICogIC0gUGVyZm9ybWFuY2UgbW9uaXRvcnMgKE1EQ1JfRUwyX1RQTS9NRENS X0VMMl9UUE1DUikKPj4gKyAqICAtIERlYnVnIFJPTSBBZGRyZXNzIChNRENSX0VMMl9URFJBKQo+ PiArICogIC0gUG93ZXIgZG93biBkZWJ1ZyByZWdpc3RlcnMgKE1EQ1JfRUwyX1RET1NBKQo+PiAr ICoKPj4gKyAqIEFkZGl0aW9uYWxseSB0aGUgaHlwZXJ2aXNvciBsYXppbHkgc2F2ZXMvcmVzdG9y ZXMgdGhlIGRlYnVnCj4+ICsgKiByZWdpc3RlciBzdGF0ZS4gSWYgaXQgaXMgbm90IGN1cnJlbnRs eSBkb2luZyBzbyAoYXJjaC5kZWJ1Z19mbGFncykKPj4gKyAqIHRoZW4gd2UgYWxzbyBuZWVkIHRv IGVuc3VyZSB3ZSB0cmFwIGlmIHRoZSBndWVzdCBtZXNzZXMgd2l0aCB0aGVtCj4+ICsgKiBzbyB3 ZSBrbm93IHdlIG5lZWQgdG8gc2F2ZSB0aGVtLgo+Cj4gVGhpcyBwYXJhZ3JhcGggaXMgYSBsaXR0 bGUgaGFyZCB0byBtYWtlIHNlbnNlIG9mLiAgSWYgSSB1bmRlcnN0YW5kIGl0Cj4gY29ycmVjdGx5 LCB0aGUgcG9pbnQgaXMgdGhhdCB3aGVuIGRlYnVnZ2luZyB0aGUgZ3Vlc3Qgd2UgbmVlZCB0byBt YWtlCj4gc3VyZSBndWVzdCBhY2Nlc3NlcyB0byB0aGUgZGVidWcgcmVnaXN0ZXJzIHRyYXBzPyAg SWYgc28sIEkgd291bGQKPiBzdWdnZXN0IHNvbWV0aGluZyBsaWtlOgo+Cj4gICBBZGRpdGlvbmFs bHksIEtWTSBvbmx5IHRyYXBzIGd1ZXN0IGFjY2Vzc2VzIHRvIHRoZSBkZWJ1ZyByZWdpc3RlcnMg aWYKPiAgIHRoZSBndWVzdCBpcyBub3QgYWN0aXZlbHkgdXNpbmcgdGhlbSAoc2VlIHRoZSBLVk1f QVJNNjRfREVCVUdfRElSVFkKPiAgIGZsYWcgb24gdmNwdS0+YXJjaC5kZWJ1Z19mbGFncykuICBT aW5jZSB0aGUgZ3Vlc3QgbXVzdCBub3QgaW50ZXJmZXJlCj4gICB3aXRoIHRoZSBoYXJkd2FyZSBz dGF0ZSB3aGVuIGRlYnVnZ2luZyB0aGUgZ3Vlc3QsIHdlIG11c3QgZW5zdXJlIHRoYXQKPiAgIHRy YXBwaW5nIGlzIGVuYWJsZWQgd2hlbmV2ZXIgd2UgYXJlIGRlYnVnZ2luZyB0aGUgZ3Vlc3QuCj4K Pj4gKyAqLwo+PiArCj4+ICt2b2lkIGt2bV9hcmNoX3NldHVwX2RlYnVnKHN0cnVjdCBrdm1fdmNw dSAqdmNwdSkKPj4gK3sKPj4gKwl2Y3B1LT5hcmNoLm1kY3JfZWwyIHw9IChNRENSX0VMMl9UUE0g fCBNRENSX0VMMl9UUE1DUik7Cj4+ICsJdmNwdS0+YXJjaC5tZGNyX2VsMiB8PSAoTURDUl9FTDJf VERSQSB8IE1EQ1JfRUwyX1RET1NBKTsKPj4gKwo+PiArCWlmICghdmNwdS0+YXJjaC5kZWJ1Z19m bGFncyAmIEtWTV9BUk02NF9ERUJVR19ESVJUWSkKPj4gKwkJdmNwdS0+YXJjaC5tZGNyX2VsMiB8 PSBNRENSX0VMMl9UREE7Cj4+ICsJZWxzZQo+PiArCQl2Y3B1LT5hcmNoLm1kY3JfZWwyICY9IH5N RENSX0VMMl9UREE7Cj4+ICsKPj4gK30KPj4gKwo+PiArdm9pZCBrdm1fYXJjaF9jbGVhcl9kZWJ1 ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCj4+ICt7Cj4+ICsJLyogTm90aGluZyB0byBkbyB5ZXQg Ki8KPj4gK30KPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva3ZtL2h5cC5TIGIvYXJjaC9hcm02 NC9rdm0vaHlwLlMKPj4gaW5kZXggNWJlZmQwMS4uYmU5MmJmZTEgMTAwNjQ0Cj4+IC0tLSBhL2Fy Y2gvYXJtNjQva3ZtL2h5cC5TCj4+ICsrKyBiL2FyY2gvYXJtNjQva3ZtL2h5cC5TCj4+IEBAIC03 NjgsMTcgKzc2OCw4IEBACj4+ICAJbW92CXgyLCAjKDEgPDwgMTUpCS8vIFRyYXAgQ1AxNSBDcj0x NQo+PiAgCW1zcgloc3RyX2VsMiwgeDIKPj4gIAo+PiAtCW1ycwl4MiwgbWRjcl9lbDIKPj4gLQlh bmQJeDIsIHgyLCAjTURDUl9FTDJfSFBNTl9NQVNLCj4+IC0Jb3JyCXgyLCB4MiwgIyhNRENSX0VM Ml9UUE0gfCBNRENSX0VMMl9UUE1DUikKPj4gLQlvcnIJeDIsIHgyLCAjKE1EQ1JfRUwyX1REUkEg fCBNRENSX0VMMl9URE9TQSkKPj4gLQo+PiAtCS8vIENoZWNrIGZvciBLVk1fQVJNNjRfREVCVUdf RElSVFksIGFuZCBzZXQgZGVidWcgdG8gdHJhcAo+PiAtCS8vIGlmIG5vdCBkaXJ0eS4KPj4gLQls ZHIJeDMsIFt4MCwgI1ZDUFVfREVCVUdfRkxBR1NdCj4+IC0JdGJuegl4MywgI0tWTV9BUk02NF9E RUJVR19ESVJUWV9TSElGVCwgMWYKPj4gLQlvcnIJeDIsIHgyLCAgI01EQ1JfRUwyX1REQQo+PiAt MToKPj4gKwkvLyBNb25pdG9yIERlYnVnIENvbmZpZyAtIHNlZSBrdm1fYXJjaF9zZXR1cF9kZWJ1 ZygpCj4+ICsJbGRyCXgyLCBbeDAsICNWQ1BVX01EQ1JfRUwyXQo+PiAgCW1zcgltZGNyX2VsMiwg eDIKPj4gIC5lbmRtCj4+ICAKPgo+IEFzIHRoZSBvdGhlciByZXZpZXdlcnMgbm90ZWQsIHRoaXMg aXMgbm93IHNldHRpbmcgdGhlIG51bWJlciBvZiBQTVUKPiBjb3VudGVycyBhY2Nlc3NpYmxlIHRv IDAuICBJJ20gZmluZSB3aXRoIGFsd2F5cyBzZXR0aW5nIG1kY3JfZWwyIGZyb20KPiBtZW1vcnks IGJ1dCBJIHRoaW5rIHdlIG5lZWQgdG8gYWRkIGNvZGUgaW4gaHlwLWluaXQuUyB0byByZWFkIFBN Q1JfRUwwLk4KPiBhbmQgc3RvcmUgdGhhdCBpbiBhIHBlci1jcHUgKG5vdCB2Y3B1KSB2YXJpYWJs ZSBhbmQgY29uZmlndXJlIG1kY3JfZWwyCj4gdXNpbmcgdGhhdCB2YWx1ZSBpbiBrdm1fYXJjaF9z ZXRfZGVidWcoKSwgYnV0IHRoZW4geW91IG5lZWQgdG8gY2FsbAo+IGt2bV9hcmNoX3NldF9kZWJ1 ZygpIGZyb20gYSBub24tcHJlZW1wdGlibGUgc2VjdGlvbiwgd2hpY2ggaXMgcHJvYmFibHkgYQo+ IGdvb2QgaWRlYSBhbnl3YXkuICBOb3RlIHRoYXQgSSBjb3VsZG4ndCBzZWUgdGhhdCB3ZSBhcmUg aW5pdGlhbGl6aW5nCj4gTURDUl9FTDIgYW55d2hlcmUsIHNvIHRoYXQgc2hvdWxkIHByb2JhYmx5 IGJlIGEgc2VwYXJhdGUgZml4LgoKWWVhaCBiZWNhdXNlIEkgY291bGRuJ3Qgc2VlIGl0IGJlaW5n IHNldCBJIGZpZ3VyZWQgaXQgd2FzIE9LIHRvIGJsYXQgaXQKd2l0aCB6ZXJvcy4gQnV0IHlvdSBh cmUgcmlnaHQgd2Ugc2hvdWxkIHNldCBpdCB1cCBwcm9wZXJseSBpZiB3ZSBhcmUKZ29pbmcgdG8g bWVzcyB3aXRoIGl0LgoKPgo+IFRoYW5rcywKPiAtQ2hyaXN0b2ZmZXIKCi0tIApBbGV4IEJlbm7D qWUKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18Ka3ZtYXJt IG1haWxpbmcgbGlzdAprdm1hcm1AbGlzdHMuY3MuY29sdW1iaWEuZWR1Cmh0dHBzOi8vbGlzdHMu Y3MuY29sdW1iaWEuZWR1L21haWxtYW4vbGlzdGluZm8va3ZtYXJtCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: alex.bennee@linaro.org (Alex =?utf-8?Q?Benn=C3=A9e?=) Date: Mon, 13 Apr 2015 16:29:53 +0100 Subject: [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_debug() In-Reply-To: <20150413143623.GP6186@cbox> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-6-git-send-email-alex.bennee@linaro.org> <20150413143623.GP6186@cbox> Message-ID: <87zj6cjbbi.fsf@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Christoffer Dall writes: > On Tue, Mar 31, 2015 at 04:08:03PM +0100, Alex Benn?e wrote: >> This is a precursor for later patches which will need to do more to >> setup debug state before entering the hyp.S switch code. The existing >> functionality for setting mdcr_el2 has been moved out of hyp.S and now >> uses the value kept in vcpu->arch.mdcr_el2. >> >> This also moves the conditional setting of the TDA bit from the hyp code >> into the C code. >> >> Signed-off-by: Alex Benn?e >> >> create mode 100644 arch/arm64/kvm/debug.c >> >> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h >> index 41008cd..8c01c97 100644 >> --- a/arch/arm/include/asm/kvm_host.h >> +++ b/arch/arm/include/asm/kvm_host.h >> @@ -242,5 +242,7 @@ static inline void kvm_arch_hardware_unsetup(void) {} >> static inline void kvm_arch_sync_events(struct kvm *kvm) {} >> static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} >> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} >> +static inline void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) {} >> +static inline void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) {} >> >> #endif /* __ARM_KVM_HOST_H__ */ >> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c >> index 445933d..7ea8b0e 100644 >> --- a/arch/arm/kvm/arm.c >> +++ b/arch/arm/kvm/arm.c >> @@ -523,6 +523,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) >> >> kvm_vgic_flush_hwstate(vcpu); >> kvm_timer_flush_hwstate(vcpu); >> + kvm_arch_setup_debug(vcpu); >> >> local_irq_disable(); >> >> @@ -569,6 +570,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) >> * Back from guest >> *************************************************************/ >> >> + kvm_arch_clear_debug(vcpu); >> kvm_timer_sync_hwstate(vcpu); >> kvm_vgic_sync_hwstate(vcpu); >> >> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h >> index 8ac3c70..0631840 100644 >> --- a/arch/arm64/include/asm/kvm_host.h >> +++ b/arch/arm64/include/asm/kvm_host.h >> @@ -101,6 +101,7 @@ struct kvm_vcpu_arch { >> >> /* HYP configuration */ >> u64 hcr_el2; >> + u32 mdcr_el2; >> >> /* Exception Information */ >> struct kvm_vcpu_fault_info fault; >> @@ -257,4 +258,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} >> static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} >> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} >> >> +void kvm_arch_setup_debug(struct kvm_vcpu *vcpu); >> +void kvm_arch_clear_debug(struct kvm_vcpu *vcpu); >> + >> #endif /* __ARM64_KVM_HOST_H__ */ >> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c >> index f7fa65d..cd06209 100644 >> --- a/arch/arm64/kernel/asm-offsets.c >> +++ b/arch/arm64/kernel/asm-offsets.c >> @@ -122,6 +122,7 @@ int main(void) >> DEFINE(VCPU_HPFAR_EL2, offsetof(struct kvm_vcpu, arch.fault.hpfar_el2)); >> DEFINE(VCPU_DEBUG_FLAGS, offsetof(struct kvm_vcpu, arch.debug_flags)); >> DEFINE(VCPU_HCR_EL2, offsetof(struct kvm_vcpu, arch.hcr_el2)); >> + DEFINE(VCPU_MDCR_EL2, offsetof(struct kvm_vcpu, arch.mdcr_el2)); >> DEFINE(VCPU_IRQ_LINES, offsetof(struct kvm_vcpu, arch.irq_lines)); >> DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); >> DEFINE(VCPU_TIMER_CNTV_CTL, offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl)); >> diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile >> index 4e6e09e..6796d4a 100644 >> --- a/arch/arm64/kvm/Makefile >> +++ b/arch/arm64/kvm/Makefile >> @@ -17,7 +17,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o >> >> kvm-$(CONFIG_KVM_ARM_HOST) += emulate.o inject_fault.o regmap.o >> kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o >> -kvm-$(CONFIG_KVM_ARM_HOST) += guest.o reset.o sys_regs.o sys_regs_generic_v8.o >> +kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o >> >> kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o >> kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o >> diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c >> new file mode 100644 >> index 0000000..8a29d0b >> --- /dev/null >> +++ b/arch/arm64/kvm/debug.c >> @@ -0,0 +1,58 @@ >> +/* >> + * Debug and Guest Debug support >> + * >> + * Copyright (C) 2015 - Linaro Ltd >> + * Author: Alex Benn?e >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program. If not, see . >> + */ >> + >> +#include >> + >> +#include >> +#include >> + >> +/** >> + * kvm_arch_setup_debug - set-up debug related stuff > > nit: I think you want "set up" when it's a verb. > >> + * >> + * @vcpu: the vcpu pointer >> + * >> + * This is called before each entry in to the hypervisor to setup any > > s/in to/into/ > s/setup/set up/ > >> + * debug related registers. Currently this just ensures we will trap >> + * access to: > > guest accesses to: > >> + * - Performance monitors (MDCR_EL2_TPM/MDCR_EL2_TPMCR) >> + * - Debug ROM Address (MDCR_EL2_TDRA) >> + * - Power down debug registers (MDCR_EL2_TDOSA) >> + * >> + * Additionally the hypervisor lazily saves/restores the debug >> + * register state. If it is not currently doing so (arch.debug_flags) >> + * then we also need to ensure we trap if the guest messes with them >> + * so we know we need to save them. > > This paragraph is a little hard to make sense of. If I understand it > correctly, the point is that when debugging the guest we need to make > sure guest accesses to the debug registers traps? If so, I would > suggest something like: > > Additionally, KVM only traps guest accesses to the debug registers if > the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY > flag on vcpu->arch.debug_flags). Since the guest must not interfere > with the hardware state when debugging the guest, we must ensure that > trapping is enabled whenever we are debugging the guest. > >> + */ >> + >> +void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) >> +{ >> + vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM | MDCR_EL2_TPMCR); >> + vcpu->arch.mdcr_el2 |= (MDCR_EL2_TDRA | MDCR_EL2_TDOSA); >> + >> + if (!vcpu->arch.debug_flags & KVM_ARM64_DEBUG_DIRTY) >> + vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA; >> + else >> + vcpu->arch.mdcr_el2 &= ~MDCR_EL2_TDA; >> + >> +} >> + >> +void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) >> +{ >> + /* Nothing to do yet */ >> +} >> diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S >> index 5befd01..be92bfe1 100644 >> --- a/arch/arm64/kvm/hyp.S >> +++ b/arch/arm64/kvm/hyp.S >> @@ -768,17 +768,8 @@ >> mov x2, #(1 << 15) // Trap CP15 Cr=15 >> msr hstr_el2, x2 >> >> - mrs x2, mdcr_el2 >> - and x2, x2, #MDCR_EL2_HPMN_MASK >> - orr x2, x2, #(MDCR_EL2_TPM | MDCR_EL2_TPMCR) >> - orr x2, x2, #(MDCR_EL2_TDRA | MDCR_EL2_TDOSA) >> - >> - // Check for KVM_ARM64_DEBUG_DIRTY, and set debug to trap >> - // if not dirty. >> - ldr x3, [x0, #VCPU_DEBUG_FLAGS] >> - tbnz x3, #KVM_ARM64_DEBUG_DIRTY_SHIFT, 1f >> - orr x2, x2, #MDCR_EL2_TDA >> -1: >> + // Monitor Debug Config - see kvm_arch_setup_debug() >> + ldr x2, [x0, #VCPU_MDCR_EL2] >> msr mdcr_el2, x2 >> .endm >> > > As the other reviewers noted, this is now setting the number of PMU > counters accessible to 0. I'm fine with always setting mdcr_el2 from > memory, but I think we need to add code in hyp-init.S to read PMCR_EL0.N > and store that in a per-cpu (not vcpu) variable and configure mdcr_el2 > using that value in kvm_arch_set_debug(), but then you need to call > kvm_arch_set_debug() from a non-preemptible section, which is probably a > good idea anyway. Note that I couldn't see that we are initializing > MDCR_EL2 anywhere, so that should probably be a separate fix. Yeah because I couldn't see it being set I figured it was OK to blat it with zeros. But you are right we should set it up properly if we are going to mess with it. > > Thanks, > -Christoffer -- Alex Benn?e From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932381AbbDMP34 (ORCPT ); Mon, 13 Apr 2015 11:29:56 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:57816 "EHLO socrates.bennee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932101AbbDMP3y (ORCPT ); Mon, 13 Apr 2015 11:29:54 -0400 References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-6-git-send-email-alex.bennee@linaro.org> <20150413143623.GP6186@cbox> From: Alex =?utf-8?Q?Benn=C3=A9e?= To: Christoffer Dall Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, marc.zyngier@arm.com, peter.maydell@linaro.org, agraf@suse.de, drjones@redhat.com, pbonzini@redhat.com, zhichao.huang@linaro.org, jan.kiszka@siemens.com, dahi@linux.vnet.ibm.com, r65777@freescale.com, bp@suse.de, Gleb Natapov , Russell King , Catalin Marinas , Will Deacon , Andre Przywara , Lorenzo Pieralisi , open list Subject: Re: [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_debug() In-reply-to: <20150413143623.GP6186@cbox> Date: Mon, 13 Apr 2015 16:29:53 +0100 Message-ID: <87zj6cjbbi.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Christoffer Dall writes: > On Tue, Mar 31, 2015 at 04:08:03PM +0100, Alex Bennée wrote: >> This is a precursor for later patches which will need to do more to >> setup debug state before entering the hyp.S switch code. The existing >> functionality for setting mdcr_el2 has been moved out of hyp.S and now >> uses the value kept in vcpu->arch.mdcr_el2. >> >> This also moves the conditional setting of the TDA bit from the hyp code >> into the C code. >> >> Signed-off-by: Alex Bennée >> >> create mode 100644 arch/arm64/kvm/debug.c >> >> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h >> index 41008cd..8c01c97 100644 >> --- a/arch/arm/include/asm/kvm_host.h >> +++ b/arch/arm/include/asm/kvm_host.h >> @@ -242,5 +242,7 @@ static inline void kvm_arch_hardware_unsetup(void) {} >> static inline void kvm_arch_sync_events(struct kvm *kvm) {} >> static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} >> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} >> +static inline void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) {} >> +static inline void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) {} >> >> #endif /* __ARM_KVM_HOST_H__ */ >> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c >> index 445933d..7ea8b0e 100644 >> --- a/arch/arm/kvm/arm.c >> +++ b/arch/arm/kvm/arm.c >> @@ -523,6 +523,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) >> >> kvm_vgic_flush_hwstate(vcpu); >> kvm_timer_flush_hwstate(vcpu); >> + kvm_arch_setup_debug(vcpu); >> >> local_irq_disable(); >> >> @@ -569,6 +570,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) >> * Back from guest >> *************************************************************/ >> >> + kvm_arch_clear_debug(vcpu); >> kvm_timer_sync_hwstate(vcpu); >> kvm_vgic_sync_hwstate(vcpu); >> >> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h >> index 8ac3c70..0631840 100644 >> --- a/arch/arm64/include/asm/kvm_host.h >> +++ b/arch/arm64/include/asm/kvm_host.h >> @@ -101,6 +101,7 @@ struct kvm_vcpu_arch { >> >> /* HYP configuration */ >> u64 hcr_el2; >> + u32 mdcr_el2; >> >> /* Exception Information */ >> struct kvm_vcpu_fault_info fault; >> @@ -257,4 +258,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} >> static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} >> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} >> >> +void kvm_arch_setup_debug(struct kvm_vcpu *vcpu); >> +void kvm_arch_clear_debug(struct kvm_vcpu *vcpu); >> + >> #endif /* __ARM64_KVM_HOST_H__ */ >> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c >> index f7fa65d..cd06209 100644 >> --- a/arch/arm64/kernel/asm-offsets.c >> +++ b/arch/arm64/kernel/asm-offsets.c >> @@ -122,6 +122,7 @@ int main(void) >> DEFINE(VCPU_HPFAR_EL2, offsetof(struct kvm_vcpu, arch.fault.hpfar_el2)); >> DEFINE(VCPU_DEBUG_FLAGS, offsetof(struct kvm_vcpu, arch.debug_flags)); >> DEFINE(VCPU_HCR_EL2, offsetof(struct kvm_vcpu, arch.hcr_el2)); >> + DEFINE(VCPU_MDCR_EL2, offsetof(struct kvm_vcpu, arch.mdcr_el2)); >> DEFINE(VCPU_IRQ_LINES, offsetof(struct kvm_vcpu, arch.irq_lines)); >> DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); >> DEFINE(VCPU_TIMER_CNTV_CTL, offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl)); >> diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile >> index 4e6e09e..6796d4a 100644 >> --- a/arch/arm64/kvm/Makefile >> +++ b/arch/arm64/kvm/Makefile >> @@ -17,7 +17,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o >> >> kvm-$(CONFIG_KVM_ARM_HOST) += emulate.o inject_fault.o regmap.o >> kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o >> -kvm-$(CONFIG_KVM_ARM_HOST) += guest.o reset.o sys_regs.o sys_regs_generic_v8.o >> +kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o >> >> kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o >> kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o >> diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c >> new file mode 100644 >> index 0000000..8a29d0b >> --- /dev/null >> +++ b/arch/arm64/kvm/debug.c >> @@ -0,0 +1,58 @@ >> +/* >> + * Debug and Guest Debug support >> + * >> + * Copyright (C) 2015 - Linaro Ltd >> + * Author: Alex Bennée >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program. If not, see . >> + */ >> + >> +#include >> + >> +#include >> +#include >> + >> +/** >> + * kvm_arch_setup_debug - set-up debug related stuff > > nit: I think you want "set up" when it's a verb. > >> + * >> + * @vcpu: the vcpu pointer >> + * >> + * This is called before each entry in to the hypervisor to setup any > > s/in to/into/ > s/setup/set up/ > >> + * debug related registers. Currently this just ensures we will trap >> + * access to: > > guest accesses to: > >> + * - Performance monitors (MDCR_EL2_TPM/MDCR_EL2_TPMCR) >> + * - Debug ROM Address (MDCR_EL2_TDRA) >> + * - Power down debug registers (MDCR_EL2_TDOSA) >> + * >> + * Additionally the hypervisor lazily saves/restores the debug >> + * register state. If it is not currently doing so (arch.debug_flags) >> + * then we also need to ensure we trap if the guest messes with them >> + * so we know we need to save them. > > This paragraph is a little hard to make sense of. If I understand it > correctly, the point is that when debugging the guest we need to make > sure guest accesses to the debug registers traps? If so, I would > suggest something like: > > Additionally, KVM only traps guest accesses to the debug registers if > the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY > flag on vcpu->arch.debug_flags). Since the guest must not interfere > with the hardware state when debugging the guest, we must ensure that > trapping is enabled whenever we are debugging the guest. > >> + */ >> + >> +void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) >> +{ >> + vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM | MDCR_EL2_TPMCR); >> + vcpu->arch.mdcr_el2 |= (MDCR_EL2_TDRA | MDCR_EL2_TDOSA); >> + >> + if (!vcpu->arch.debug_flags & KVM_ARM64_DEBUG_DIRTY) >> + vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA; >> + else >> + vcpu->arch.mdcr_el2 &= ~MDCR_EL2_TDA; >> + >> +} >> + >> +void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) >> +{ >> + /* Nothing to do yet */ >> +} >> diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S >> index 5befd01..be92bfe1 100644 >> --- a/arch/arm64/kvm/hyp.S >> +++ b/arch/arm64/kvm/hyp.S >> @@ -768,17 +768,8 @@ >> mov x2, #(1 << 15) // Trap CP15 Cr=15 >> msr hstr_el2, x2 >> >> - mrs x2, mdcr_el2 >> - and x2, x2, #MDCR_EL2_HPMN_MASK >> - orr x2, x2, #(MDCR_EL2_TPM | MDCR_EL2_TPMCR) >> - orr x2, x2, #(MDCR_EL2_TDRA | MDCR_EL2_TDOSA) >> - >> - // Check for KVM_ARM64_DEBUG_DIRTY, and set debug to trap >> - // if not dirty. >> - ldr x3, [x0, #VCPU_DEBUG_FLAGS] >> - tbnz x3, #KVM_ARM64_DEBUG_DIRTY_SHIFT, 1f >> - orr x2, x2, #MDCR_EL2_TDA >> -1: >> + // Monitor Debug Config - see kvm_arch_setup_debug() >> + ldr x2, [x0, #VCPU_MDCR_EL2] >> msr mdcr_el2, x2 >> .endm >> > > As the other reviewers noted, this is now setting the number of PMU > counters accessible to 0. I'm fine with always setting mdcr_el2 from > memory, but I think we need to add code in hyp-init.S to read PMCR_EL0.N > and store that in a per-cpu (not vcpu) variable and configure mdcr_el2 > using that value in kvm_arch_set_debug(), but then you need to call > kvm_arch_set_debug() from a non-preemptible section, which is probably a > good idea anyway. Note that I couldn't see that we are initializing > MDCR_EL2 anywhere, so that should probably be a separate fix. Yeah because I couldn't see it being set I figured it was OK to blat it with zeros. But you are right we should set it up properly if we are going to mess with it. > > Thanks, > -Christoffer -- Alex Bennée