From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755216AbbCaPdN (ORCPT ); Tue, 31 Mar 2015 11:33:13 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:48273 "EHLO socrates.bennee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754231AbbCaPdK (ORCPT ); Tue, 31 Mar 2015 11:33:10 -0400 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, peter.maydell@linaro.org, agraf@suse.de, drjones@redhat.com, pbonzini@redhat.com, zhichao.huang@linaro.org Cc: jan.kiszka@siemens.com, dahi@linux.vnet.ibm.com, r65777@freescale.com, bp@suse.de, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gleb Natapov , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 10/10] KVM: arm64: add trace points for guest_debug debug Date: Tue, 31 Mar 2015 16:08:08 +0100 Message-Id: <1427814488-28467-11-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.3.4 In-Reply-To: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@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 This includes trace points for: kvm_arch_setup_guest_debug kvm_arch_clear_guest_debug kvm_handle_guest_debug I've also added some generic register setting trace events so I can watch the register values being built up over time. The local dump_dbg_regs() function dumps all the HW BKPT and WPT registers. I've also added a #define trace_dreg to shorten some lines. Signed-off-by: Alex BennĂ©e diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c index 638c111..7c96288 100644 --- a/arch/arm64/kvm/debug.c +++ b/arch/arm64/kvm/debug.c @@ -25,12 +25,37 @@ #include #include +#include "trace.h" + +#define trace_dreg(name, value) trace_kvm_arch_setup_debug_reg32(name, value) + /* These are the bits of MDSCR_EL1 we may mess with */ #define MDSCR_EL1_DEBUG_BITS (DBG_MDSCR_SS | \ DBG_MDSCR_KDE | \ DBG_MDSCR_MDE) /** + * dump_dbg_regs - simple debug helper + * + * This provides a simple helper to dump the HW debug registers + */ +static void dump_dbg_regs(struct kvm_vcpu *vcpu, int nb, int nw) +{ + int i; + + for (i = 0; i < nb; i++) { + trace_printk("bkpt%d: 0x%08x:0x%llx\n", i, + (u32) vcpu_sys_reg(vcpu, DBGBCR0_EL1 + i), + vcpu_sys_reg(vcpu, DBGBVR0_EL1 + i)); + } + for (i = 0; i < nb; i++) { + trace_printk("wtpt%d: 0x%08x:0x%llx\n", i, + (u32) vcpu_sys_reg(vcpu, DBGWCR0_EL1 + i), + vcpu_sys_reg(vcpu, DBGWVR0_EL1 + i)); + } +} + +/** * kvm_arch_setup_debug - set-up debug related stuff * * @vcpu: the vcpu pointer @@ -52,9 +77,13 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) { bool trap_debug = false; + trace_kvm_arch_setup_debug(vcpu->guest_debug); + vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM | MDCR_EL2_TPMCR); vcpu->arch.mdcr_el2 |= (MDCR_EL2_TDRA | MDCR_EL2_TDOSA); + trace_kvm_arch_setup_debug_reg32("MDCR_EL2", vcpu->arch.mdcr_el2); + /* * If we are not treating debug registers are dirty we need * to trap if the guest starts accessing them. @@ -66,6 +95,8 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) if (vcpu->guest_debug) { vcpu->arch.mdcr_el2 |= MDCR_EL2_TDE; + trace_dreg("MDCR_EL2", vcpu->arch.mdcr_el2); + /* Save pstate/mdscr */ vcpu_debug_saved_reg(vcpu, pstate_ss_bit) = *vcpu_cpsr(vcpu) & DBG_SPSR_SS; @@ -73,6 +104,11 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) vcpu_debug_saved_reg(vcpu, mdscr_el1) = vcpu_sys_reg(vcpu, MDSCR_EL1); + trace_dreg("Save: PSTATE.SS", + vcpu_debug_saved_reg(vcpu, pstate_ss_bit)); + trace_dreg("Save: MDSCR", + vcpu_debug_saved_reg(vcpu, mdscr_el1)); + /* * Single Step (ARM ARM D2.12.3 The software step state * machine) @@ -88,6 +124,8 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; vcpu_sys_reg(vcpu, MDSCR_EL1) &= ~DBG_MDSCR_SS; } + trace_dreg("SPSR_EL2", *vcpu_cpsr(vcpu)); + trace_dreg("MDSCR_EL1", vcpu_sys_reg(vcpu, MDSCR_EL1)); /* * HW Break/Watch points @@ -136,6 +174,9 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) &host->dbg_wvr, sizeof(__u64)*nw); + if (trace_kvm_arch_setup_debug_reg32_enabled()) + dump_dbg_regs(vcpu, nb, nw); + /* Make sure hyp.S copies them in/out */ vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY; /* Also track guest changes */ @@ -147,15 +188,24 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) vcpu->arch.mdcr_el2 &= ~MDCR_EL2_TDE; } + trace_kvm_arch_setup_debug_reg32("MDCR_EL2", vcpu->arch.mdcr_el2); + trace_kvm_arch_setup_debug_reg32("MDSCR_EL1", + vcpu_sys_reg(vcpu, MDSCR_EL1)); + + /* Trap debug register access? */ if (trap_debug) vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA; else vcpu->arch.mdcr_el2 &= ~MDCR_EL2_TDA; + + trace_kvm_arch_setup_debug_reg32("MDCR_EL2", vcpu->arch.mdcr_el2); } void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) { + trace_kvm_arch_clear_debug(vcpu->guest_debug); + if (vcpu->guest_debug) { /* Restore pstate/mdscr bits we may have messed with */ *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; @@ -164,6 +214,8 @@ void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) vcpu_sys_reg(vcpu, MDSCR_EL1) = vcpu_debug_saved_reg(vcpu, mdscr_el1); + trace_dreg("SPSR_EL2", *vcpu_cpsr(vcpu)); + trace_dreg("MDSCR_EL1", vcpu_sys_reg(vcpu, MDSCR_EL1)); /* * If we were using HW debug we need to restore the * values the guest had set them up with @@ -188,6 +240,10 @@ void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) memcpy(&vcpu_sys_reg(vcpu, DBGWVR0_EL1), ®s->dbg_wvr, sizeof(__u64)*nw); + + if (trace_kvm_arch_setup_debug_reg32_enabled()) + dump_dbg_regs(vcpu, nb, nw); + } } } diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 460a1aa..c6cc69a 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -97,6 +97,8 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run) { u32 hsr = kvm_vcpu_get_hsr(vcpu); + trace_kvm_handle_guest_debug(*vcpu_pc(vcpu), hsr); + run->exit_reason = KVM_EXIT_DEBUG; run->debug.arch.hsr = hsr; diff --git a/arch/arm64/kvm/trace.h b/arch/arm64/kvm/trace.h index 157416e9..dffdb49 100644 --- a/arch/arm64/kvm/trace.h +++ b/arch/arm64/kvm/trace.h @@ -44,6 +44,72 @@ TRACE_EVENT(kvm_hvc_arm64, __entry->vcpu_pc, __entry->r0, __entry->imm) ); +TRACE_EVENT(kvm_handle_guest_debug, + TP_PROTO(unsigned long vcpu_pc, u32 hsr), + TP_ARGS(vcpu_pc, hsr), + + TP_STRUCT__entry( + __field(unsigned long, vcpu_pc) + __field(u32, hsr) + ), + + TP_fast_assign( + __entry->vcpu_pc = vcpu_pc; + __entry->hsr = hsr; + ), + + TP_printk("debug exception at 0x%08lx (HSR: 0x%08x)", + __entry->vcpu_pc, __entry->hsr) +); + + +TRACE_EVENT(kvm_arch_setup_debug, + TP_PROTO(__u32 guest_debug), + TP_ARGS(guest_debug), + + TP_STRUCT__entry( + __field(__u32, guest_debug) + ), + + TP_fast_assign( + __entry->guest_debug = guest_debug; + ), + + TP_printk("flags: 0x%08x", __entry->guest_debug) +); + +TRACE_EVENT(kvm_arch_clear_debug, + TP_PROTO(__u32 guest_debug), + TP_ARGS(guest_debug), + + TP_STRUCT__entry( + __field(__u32, guest_debug) + ), + + TP_fast_assign( + __entry->guest_debug = guest_debug; + ), + + TP_printk("flags: 0x%08x", __entry->guest_debug) +); + +TRACE_EVENT(kvm_arch_setup_debug_reg32, + TP_PROTO(const char *name, __u32 value), + TP_ARGS(name, value), + + TP_STRUCT__entry( + __field(const char *, name) + __field(__u32, value) + ), + + TP_fast_assign( + __entry->name = name; + __entry->value = value; + ), + + TP_printk("%s now 0x%08x", __entry->name, __entry->value) +); + #endif /* _TRACE_ARM64_KVM_H */ #undef TRACE_INCLUDE_PATH -- 2.3.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 10/10] KVM: arm64: add trace points for guest_debug debug Date: Tue, 31 Mar 2015 16:08:08 +0100 Message-ID: <1427814488-28467-11-git-send-email-alex.bennee@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Catalin Marinas , Gleb Natapov , jan.kiszka@siemens.com, Will Deacon , open list , dahi@linux.vnet.ibm.com, r65777@freescale.com, bp@suse.de To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, peter.maydell@linaro.org, agraf@suse.de, drjones@redhat.com, pbonzini@redhat.com, zhichao.huang@linaro.org Return-path: In-Reply-To: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> 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 List-Id: kvm.vger.kernel.org VGhpcyBpbmNsdWRlcyB0cmFjZSBwb2ludHMgZm9yOgogIGt2bV9hcmNoX3NldHVwX2d1ZXN0X2Rl YnVnCiAga3ZtX2FyY2hfY2xlYXJfZ3Vlc3RfZGVidWcKICBrdm1faGFuZGxlX2d1ZXN0X2RlYnVn CgpJJ3ZlIGFsc28gYWRkZWQgc29tZSBnZW5lcmljIHJlZ2lzdGVyIHNldHRpbmcgdHJhY2UgZXZl bnRzIHNvIEkgY2FuCndhdGNoIHRoZSByZWdpc3RlciB2YWx1ZXMgYmVpbmcgYnVpbHQgdXAgb3Zl ciB0aW1lLiBUaGUgbG9jYWwKZHVtcF9kYmdfcmVncygpIGZ1bmN0aW9uIGR1bXBzIGFsbCB0aGUg SFcgQktQVCBhbmQgV1BUIHJlZ2lzdGVycy4KCkkndmUgYWxzbyBhZGRlZCBhICNkZWZpbmUgdHJh Y2VfZHJlZyB0byBzaG9ydGVuIHNvbWUgbGluZXMuCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IEJlbm7D qWUgPGFsZXguYmVubmVlQGxpbmFyby5vcmc+CgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9rdm0v ZGVidWcuYyBiL2FyY2gvYXJtNjQva3ZtL2RlYnVnLmMKaW5kZXggNjM4YzExMS4uN2M5NjI4OCAx MDA2NDQKLS0tIGEvYXJjaC9hcm02NC9rdm0vZGVidWcuYworKysgYi9hcmNoL2FybTY0L2t2bS9k ZWJ1Zy5jCkBAIC0yNSwxMiArMjUsMzcgQEAKICNpbmNsdWRlIDxhc20va3ZtX2hvc3QuaD4KICNp bmNsdWRlIDxhc20va3ZtX2VtdWxhdGUuaD4KIAorI2luY2x1ZGUgInRyYWNlLmgiCisKKyNkZWZp bmUgdHJhY2VfZHJlZyhuYW1lLCB2YWx1ZSkgdHJhY2Vfa3ZtX2FyY2hfc2V0dXBfZGVidWdfcmVn MzIobmFtZSwgdmFsdWUpCisKIC8qIFRoZXNlIGFyZSB0aGUgYml0cyBvZiBNRFNDUl9FTDEgd2Ug bWF5IG1lc3Mgd2l0aCAqLwogI2RlZmluZSBNRFNDUl9FTDFfREVCVUdfQklUUwkoREJHX01EU0NS X1NTIHwgXAogCQkJCURCR19NRFNDUl9LREUgfCBcCiAJCQkJREJHX01EU0NSX01ERSkKIAogLyoq CisgKiBkdW1wX2RiZ19yZWdzIC0gc2ltcGxlIGRlYnVnIGhlbHBlcgorICoKKyAqIFRoaXMgcHJv dmlkZXMgYSBzaW1wbGUgaGVscGVyIHRvIGR1bXAgdGhlIEhXIGRlYnVnIHJlZ2lzdGVycworICov CitzdGF0aWMgdm9pZCBkdW1wX2RiZ19yZWdzKHN0cnVjdCBrdm1fdmNwdSAqdmNwdSwgaW50IG5i LCBpbnQgbncpCit7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgbmI7IGkrKykgeworCQl0 cmFjZV9wcmludGsoImJrcHQlZDogMHglMDh4OjB4JWxseFxuIiwgaSwKKwkJCSh1MzIpIHZjcHVf c3lzX3JlZyh2Y3B1LCBEQkdCQ1IwX0VMMSArIGkpLAorCQkJdmNwdV9zeXNfcmVnKHZjcHUsIERC R0JWUjBfRUwxICsgaSkpOworCX0KKwlmb3IgKGkgPSAwOyBpIDwgbmI7IGkrKykgeworCQl0cmFj ZV9wcmludGsoInd0cHQlZDogMHglMDh4OjB4JWxseFxuIiwgaSwKKwkJCSh1MzIpIHZjcHVfc3lz X3JlZyh2Y3B1LCBEQkdXQ1IwX0VMMSArIGkpLAorCQkJdmNwdV9zeXNfcmVnKHZjcHUsIERCR1dW UjBfRUwxICsgaSkpOworCX0KK30KKworLyoqCiAgKiBrdm1fYXJjaF9zZXR1cF9kZWJ1ZyAtIHNl dC11cCBkZWJ1ZyByZWxhdGVkIHN0dWZmCiAgKgogICogQHZjcHU6CXRoZSB2Y3B1IHBvaW50ZXIK QEAgLTUyLDkgKzc3LDEzIEBAIHZvaWQga3ZtX2FyY2hfc2V0dXBfZGVidWcoc3RydWN0IGt2bV92 Y3B1ICp2Y3B1KQogewogCWJvb2wgdHJhcF9kZWJ1ZyA9IGZhbHNlOwogCisJdHJhY2Vfa3ZtX2Fy Y2hfc2V0dXBfZGVidWcodmNwdS0+Z3Vlc3RfZGVidWcpOworCiAJdmNwdS0+YXJjaC5tZGNyX2Vs MiB8PSAoTURDUl9FTDJfVFBNIHwgTURDUl9FTDJfVFBNQ1IpOwogCXZjcHUtPmFyY2gubWRjcl9l bDIgfD0gKE1EQ1JfRUwyX1REUkEgfCBNRENSX0VMMl9URE9TQSk7CiAKKwl0cmFjZV9rdm1fYXJj aF9zZXR1cF9kZWJ1Z19yZWczMigiTURDUl9FTDIiLCB2Y3B1LT5hcmNoLm1kY3JfZWwyKTsKKwog CS8qCiAJICogSWYgd2UgYXJlIG5vdCB0cmVhdGluZyBkZWJ1ZyByZWdpc3RlcnMgYXJlIGRpcnR5 IHdlIG5lZWQKIAkgKiB0byB0cmFwIGlmIHRoZSBndWVzdCBzdGFydHMgYWNjZXNzaW5nIHRoZW0u CkBAIC02Niw2ICs5NSw4IEBAIHZvaWQga3ZtX2FyY2hfc2V0dXBfZGVidWcoc3RydWN0IGt2bV92 Y3B1ICp2Y3B1KQogCWlmICh2Y3B1LT5ndWVzdF9kZWJ1ZykgewogCQl2Y3B1LT5hcmNoLm1kY3Jf ZWwyIHw9IE1EQ1JfRUwyX1RERTsKIAorCQl0cmFjZV9kcmVnKCJNRENSX0VMMiIsIHZjcHUtPmFy Y2gubWRjcl9lbDIpOworCiAJCS8qIFNhdmUgcHN0YXRlL21kc2NyICovCiAJCXZjcHVfZGVidWdf c2F2ZWRfcmVnKHZjcHUsIHBzdGF0ZV9zc19iaXQpID0KIAkJCSp2Y3B1X2Nwc3IodmNwdSkgJiBE QkdfU1BTUl9TUzsKQEAgLTczLDYgKzEwNCwxMSBAQCB2b2lkIGt2bV9hcmNoX3NldHVwX2RlYnVn KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkKIAkJdmNwdV9kZWJ1Z19zYXZlZF9yZWcodmNwdSwgbWRz Y3JfZWwxKSA9CiAJCQl2Y3B1X3N5c19yZWcodmNwdSwgTURTQ1JfRUwxKTsKIAorCQl0cmFjZV9k cmVnKCJTYXZlOiBQU1RBVEUuU1MiLAorCQkJdmNwdV9kZWJ1Z19zYXZlZF9yZWcodmNwdSwgcHN0 YXRlX3NzX2JpdCkpOworCQl0cmFjZV9kcmVnKCJTYXZlOiBNRFNDUiIsCisJCQl2Y3B1X2RlYnVn X3NhdmVkX3JlZyh2Y3B1LCBtZHNjcl9lbDEpKTsKKwogCQkvKgogCQkgKiBTaW5nbGUgU3RlcCAo QVJNIEFSTSBEMi4xMi4zIFRoZSBzb2Z0d2FyZSBzdGVwIHN0YXRlCiAJCSAqIG1hY2hpbmUpCkBA IC04OCw2ICsxMjQsOCBAQCB2b2lkIGt2bV9hcmNoX3NldHVwX2RlYnVnKHN0cnVjdCBrdm1fdmNw dSAqdmNwdSkKIAkJCSp2Y3B1X2Nwc3IodmNwdSkgJj0gfkRCR19TUFNSX1NTOwogCQkJdmNwdV9z eXNfcmVnKHZjcHUsIE1EU0NSX0VMMSkgJj0gfkRCR19NRFNDUl9TUzsKIAkJfQorCQl0cmFjZV9k cmVnKCJTUFNSX0VMMiIsICp2Y3B1X2Nwc3IodmNwdSkpOworCQl0cmFjZV9kcmVnKCJNRFNDUl9F TDEiLCB2Y3B1X3N5c19yZWcodmNwdSwgTURTQ1JfRUwxKSk7CiAKIAkJLyoKIAkJICogSFcgQnJl YWsvV2F0Y2ggcG9pbnRzCkBAIC0xMzYsNiArMTc0LDkgQEAgdm9pZCBrdm1fYXJjaF9zZXR1cF9k ZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCiAJCQkgICAgICAgJmhvc3QtPmRiZ193dnIsCiAJ CQkgICAgICAgc2l6ZW9mKF9fdTY0KSpudyk7CiAKKwkJCWlmICh0cmFjZV9rdm1fYXJjaF9zZXR1 cF9kZWJ1Z19yZWczMl9lbmFibGVkKCkpCisJCQkJZHVtcF9kYmdfcmVncyh2Y3B1LCBuYiwgbncp OworCiAJCQkvKiBNYWtlIHN1cmUgaHlwLlMgY29waWVzIHRoZW0gaW4vb3V0ICovCiAJCQl2Y3B1 LT5hcmNoLmRlYnVnX2ZsYWdzIHw9IEtWTV9BUk02NF9ERUJVR19ESVJUWTsKIAkJCS8qIEFsc28g dHJhY2sgZ3Vlc3QgY2hhbmdlcyAqLwpAQCAtMTQ3LDE1ICsxODgsMjQgQEAgdm9pZCBrdm1fYXJj aF9zZXR1cF9kZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCiAJCXZjcHUtPmFyY2gubWRjcl9l bDIgJj0gfk1EQ1JfRUwyX1RERTsKIAl9CiAKKwl0cmFjZV9rdm1fYXJjaF9zZXR1cF9kZWJ1Z19y ZWczMigiTURDUl9FTDIiLCB2Y3B1LT5hcmNoLm1kY3JfZWwyKTsKKwl0cmFjZV9rdm1fYXJjaF9z ZXR1cF9kZWJ1Z19yZWczMigiTURTQ1JfRUwxIiwKKwkJCQkJdmNwdV9zeXNfcmVnKHZjcHUsIE1E U0NSX0VMMSkpOworCisKIAkvKiBUcmFwIGRlYnVnIHJlZ2lzdGVyIGFjY2Vzcz8gKi8KIAlpZiAo dHJhcF9kZWJ1ZykKIAkJdmNwdS0+YXJjaC5tZGNyX2VsMiB8PSBNRENSX0VMMl9UREE7CiAJZWxz ZQogCQl2Y3B1LT5hcmNoLm1kY3JfZWwyICY9IH5NRENSX0VMMl9UREE7CisKKwl0cmFjZV9rdm1f YXJjaF9zZXR1cF9kZWJ1Z19yZWczMigiTURDUl9FTDIiLCB2Y3B1LT5hcmNoLm1kY3JfZWwyKTsK IH0KIAogdm9pZCBrdm1fYXJjaF9jbGVhcl9kZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCiB7 CisJdHJhY2Vfa3ZtX2FyY2hfY2xlYXJfZGVidWcodmNwdS0+Z3Vlc3RfZGVidWcpOworCiAJaWYg KHZjcHUtPmd1ZXN0X2RlYnVnKSB7CiAJCS8qIFJlc3RvcmUgcHN0YXRlL21kc2NyIGJpdHMgd2Ug bWF5IGhhdmUgbWVzc2VkIHdpdGggKi8KIAkJKnZjcHVfY3Bzcih2Y3B1KSAmPSB+REJHX1NQU1Jf U1M7CkBAIC0xNjQsNiArMjE0LDggQEAgdm9pZCBrdm1fYXJjaF9jbGVhcl9kZWJ1ZyhzdHJ1Y3Qg a3ZtX3ZjcHUgKnZjcHUpCiAJCXZjcHVfc3lzX3JlZyh2Y3B1LCBNRFNDUl9FTDEpID0KIAkJCXZj cHVfZGVidWdfc2F2ZWRfcmVnKHZjcHUsIG1kc2NyX2VsMSk7CiAKKwkJdHJhY2VfZHJlZygiU1BT Ul9FTDIiLCAqdmNwdV9jcHNyKHZjcHUpKTsKKwkJdHJhY2VfZHJlZygiTURTQ1JfRUwxIiwgdmNw dV9zeXNfcmVnKHZjcHUsIE1EU0NSX0VMMSkpOwogCQkvKgogCQkgKiBJZiB3ZSB3ZXJlIHVzaW5n IEhXIGRlYnVnIHdlIG5lZWQgdG8gcmVzdG9yZSB0aGUKIAkJICogdmFsdWVzIHRoZSBndWVzdCBo YWQgc2V0IHRoZW0gdXAgd2l0aApAQCAtMTg4LDYgKzI0MCwxMCBAQCB2b2lkIGt2bV9hcmNoX2Ns ZWFyX2RlYnVnKHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkKIAkJCW1lbWNweSgmdmNwdV9zeXNfcmVn KHZjcHUsIERCR1dWUjBfRUwxKSwKIAkJCSAgICAgICAmcmVncy0+ZGJnX3d2ciwKIAkJCSAgICAg ICBzaXplb2YoX191NjQpKm53KTsKKworCQkJaWYgKHRyYWNlX2t2bV9hcmNoX3NldHVwX2RlYnVn X3JlZzMyX2VuYWJsZWQoKSkKKwkJCQlkdW1wX2RiZ19yZWdzKHZjcHUsIG5iLCBudyk7CisKIAkJ fQogCX0KIH0KZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva3ZtL2hhbmRsZV9leGl0LmMgYi9hcmNo L2FybTY0L2t2bS9oYW5kbGVfZXhpdC5jCmluZGV4IDQ2MGExYWEuLmM2Y2M2OWEgMTAwNjQ0Ci0t LSBhL2FyY2gvYXJtNjQva3ZtL2hhbmRsZV9leGl0LmMKKysrIGIvYXJjaC9hcm02NC9rdm0vaGFu ZGxlX2V4aXQuYwpAQCAtOTcsNiArOTcsOCBAQCBzdGF0aWMgaW50IGt2bV9oYW5kbGVfZ3Vlc3Rf ZGVidWcoc3RydWN0IGt2bV92Y3B1ICp2Y3B1LCBzdHJ1Y3Qga3ZtX3J1biAqcnVuKQogewogCXUz MiBoc3IgPSBrdm1fdmNwdV9nZXRfaHNyKHZjcHUpOwogCisJdHJhY2Vfa3ZtX2hhbmRsZV9ndWVz dF9kZWJ1ZygqdmNwdV9wYyh2Y3B1KSwgaHNyKTsKKwogCXJ1bi0+ZXhpdF9yZWFzb24gPSBLVk1f RVhJVF9ERUJVRzsKIAlydW4tPmRlYnVnLmFyY2guaHNyID0gaHNyOwogCmRpZmYgLS1naXQgYS9h cmNoL2FybTY0L2t2bS90cmFjZS5oIGIvYXJjaC9hcm02NC9rdm0vdHJhY2UuaAppbmRleCAxNTc0 MTZlOS4uZGZmZGI0OSAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9rdm0vdHJhY2UuaAorKysgYi9h cmNoL2FybTY0L2t2bS90cmFjZS5oCkBAIC00NCw2ICs0NCw3MiBAQCBUUkFDRV9FVkVOVChrdm1f aHZjX2FybTY0LAogCQkgIF9fZW50cnktPnZjcHVfcGMsIF9fZW50cnktPnIwLCBfX2VudHJ5LT5p bW0pCiApOwogCitUUkFDRV9FVkVOVChrdm1faGFuZGxlX2d1ZXN0X2RlYnVnLAorCVRQX1BST1RP KHVuc2lnbmVkIGxvbmcgdmNwdV9wYywgdTMyIGhzciksCisJVFBfQVJHUyh2Y3B1X3BjLCBoc3Ip LAorCisJVFBfU1RSVUNUX19lbnRyeSgKKwkJX19maWVsZCh1bnNpZ25lZCBsb25nLAl2Y3B1X3Bj KQorCQlfX2ZpZWxkKHUzMiwJCWhzcikKKwkpLAorCisJVFBfZmFzdF9hc3NpZ24oCisJCV9fZW50 cnktPnZjcHVfcGMgPSB2Y3B1X3BjOworCQlfX2VudHJ5LT5oc3IgPSBoc3I7CisJKSwKKworCVRQ X3ByaW50aygiZGVidWcgZXhjZXB0aW9uIGF0IDB4JTA4bHggKEhTUjogMHglMDh4KSIsCisJCV9f ZW50cnktPnZjcHVfcGMsIF9fZW50cnktPmhzcikKKyk7CisKKworVFJBQ0VfRVZFTlQoa3ZtX2Fy Y2hfc2V0dXBfZGVidWcsCisJVFBfUFJPVE8oX191MzIgZ3Vlc3RfZGVidWcpLAorCVRQX0FSR1Mo Z3Vlc3RfZGVidWcpLAorCisJVFBfU1RSVUNUX19lbnRyeSgKKwkJX19maWVsZChfX3UzMiwgZ3Vl c3RfZGVidWcpCisJKSwKKworCVRQX2Zhc3RfYXNzaWduKAorCQlfX2VudHJ5LT5ndWVzdF9kZWJ1 ZyA9IGd1ZXN0X2RlYnVnOworCSksCisKKwlUUF9wcmludGsoImZsYWdzOiAweCUwOHgiLCBfX2Vu dHJ5LT5ndWVzdF9kZWJ1ZykKKyk7CisKK1RSQUNFX0VWRU5UKGt2bV9hcmNoX2NsZWFyX2RlYnVn LAorCVRQX1BST1RPKF9fdTMyIGd1ZXN0X2RlYnVnKSwKKwlUUF9BUkdTKGd1ZXN0X2RlYnVnKSwK KworCVRQX1NUUlVDVF9fZW50cnkoCisJCV9fZmllbGQoX191MzIsIGd1ZXN0X2RlYnVnKQorCSks CisKKwlUUF9mYXN0X2Fzc2lnbigKKwkJX19lbnRyeS0+Z3Vlc3RfZGVidWcgPSBndWVzdF9kZWJ1 ZzsKKwkpLAorCisJVFBfcHJpbnRrKCJmbGFnczogMHglMDh4IiwgX19lbnRyeS0+Z3Vlc3RfZGVi dWcpCispOworCitUUkFDRV9FVkVOVChrdm1fYXJjaF9zZXR1cF9kZWJ1Z19yZWczMiwKKwlUUF9Q Uk9UTyhjb25zdCBjaGFyICpuYW1lLCBfX3UzMiB2YWx1ZSksCisJVFBfQVJHUyhuYW1lLCB2YWx1 ZSksCisKKwlUUF9TVFJVQ1RfX2VudHJ5KAorCQlfX2ZpZWxkKGNvbnN0IGNoYXIgKiwgbmFtZSkK KwkJX19maWVsZChfX3UzMiwgdmFsdWUpCisJKSwKKworCVRQX2Zhc3RfYXNzaWduKAorCQlfX2Vu dHJ5LT5uYW1lID0gbmFtZTsKKwkJX19lbnRyeS0+dmFsdWUgPSB2YWx1ZTsKKwkpLAorCisJVFBf cHJpbnRrKCIlcyBub3cgMHglMDh4IiwgX19lbnRyeS0+bmFtZSwgX19lbnRyeS0+dmFsdWUpCisp OworCiAjZW5kaWYgLyogX1RSQUNFX0FSTTY0X0tWTV9IICovCiAKICN1bmRlZiBUUkFDRV9JTkNM VURFX1BBVEgKLS0gCjIuMy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwprdm1hcm0gbWFpbGluZyBsaXN0Cmt2bWFybUBsaXN0cy5jcy5jb2x1bWJpYS5l ZHUKaHR0cHM6Ly9saXN0cy5jcy5jb2x1bWJpYS5lZHUvbWFpbG1hbi9saXN0aW5mby9rdm1hcm0K From mboxrd@z Thu Jan 1 00:00:00 1970 From: alex.bennee@linaro.org (=?UTF-8?q?Alex=20Benn=C3=A9e?=) Date: Tue, 31 Mar 2015 16:08:08 +0100 Subject: [PATCH v2 10/10] KVM: arm64: add trace points for guest_debug debug In-Reply-To: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> Message-ID: <1427814488-28467-11-git-send-email-alex.bennee@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This includes trace points for: kvm_arch_setup_guest_debug kvm_arch_clear_guest_debug kvm_handle_guest_debug I've also added some generic register setting trace events so I can watch the register values being built up over time. The local dump_dbg_regs() function dumps all the HW BKPT and WPT registers. I've also added a #define trace_dreg to shorten some lines. Signed-off-by: Alex Benn?e diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c index 638c111..7c96288 100644 --- a/arch/arm64/kvm/debug.c +++ b/arch/arm64/kvm/debug.c @@ -25,12 +25,37 @@ #include #include +#include "trace.h" + +#define trace_dreg(name, value) trace_kvm_arch_setup_debug_reg32(name, value) + /* These are the bits of MDSCR_EL1 we may mess with */ #define MDSCR_EL1_DEBUG_BITS (DBG_MDSCR_SS | \ DBG_MDSCR_KDE | \ DBG_MDSCR_MDE) /** + * dump_dbg_regs - simple debug helper + * + * This provides a simple helper to dump the HW debug registers + */ +static void dump_dbg_regs(struct kvm_vcpu *vcpu, int nb, int nw) +{ + int i; + + for (i = 0; i < nb; i++) { + trace_printk("bkpt%d: 0x%08x:0x%llx\n", i, + (u32) vcpu_sys_reg(vcpu, DBGBCR0_EL1 + i), + vcpu_sys_reg(vcpu, DBGBVR0_EL1 + i)); + } + for (i = 0; i < nb; i++) { + trace_printk("wtpt%d: 0x%08x:0x%llx\n", i, + (u32) vcpu_sys_reg(vcpu, DBGWCR0_EL1 + i), + vcpu_sys_reg(vcpu, DBGWVR0_EL1 + i)); + } +} + +/** * kvm_arch_setup_debug - set-up debug related stuff * * @vcpu: the vcpu pointer @@ -52,9 +77,13 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) { bool trap_debug = false; + trace_kvm_arch_setup_debug(vcpu->guest_debug); + vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM | MDCR_EL2_TPMCR); vcpu->arch.mdcr_el2 |= (MDCR_EL2_TDRA | MDCR_EL2_TDOSA); + trace_kvm_arch_setup_debug_reg32("MDCR_EL2", vcpu->arch.mdcr_el2); + /* * If we are not treating debug registers are dirty we need * to trap if the guest starts accessing them. @@ -66,6 +95,8 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) if (vcpu->guest_debug) { vcpu->arch.mdcr_el2 |= MDCR_EL2_TDE; + trace_dreg("MDCR_EL2", vcpu->arch.mdcr_el2); + /* Save pstate/mdscr */ vcpu_debug_saved_reg(vcpu, pstate_ss_bit) = *vcpu_cpsr(vcpu) & DBG_SPSR_SS; @@ -73,6 +104,11 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) vcpu_debug_saved_reg(vcpu, mdscr_el1) = vcpu_sys_reg(vcpu, MDSCR_EL1); + trace_dreg("Save: PSTATE.SS", + vcpu_debug_saved_reg(vcpu, pstate_ss_bit)); + trace_dreg("Save: MDSCR", + vcpu_debug_saved_reg(vcpu, mdscr_el1)); + /* * Single Step (ARM ARM D2.12.3 The software step state * machine) @@ -88,6 +124,8 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; vcpu_sys_reg(vcpu, MDSCR_EL1) &= ~DBG_MDSCR_SS; } + trace_dreg("SPSR_EL2", *vcpu_cpsr(vcpu)); + trace_dreg("MDSCR_EL1", vcpu_sys_reg(vcpu, MDSCR_EL1)); /* * HW Break/Watch points @@ -136,6 +174,9 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) &host->dbg_wvr, sizeof(__u64)*nw); + if (trace_kvm_arch_setup_debug_reg32_enabled()) + dump_dbg_regs(vcpu, nb, nw); + /* Make sure hyp.S copies them in/out */ vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY; /* Also track guest changes */ @@ -147,15 +188,24 @@ void kvm_arch_setup_debug(struct kvm_vcpu *vcpu) vcpu->arch.mdcr_el2 &= ~MDCR_EL2_TDE; } + trace_kvm_arch_setup_debug_reg32("MDCR_EL2", vcpu->arch.mdcr_el2); + trace_kvm_arch_setup_debug_reg32("MDSCR_EL1", + vcpu_sys_reg(vcpu, MDSCR_EL1)); + + /* Trap debug register access? */ if (trap_debug) vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA; else vcpu->arch.mdcr_el2 &= ~MDCR_EL2_TDA; + + trace_kvm_arch_setup_debug_reg32("MDCR_EL2", vcpu->arch.mdcr_el2); } void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) { + trace_kvm_arch_clear_debug(vcpu->guest_debug); + if (vcpu->guest_debug) { /* Restore pstate/mdscr bits we may have messed with */ *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; @@ -164,6 +214,8 @@ void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) vcpu_sys_reg(vcpu, MDSCR_EL1) = vcpu_debug_saved_reg(vcpu, mdscr_el1); + trace_dreg("SPSR_EL2", *vcpu_cpsr(vcpu)); + trace_dreg("MDSCR_EL1", vcpu_sys_reg(vcpu, MDSCR_EL1)); /* * If we were using HW debug we need to restore the * values the guest had set them up with @@ -188,6 +240,10 @@ void kvm_arch_clear_debug(struct kvm_vcpu *vcpu) memcpy(&vcpu_sys_reg(vcpu, DBGWVR0_EL1), ®s->dbg_wvr, sizeof(__u64)*nw); + + if (trace_kvm_arch_setup_debug_reg32_enabled()) + dump_dbg_regs(vcpu, nb, nw); + } } } diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 460a1aa..c6cc69a 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -97,6 +97,8 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run) { u32 hsr = kvm_vcpu_get_hsr(vcpu); + trace_kvm_handle_guest_debug(*vcpu_pc(vcpu), hsr); + run->exit_reason = KVM_EXIT_DEBUG; run->debug.arch.hsr = hsr; diff --git a/arch/arm64/kvm/trace.h b/arch/arm64/kvm/trace.h index 157416e9..dffdb49 100644 --- a/arch/arm64/kvm/trace.h +++ b/arch/arm64/kvm/trace.h @@ -44,6 +44,72 @@ TRACE_EVENT(kvm_hvc_arm64, __entry->vcpu_pc, __entry->r0, __entry->imm) ); +TRACE_EVENT(kvm_handle_guest_debug, + TP_PROTO(unsigned long vcpu_pc, u32 hsr), + TP_ARGS(vcpu_pc, hsr), + + TP_STRUCT__entry( + __field(unsigned long, vcpu_pc) + __field(u32, hsr) + ), + + TP_fast_assign( + __entry->vcpu_pc = vcpu_pc; + __entry->hsr = hsr; + ), + + TP_printk("debug exception at 0x%08lx (HSR: 0x%08x)", + __entry->vcpu_pc, __entry->hsr) +); + + +TRACE_EVENT(kvm_arch_setup_debug, + TP_PROTO(__u32 guest_debug), + TP_ARGS(guest_debug), + + TP_STRUCT__entry( + __field(__u32, guest_debug) + ), + + TP_fast_assign( + __entry->guest_debug = guest_debug; + ), + + TP_printk("flags: 0x%08x", __entry->guest_debug) +); + +TRACE_EVENT(kvm_arch_clear_debug, + TP_PROTO(__u32 guest_debug), + TP_ARGS(guest_debug), + + TP_STRUCT__entry( + __field(__u32, guest_debug) + ), + + TP_fast_assign( + __entry->guest_debug = guest_debug; + ), + + TP_printk("flags: 0x%08x", __entry->guest_debug) +); + +TRACE_EVENT(kvm_arch_setup_debug_reg32, + TP_PROTO(const char *name, __u32 value), + TP_ARGS(name, value), + + TP_STRUCT__entry( + __field(const char *, name) + __field(__u32, value) + ), + + TP_fast_assign( + __entry->name = name; + __entry->value = value; + ), + + TP_printk("%s now 0x%08x", __entry->name, __entry->value) +); + #endif /* _TRACE_ARM64_KVM_H */ #undef TRACE_INCLUDE_PATH -- 2.3.4