From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932167AbbCaPJi (ORCPT ); Tue, 31 Mar 2015 11:09:38 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:48136 "EHLO socrates.bennee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754595AbbCaPJH (ORCPT ); Tue, 31 Mar 2015 11:09:07 -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 , Russell King , Catalin Marinas , Will Deacon , Andre Przywara , Lorenzo Pieralisi , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_debug() Date: Tue, 31 Mar 2015 16:08:03 +0100 Message-Id: <1427814488-28467-6-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 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 + * + * @vcpu: the vcpu pointer + * + * This is called before each entry in to the hypervisor to setup any + * debug related registers. Currently this just ensures we will trap + * access 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. + */ + +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 -- 2.3.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_debug() Date: Tue, 31 Mar 2015 16:08:03 +0100 Message-ID: <1427814488-28467-6-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: Lorenzo Pieralisi , Russell King , Gleb Natapov , jan.kiszka@siemens.com, Will Deacon , open list , dahi@linux.vnet.ibm.com, Andre Przywara , Catalin Marinas , 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 VGhpcyBpcyBhIHByZWN1cnNvciBmb3IgbGF0ZXIgcGF0Y2hlcyB3aGljaCB3aWxsIG5lZWQgdG8g ZG8gbW9yZSB0bwpzZXR1cCBkZWJ1ZyBzdGF0ZSBiZWZvcmUgZW50ZXJpbmcgdGhlIGh5cC5TIHN3 aXRjaCBjb2RlLiBUaGUgZXhpc3RpbmcKZnVuY3Rpb25hbGl0eSBmb3Igc2V0dGluZyBtZGNyX2Vs MiBoYXMgYmVlbiBtb3ZlZCBvdXQgb2YgaHlwLlMgYW5kIG5vdwp1c2VzIHRoZSB2YWx1ZSBrZXB0 IGluIHZjcHUtPmFyY2gubWRjcl9lbDIuCgpUaGlzIGFsc28gbW92ZXMgdGhlIGNvbmRpdGlvbmFs IHNldHRpbmcgb2YgdGhlIFREQSBiaXQgZnJvbSB0aGUgaHlwIGNvZGUKaW50byB0aGUgQyBjb2Rl LgoKU2lnbmVkLW9mZi1ieTogQWxleCBCZW5uw6llIDxhbGV4LmJlbm5lZUBsaW5hcm8ub3JnPgoK IGNyZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL2FybTY0L2t2bS9kZWJ1Zy5jCgpkaWZmIC0tZ2l0IGEv YXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX2hvc3QuaCBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL2t2 bV9ob3N0LmgKaW5kZXggNDEwMDhjZC4uOGMwMWM5NyAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vaW5j bHVkZS9hc20va3ZtX2hvc3QuaAorKysgYi9hcmNoL2FybS9pbmNsdWRlL2FzbS9rdm1faG9zdC5o CkBAIC0yNDIsNSArMjQyLDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGt2bV9hcmNoX2hhcmR3YXJl X3Vuc2V0dXAodm9pZCkge30KIHN0YXRpYyBpbmxpbmUgdm9pZCBrdm1fYXJjaF9zeW5jX2V2ZW50 cyhzdHJ1Y3Qga3ZtICprdm0pIHt9CiBzdGF0aWMgaW5saW5lIHZvaWQga3ZtX2FyY2hfdmNwdV91 bmluaXQoc3RydWN0IGt2bV92Y3B1ICp2Y3B1KSB7fQogc3RhdGljIGlubGluZSB2b2lkIGt2bV9h cmNoX3NjaGVkX2luKHN0cnVjdCBrdm1fdmNwdSAqdmNwdSwgaW50IGNwdSkge30KK3N0YXRpYyBp bmxpbmUgdm9pZCBrdm1fYXJjaF9zZXR1cF9kZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpIHt9 CitzdGF0aWMgaW5saW5lIHZvaWQga3ZtX2FyY2hfY2xlYXJfZGVidWcoc3RydWN0IGt2bV92Y3B1 ICp2Y3B1KSB7fQogCiAjZW5kaWYgLyogX19BUk1fS1ZNX0hPU1RfSF9fICovCmRpZmYgLS1naXQg YS9hcmNoL2FybS9rdm0vYXJtLmMgYi9hcmNoL2FybS9rdm0vYXJtLmMKaW5kZXggNDQ1OTMzZC4u N2VhOGIwZSAxMDA2NDQKLS0tIGEvYXJjaC9hcm0va3ZtL2FybS5jCisrKyBiL2FyY2gvYXJtL2t2 bS9hcm0uYwpAQCAtNTIzLDYgKzUyMyw3IEBAIGludCBrdm1fYXJjaF92Y3B1X2lvY3RsX3J1bihz dHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUsIHN0cnVjdCBrdm1fcnVuICpydW4pCiAKIAkJa3ZtX3ZnaWNf Zmx1c2hfaHdzdGF0ZSh2Y3B1KTsKIAkJa3ZtX3RpbWVyX2ZsdXNoX2h3c3RhdGUodmNwdSk7CisJ CWt2bV9hcmNoX3NldHVwX2RlYnVnKHZjcHUpOwogCiAJCWxvY2FsX2lycV9kaXNhYmxlKCk7CiAK QEAgLTU2OSw2ICs1NzAsNyBAQCBpbnQga3ZtX2FyY2hfdmNwdV9pb2N0bF9ydW4oc3RydWN0IGt2 bV92Y3B1ICp2Y3B1LCBzdHJ1Y3Qga3ZtX3J1biAqcnVuKQogCQkgKiBCYWNrIGZyb20gZ3Vlc3QK IAkJICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiovCiAKKwkJa3ZtX2FyY2hfY2xlYXJfZGVidWcodmNwdSk7CiAJCWt2bV90aW1lcl9z eW5jX2h3c3RhdGUodmNwdSk7CiAJCWt2bV92Z2ljX3N5bmNfaHdzdGF0ZSh2Y3B1KTsKIApkaWZm IC0tZ2l0IGEvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9rdm1faG9zdC5oIGIvYXJjaC9hcm02NC9p bmNsdWRlL2FzbS9rdm1faG9zdC5oCmluZGV4IDhhYzNjNzAuLjA2MzE4NDAgMTAwNjQ0Ci0tLSBh L2FyY2gvYXJtNjQvaW5jbHVkZS9hc20va3ZtX2hvc3QuaAorKysgYi9hcmNoL2FybTY0L2luY2x1 ZGUvYXNtL2t2bV9ob3N0LmgKQEAgLTEwMSw2ICsxMDEsNyBAQCBzdHJ1Y3Qga3ZtX3ZjcHVfYXJj aCB7CiAKIAkvKiBIWVAgY29uZmlndXJhdGlvbiAqLwogCXU2NCBoY3JfZWwyOworCXUzMiBtZGNy X2VsMjsKIAogCS8qIEV4Y2VwdGlvbiBJbmZvcm1hdGlvbiAqLwogCXN0cnVjdCBrdm1fdmNwdV9m YXVsdF9pbmZvIGZhdWx0OwpAQCAtMjU3LDQgKzI1OCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBr dm1fYXJjaF9zeW5jX2V2ZW50cyhzdHJ1Y3Qga3ZtICprdm0pIHt9CiBzdGF0aWMgaW5saW5lIHZv aWQga3ZtX2FyY2hfdmNwdV91bmluaXQoc3RydWN0IGt2bV92Y3B1ICp2Y3B1KSB7fQogc3RhdGlj IGlubGluZSB2b2lkIGt2bV9hcmNoX3NjaGVkX2luKHN0cnVjdCBrdm1fdmNwdSAqdmNwdSwgaW50 IGNwdSkge30KIAordm9pZCBrdm1fYXJjaF9zZXR1cF9kZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZj cHUpOwordm9pZCBrdm1fYXJjaF9jbGVhcl9kZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpOwor CiAjZW5kaWYgLyogX19BUk02NF9LVk1fSE9TVF9IX18gKi8KZGlmZiAtLWdpdCBhL2FyY2gvYXJt NjQva2VybmVsL2FzbS1vZmZzZXRzLmMgYi9hcmNoL2FybTY0L2tlcm5lbC9hc20tb2Zmc2V0cy5j CmluZGV4IGY3ZmE2NWQuLmNkMDYyMDkgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQva2VybmVsL2Fz bS1vZmZzZXRzLmMKKysrIGIvYXJjaC9hcm02NC9rZXJuZWwvYXNtLW9mZnNldHMuYwpAQCAtMTIy LDYgKzEyMiw3IEBAIGludCBtYWluKHZvaWQpCiAgIERFRklORShWQ1BVX0hQRkFSX0VMMiwJb2Zm c2V0b2Yoc3RydWN0IGt2bV92Y3B1LCBhcmNoLmZhdWx0LmhwZmFyX2VsMikpOwogICBERUZJTkUo VkNQVV9ERUJVR19GTEFHUywJb2Zmc2V0b2Yoc3RydWN0IGt2bV92Y3B1LCBhcmNoLmRlYnVnX2Zs YWdzKSk7CiAgIERFRklORShWQ1BVX0hDUl9FTDIsCQlvZmZzZXRvZihzdHJ1Y3Qga3ZtX3ZjcHUs IGFyY2guaGNyX2VsMikpOworICBERUZJTkUoVkNQVV9NRENSX0VMMiwJb2Zmc2V0b2Yoc3RydWN0 IGt2bV92Y3B1LCBhcmNoLm1kY3JfZWwyKSk7CiAgIERFRklORShWQ1BVX0lSUV9MSU5FUywJb2Zm c2V0b2Yoc3RydWN0IGt2bV92Y3B1LCBhcmNoLmlycV9saW5lcykpOwogICBERUZJTkUoVkNQVV9I T1NUX0NPTlRFWFQsCW9mZnNldG9mKHN0cnVjdCBrdm1fdmNwdSwgYXJjaC5ob3N0X2NwdV9jb250 ZXh0KSk7CiAgIERFRklORShWQ1BVX1RJTUVSX0NOVFZfQ1RMLAlvZmZzZXRvZihzdHJ1Y3Qga3Zt X3ZjcHUsIGFyY2gudGltZXJfY3B1LmNudHZfY3RsKSk7CmRpZmYgLS1naXQgYS9hcmNoL2FybTY0 L2t2bS9NYWtlZmlsZSBiL2FyY2gvYXJtNjQva3ZtL01ha2VmaWxlCmluZGV4IDRlNmUwOWUuLjY3 OTZkNGEgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQva3ZtL01ha2VmaWxlCisrKyBiL2FyY2gvYXJt NjQva3ZtL01ha2VmaWxlCkBAIC0xNyw3ICsxNyw3IEBAIGt2bS0kKENPTkZJR19LVk1fQVJNX0hP U1QpICs9ICQoQVJNKS9wc2NpLm8gJChBUk0pL3BlcmYubwogCiBrdm0tJChDT05GSUdfS1ZNX0FS TV9IT1NUKSArPSBlbXVsYXRlLm8gaW5qZWN0X2ZhdWx0Lm8gcmVnbWFwLm8KIGt2bS0kKENPTkZJ R19LVk1fQVJNX0hPU1QpICs9IGh5cC5vIGh5cC1pbml0Lm8gaGFuZGxlX2V4aXQubwota3ZtLSQo Q09ORklHX0tWTV9BUk1fSE9TVCkgKz0gZ3Vlc3QubyByZXNldC5vIHN5c19yZWdzLm8gc3lzX3Jl Z3NfZ2VuZXJpY192OC5vCitrdm0tJChDT05GSUdfS1ZNX0FSTV9IT1NUKSArPSBndWVzdC5vIGRl YnVnLm8gcmVzZXQubyBzeXNfcmVncy5vIHN5c19yZWdzX2dlbmVyaWNfdjgubwogCiBrdm0tJChD T05GSUdfS1ZNX0FSTV9WR0lDKSArPSAkKEtWTSkvYXJtL3ZnaWMubwoga3ZtLSQoQ09ORklHX0tW TV9BUk1fVkdJQykgKz0gJChLVk0pL2FybS92Z2ljLXYyLm8KZGlmZiAtLWdpdCBhL2FyY2gvYXJt NjQva3ZtL2RlYnVnLmMgYi9hcmNoL2FybTY0L2t2bS9kZWJ1Zy5jCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjhhMjlkMGIKLS0tIC9kZXYvbnVsbAorKysgYi9hcmNoL2FybTY0 L2t2bS9kZWJ1Zy5jCkBAIC0wLDAgKzEsNTggQEAKKy8qCisgKiBEZWJ1ZyBhbmQgR3Vlc3QgRGVi dWcgc3VwcG9ydAorICoKKyAqIENvcHlyaWdodCAoQykgMjAxNSAtIExpbmFybyBMdGQKKyAqIEF1 dGhvcjogQWxleCBCZW5uw6llIDxhbGV4LmJlbm5lZUBsaW5hcm8ub3JnPgorICoKKyAqIFRoaXMg cHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3Ig bW9kaWZ5CisgKiBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlIHZlcnNpb24gMiBhcworICogcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZv dW5kYXRpb24uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3Bl IHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdp dGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9y IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQorICogR05VIEdlbmVy YWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhh dmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICog YWxvbmcgd2l0aCB0aGlzIHByb2dyYW0uICBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3Jn L2xpY2Vuc2VzLz4uCisgKi8KKworI2luY2x1ZGUgPGxpbnV4L2t2bV9ob3N0Lmg+CisKKyNpbmNs dWRlIDxhc20va3ZtX2FybS5oPgorI2luY2x1ZGUgPGFzbS9rdm1faG9zdC5oPgorCisvKioKKyAq IGt2bV9hcmNoX3NldHVwX2RlYnVnIC0gc2V0LXVwIGRlYnVnIHJlbGF0ZWQgc3R1ZmYKKyAqCisg KiBAdmNwdToJdGhlIHZjcHUgcG9pbnRlcgorICoKKyAqIFRoaXMgaXMgY2FsbGVkIGJlZm9yZSBl YWNoIGVudHJ5IGluIHRvIHRoZSBoeXBlcnZpc29yIHRvIHNldHVwIGFueQorICogZGVidWcgcmVs YXRlZCByZWdpc3RlcnMuIEN1cnJlbnRseSB0aGlzIGp1c3QgZW5zdXJlcyB3ZSB3aWxsIHRyYXAK KyAqIGFjY2VzcyB0bzoKKyAqICAtIFBlcmZvcm1hbmNlIG1vbml0b3JzIChNRENSX0VMMl9UUE0v TURDUl9FTDJfVFBNQ1IpCisgKiAgLSBEZWJ1ZyBST00gQWRkcmVzcyAoTURDUl9FTDJfVERSQSkK KyAqICAtIFBvd2VyIGRvd24gZGVidWcgcmVnaXN0ZXJzIChNRENSX0VMMl9URE9TQSkKKyAqCisg KiBBZGRpdGlvbmFsbHkgdGhlIGh5cGVydmlzb3IgbGF6aWx5IHNhdmVzL3Jlc3RvcmVzIHRoZSBk ZWJ1ZworICogcmVnaXN0ZXIgc3RhdGUuIElmIGl0IGlzIG5vdCBjdXJyZW50bHkgZG9pbmcgc28g KGFyY2guZGVidWdfZmxhZ3MpCisgKiB0aGVuIHdlIGFsc28gbmVlZCB0byBlbnN1cmUgd2UgdHJh cCBpZiB0aGUgZ3Vlc3QgbWVzc2VzIHdpdGggdGhlbQorICogc28gd2Uga25vdyB3ZSBuZWVkIHRv IHNhdmUgdGhlbS4KKyAqLworCit2b2lkIGt2bV9hcmNoX3NldHVwX2RlYnVnKHN0cnVjdCBrdm1f dmNwdSAqdmNwdSkKK3sKKwl2Y3B1LT5hcmNoLm1kY3JfZWwyIHw9IChNRENSX0VMMl9UUE0gfCBN RENSX0VMMl9UUE1DUik7CisJdmNwdS0+YXJjaC5tZGNyX2VsMiB8PSAoTURDUl9FTDJfVERSQSB8 IE1EQ1JfRUwyX1RET1NBKTsKKworCWlmICghdmNwdS0+YXJjaC5kZWJ1Z19mbGFncyAmIEtWTV9B Uk02NF9ERUJVR19ESVJUWSkKKwkJdmNwdS0+YXJjaC5tZGNyX2VsMiB8PSBNRENSX0VMMl9UREE7 CisJZWxzZQorCQl2Y3B1LT5hcmNoLm1kY3JfZWwyICY9IH5NRENSX0VMMl9UREE7CisKK30KKwor dm9pZCBrdm1fYXJjaF9jbGVhcl9kZWJ1ZyhzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCit7CisJLyog Tm90aGluZyB0byBkbyB5ZXQgKi8KK30KZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva3ZtL2h5cC5T IGIvYXJjaC9hcm02NC9rdm0vaHlwLlMKaW5kZXggNWJlZmQwMS4uYmU5MmJmZTEgMTAwNjQ0Ci0t LSBhL2FyY2gvYXJtNjQva3ZtL2h5cC5TCisrKyBiL2FyY2gvYXJtNjQva3ZtL2h5cC5TCkBAIC03 NjgsMTcgKzc2OCw4IEBACiAJbW92CXgyLCAjKDEgPDwgMTUpCS8vIFRyYXAgQ1AxNSBDcj0xNQog CW1zcgloc3RyX2VsMiwgeDIKIAotCW1ycwl4MiwgbWRjcl9lbDIKLQlhbmQJeDIsIHgyLCAjTURD Ul9FTDJfSFBNTl9NQVNLCi0Jb3JyCXgyLCB4MiwgIyhNRENSX0VMMl9UUE0gfCBNRENSX0VMMl9U UE1DUikKLQlvcnIJeDIsIHgyLCAjKE1EQ1JfRUwyX1REUkEgfCBNRENSX0VMMl9URE9TQSkKLQot CS8vIENoZWNrIGZvciBLVk1fQVJNNjRfREVCVUdfRElSVFksIGFuZCBzZXQgZGVidWcgdG8gdHJh cAotCS8vIGlmIG5vdCBkaXJ0eS4KLQlsZHIJeDMsIFt4MCwgI1ZDUFVfREVCVUdfRkxBR1NdCi0J dGJuegl4MywgI0tWTV9BUk02NF9ERUJVR19ESVJUWV9TSElGVCwgMWYKLQlvcnIJeDIsIHgyLCAg I01EQ1JfRUwyX1REQQotMToKKwkvLyBNb25pdG9yIERlYnVnIENvbmZpZyAtIHNlZSBrdm1fYXJj aF9zZXR1cF9kZWJ1ZygpCisJbGRyCXgyLCBbeDAsICNWQ1BVX01EQ1JfRUwyXQogCW1zcgltZGNy X2VsMiwgeDIKIC5lbmRtCiAKLS0gCjIuMy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwprdm1hcm0gbWFpbGluZyBsaXN0Cmt2bWFybUBsaXN0cy5jcy5j b2x1bWJpYS5lZHUKaHR0cHM6Ly9saXN0cy5jcy5jb2x1bWJpYS5lZHUvbWFpbG1hbi9saXN0aW5m by9rdm1hcm0K 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:03 +0100 Subject: [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_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-6-git-send-email-alex.bennee@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 + * + * @vcpu: the vcpu pointer + * + * This is called before each entry in to the hypervisor to setup any + * debug related registers. Currently this just ensures we will trap + * access 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. + */ + +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 -- 2.3.4