From: Zhichao Huang <zhichao.huang@linaro.org> To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, alex.bennee@linaro.org, will.deacon@arm.com Cc: huangzhichao@huawei.com, Zhichao Huang <zhichao.huang@linaro.org> Subject: [PATCH v2 11/11] KVM: arm: enable trapping of all debug registers Date: Sun, 31 May 2015 12:27:12 +0800 [thread overview] Message-ID: <1433046432-1824-12-git-send-email-zhichao.huang@linaro.org> (raw) In-Reply-To: <1433046432-1824-1-git-send-email-zhichao.huang@linaro.org> Enable trapping of the debug registers, allowing guests to use the debug infrastructure. Signed-off-by: Zhichao Huang <zhichao.huang@linaro.org> --- arch/arm/kvm/interrupts_head.S | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S index ed406be..107bda4 100644 --- a/arch/arm/kvm/interrupts_head.S +++ b/arch/arm/kvm/interrupts_head.S @@ -886,10 +886,21 @@ ARM_BE8(rev r6, r6 ) .endm /* Configures the HDCR (Hyp Debug Configuration Register) on entry/return - * (hardware reset value is 0) */ + * (hardware reset value is 0) + * + * Clobbers r2-r4 + */ .macro set_hdcr operation mrc p15, 4, r2, c1, c1, 1 - ldr r3, =(HDCR_TPM|HDCR_TPMCR) + ldr r3, =(HDCR_TPM|HDCR_TPMCR|HDCR_TDRA|HDCR_TDOSA) + + // Check for KVM_ARM_DEBUG_DIRTY, and set debug to trap + // if not dirty. + ldr r4, [vcpu, #VCPU_DEBUG_FLAGS] + cmp r4, #KVM_ARM_DEBUG_DIRTY + beq 1f + orr r3, r3, #HDCR_TDA +1: .if \operation == vmentry orr r2, r2, r3 @ Trap some perfmon accesses .else -- 1.7.12.4
WARNING: multiple messages have this Message-ID (diff)
From: zhichao.huang@linaro.org (Zhichao Huang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 11/11] KVM: arm: enable trapping of all debug registers Date: Sun, 31 May 2015 12:27:12 +0800 [thread overview] Message-ID: <1433046432-1824-12-git-send-email-zhichao.huang@linaro.org> (raw) In-Reply-To: <1433046432-1824-1-git-send-email-zhichao.huang@linaro.org> Enable trapping of the debug registers, allowing guests to use the debug infrastructure. Signed-off-by: Zhichao Huang <zhichao.huang@linaro.org> --- arch/arm/kvm/interrupts_head.S | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S index ed406be..107bda4 100644 --- a/arch/arm/kvm/interrupts_head.S +++ b/arch/arm/kvm/interrupts_head.S @@ -886,10 +886,21 @@ ARM_BE8(rev r6, r6 ) .endm /* Configures the HDCR (Hyp Debug Configuration Register) on entry/return - * (hardware reset value is 0) */ + * (hardware reset value is 0) + * + * Clobbers r2-r4 + */ .macro set_hdcr operation mrc p15, 4, r2, c1, c1, 1 - ldr r3, =(HDCR_TPM|HDCR_TPMCR) + ldr r3, =(HDCR_TPM|HDCR_TPMCR|HDCR_TDRA|HDCR_TDOSA) + + // Check for KVM_ARM_DEBUG_DIRTY, and set debug to trap + // if not dirty. + ldr r4, [vcpu, #VCPU_DEBUG_FLAGS] + cmp r4, #KVM_ARM_DEBUG_DIRTY + beq 1f + orr r3, r3, #HDCR_TDA +1: .if \operation == vmentry orr r2, r2, r3 @ Trap some perfmon accesses .else -- 1.7.12.4
next prev parent reply other threads:[~2015-05-31 4:30 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-31 4:27 [PATCH v2 00/11] KVM: arm: debug infrastructure support Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-05-31 4:27 ` [PATCH v2 01/11] KVM: arm: plug guest debug exploit Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-06-01 10:56 ` Marc Zyngier 2015-06-01 10:56 ` Marc Zyngier 2015-06-07 13:40 ` zichao 2015-06-07 13:40 ` zichao 2015-06-09 10:29 ` Marc Zyngier 2015-06-09 10:29 ` Marc Zyngier 2015-06-14 16:08 ` zichao 2015-06-14 16:08 ` zichao 2015-06-14 16:13 ` zichao 2015-06-14 16:13 ` zichao 2015-06-16 16:49 ` Will Deacon 2015-06-16 16:49 ` Will Deacon 2015-05-31 4:27 ` [PATCH v2 02/11] KVM: arm: rename pm_fake handler to trap_raz_wi Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-06-09 10:42 ` Alex Bennée 2015-06-09 10:42 ` Alex Bennée 2015-05-31 4:27 ` [PATCH v2 03/11] KVM: arm: enable to use the ARM_DSCR_MDBGEN macro from KVM assembly code Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-06-09 13:42 ` Alex Bennée 2015-06-09 13:42 ` Alex Bennée 2015-05-31 4:27 ` [PATCH v2 04/11] KVM: arm: common infrastructure for handling AArch32 CP14/CP15 Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-06-09 10:45 ` Alex Bennée 2015-06-09 10:45 ` Alex Bennée 2015-06-14 16:17 ` zichao 2015-06-14 16:17 ` zichao 2015-05-31 4:27 ` [PATCH v2 05/11] KVM: arm: check ordering of all system register tables Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-06-10 13:52 ` Alex Bennée 2015-06-10 13:52 ` Alex Bennée 2015-06-14 16:18 ` zichao 2015-06-14 16:18 ` zichao 2015-05-31 4:27 ` [PATCH v2 06/11] KVM: arm: add trap handlers for 32-bit debug registers Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-05-31 4:27 ` [PATCH v2 07/11] KVM: arm: add trap handlers for 64-bit " Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-05-31 4:27 ` [PATCH v2 08/11] KVM: arm: implement dirty bit mechanism for " Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-05-31 4:27 ` [PATCH v2 09/11] KVM: arm: disable debug mode if we don't actually need it Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-06-01 10:16 ` Will Deacon 2015-06-01 10:16 ` Will Deacon 2015-06-07 14:08 ` zichao 2015-06-07 14:08 ` zichao 2015-05-31 4:27 ` [PATCH v2 10/11] KVM: arm: implement lazy world switch for debug registers Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang 2015-05-31 4:27 ` Zhichao Huang [this message] 2015-05-31 4:27 ` [PATCH v2 11/11] KVM: arm: enable trapping of all " Zhichao Huang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1433046432-1824-12-git-send-email-zhichao.huang@linaro.org \ --to=zhichao.huang@linaro.org \ --cc=alex.bennee@linaro.org \ --cc=christoffer.dall@linaro.org \ --cc=huangzhichao@huawei.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.