From: Christoffer Dall <christoffer.dall@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH v2 26/28] ARM: KVM: Remove unused hyp_pc field
Date: Tue, 9 Feb 2016 19:39:01 +0100 [thread overview]
Message-ID: <20160209183901.GC5171@cbox> (raw)
In-Reply-To: <1454583645-10144-27-git-send-email-marc.zyngier@arm.com>
On Thu, Feb 04, 2016 at 11:00:43AM +0000, Marc Zyngier wrote:
> This field was never populated, and the panic code already
> does something similar. Delete the related code.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm/include/asm/kvm_emulate.h | 5 -----
> arch/arm/include/asm/kvm_host.h | 1 -
> arch/arm/kernel/asm-offsets.c | 1 -
> arch/arm/kvm/handle_exit.c | 5 -----
> 4 files changed, 12 deletions(-)
>
> diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
> index f710616..8a8c6de 100644
> --- a/arch/arm/include/asm/kvm_emulate.h
> +++ b/arch/arm/include/asm/kvm_emulate.h
> @@ -108,11 +108,6 @@ static inline phys_addr_t kvm_vcpu_get_fault_ipa(struct kvm_vcpu *vcpu)
> return ((phys_addr_t)vcpu->arch.fault.hpfar & HPFAR_MASK) << 8;
> }
>
> -static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu)
> -{
> - return vcpu->arch.fault.hyp_pc;
> -}
> -
> static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
> {
> return kvm_vcpu_get_hsr(vcpu) & HSR_ISV;
> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
> index daf6a71..19e9aba 100644
> --- a/arch/arm/include/asm/kvm_host.h
> +++ b/arch/arm/include/asm/kvm_host.h
> @@ -85,7 +85,6 @@ struct kvm_vcpu_fault_info {
> u32 hsr; /* Hyp Syndrome Register */
> u32 hxfar; /* Hyp Data/Inst. Fault Address Register */
> u32 hpfar; /* Hyp IPA Fault Address Register */
> - u32 hyp_pc; /* PC when exception was taken from Hyp mode */
> };
>
> /*
> diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
> index 1f24c32..27d0581 100644
> --- a/arch/arm/kernel/asm-offsets.c
> +++ b/arch/arm/kernel/asm-offsets.c
> @@ -175,7 +175,6 @@ int main(void)
> DEFINE(CPU_CTXT_VFP, offsetof(struct kvm_cpu_context, vfp));
> DEFINE(CPU_CTXT_GP_REGS, offsetof(struct kvm_cpu_context, gp_regs));
> DEFINE(GP_REGS_USR, offsetof(struct kvm_regs, usr_regs));
> - DEFINE(VCPU_HYP_PC, offsetof(struct kvm_vcpu, arch.fault.hyp_pc));
> #endif
> BLANK();
> #ifdef CONFIG_VDSO
> diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
> index 3ede90d..5377d753 100644
> --- a/arch/arm/kvm/handle_exit.c
> +++ b/arch/arm/kvm/handle_exit.c
> @@ -147,11 +147,6 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
> switch (exception_index) {
> case ARM_EXCEPTION_IRQ:
> return 1;
> - case ARM_EXCEPTION_UNDEFINED:
> - kvm_err("Undefined exception in Hyp mode at: %#08lx\n",
> - kvm_vcpu_get_hyp_pc(vcpu));
> - BUG();
> - panic("KVM: Hypervisor undefined exception!\n");
> case ARM_EXCEPTION_DATA_ABORT:
> case ARM_EXCEPTION_PREF_ABORT:
> case ARM_EXCEPTION_HVC:
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 26/28] ARM: KVM: Remove unused hyp_pc field
Date: Tue, 9 Feb 2016 19:39:01 +0100 [thread overview]
Message-ID: <20160209183901.GC5171@cbox> (raw)
In-Reply-To: <1454583645-10144-27-git-send-email-marc.zyngier@arm.com>
On Thu, Feb 04, 2016 at 11:00:43AM +0000, Marc Zyngier wrote:
> This field was never populated, and the panic code already
> does something similar. Delete the related code.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm/include/asm/kvm_emulate.h | 5 -----
> arch/arm/include/asm/kvm_host.h | 1 -
> arch/arm/kernel/asm-offsets.c | 1 -
> arch/arm/kvm/handle_exit.c | 5 -----
> 4 files changed, 12 deletions(-)
>
> diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
> index f710616..8a8c6de 100644
> --- a/arch/arm/include/asm/kvm_emulate.h
> +++ b/arch/arm/include/asm/kvm_emulate.h
> @@ -108,11 +108,6 @@ static inline phys_addr_t kvm_vcpu_get_fault_ipa(struct kvm_vcpu *vcpu)
> return ((phys_addr_t)vcpu->arch.fault.hpfar & HPFAR_MASK) << 8;
> }
>
> -static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu)
> -{
> - return vcpu->arch.fault.hyp_pc;
> -}
> -
> static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
> {
> return kvm_vcpu_get_hsr(vcpu) & HSR_ISV;
> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
> index daf6a71..19e9aba 100644
> --- a/arch/arm/include/asm/kvm_host.h
> +++ b/arch/arm/include/asm/kvm_host.h
> @@ -85,7 +85,6 @@ struct kvm_vcpu_fault_info {
> u32 hsr; /* Hyp Syndrome Register */
> u32 hxfar; /* Hyp Data/Inst. Fault Address Register */
> u32 hpfar; /* Hyp IPA Fault Address Register */
> - u32 hyp_pc; /* PC when exception was taken from Hyp mode */
> };
>
> /*
> diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
> index 1f24c32..27d0581 100644
> --- a/arch/arm/kernel/asm-offsets.c
> +++ b/arch/arm/kernel/asm-offsets.c
> @@ -175,7 +175,6 @@ int main(void)
> DEFINE(CPU_CTXT_VFP, offsetof(struct kvm_cpu_context, vfp));
> DEFINE(CPU_CTXT_GP_REGS, offsetof(struct kvm_cpu_context, gp_regs));
> DEFINE(GP_REGS_USR, offsetof(struct kvm_regs, usr_regs));
> - DEFINE(VCPU_HYP_PC, offsetof(struct kvm_vcpu, arch.fault.hyp_pc));
> #endif
> BLANK();
> #ifdef CONFIG_VDSO
> diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
> index 3ede90d..5377d753 100644
> --- a/arch/arm/kvm/handle_exit.c
> +++ b/arch/arm/kvm/handle_exit.c
> @@ -147,11 +147,6 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
> switch (exception_index) {
> case ARM_EXCEPTION_IRQ:
> return 1;
> - case ARM_EXCEPTION_UNDEFINED:
> - kvm_err("Undefined exception in Hyp mode at: %#08lx\n",
> - kvm_vcpu_get_hyp_pc(vcpu));
> - BUG();
> - panic("KVM: Hypervisor undefined exception!\n");
> case ARM_EXCEPTION_DATA_ABORT:
> case ARM_EXCEPTION_PREF_ABORT:
> case ARM_EXCEPTION_HVC:
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
next prev parent reply other threads:[~2016-02-09 18:32 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 11:00 [PATCH v2 00/28] ARM: KVM: Rewrite the world switch in C (mostly) Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 01/28] ARM: KVM: Move the HYP code to its own section Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:39 ` Christoffer Dall
2016-02-09 18:39 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 02/28] ARM: KVM: Remove __kvm_hyp_code_start/__kvm_hyp_code_end Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:39 ` Christoffer Dall
2016-02-09 18:39 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 03/28] ARM: KVM: Move VFP registers to a CPU context structure Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 04/28] ARM: KVM: Move CP15 array into the " Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 05/28] ARM: KVM: Move GP registers " Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 06/28] ARM: KVM: Add a HYP-specific header file Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 07/28] ARM: KVM: Add system register accessor macros Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-10 17:25 ` Christoffer Dall
2016-02-10 17:25 ` Christoffer Dall
2016-02-10 17:32 ` Marc Zyngier
2016-02-10 17:32 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 08/28] ARM: KVM: Add TLB invalidation code Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-10 15:32 ` Marc Zyngier
2016-02-10 15:32 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 09/28] ARM: KVM: Add CP15 save/restore code Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 10/28] ARM: KVM: Add timer save/restore Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-10 15:36 ` Marc Zyngier
2016-02-10 15:36 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 11/28] ARM: KVM: Add vgic v2 save/restore Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 12/28] ARM: KVM: Add VFP save/restore Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 13/28] ARM: KVM: Add banked registers save/restore Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:42 ` Christoffer Dall
2016-02-09 18:42 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 14/28] ARM: KVM: Add guest entry code Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:44 ` Christoffer Dall
2016-02-09 18:44 ` Christoffer Dall
2016-02-10 15:48 ` Marc Zyngier
2016-02-10 15:48 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 15/28] ARM: KVM: Add VFP lazy save/restore handler Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:44 ` Christoffer Dall
2016-02-09 18:44 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 16/28] ARM: KVM: Add the new world switch implementation Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:44 ` Christoffer Dall
2016-02-09 18:44 ` Christoffer Dall
2016-02-10 16:00 ` Marc Zyngier
2016-02-10 16:00 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 17/28] ARM: KVM: Add populating of fault data structure Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:44 ` Christoffer Dall
2016-02-09 18:44 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 18/28] ARM: KVM: Add HYP mode entry code Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 17:00 ` Christoffer Dall
2016-02-09 17:00 ` Christoffer Dall
2016-02-10 16:02 ` Marc Zyngier
2016-02-10 16:02 ` Marc Zyngier
2016-02-10 17:23 ` Christoffer Dall
2016-02-10 17:23 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 19/28] ARM: KVM: Add panic handling code Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:45 ` Christoffer Dall
2016-02-09 18:45 ` Christoffer Dall
2016-02-10 16:03 ` Marc Zyngier
2016-02-10 16:03 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 20/28] ARM: KVM: Change kvm_call_hyp return type to unsigned long Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:28 ` Christoffer Dall
2016-02-09 18:28 ` Christoffer Dall
2016-02-10 16:07 ` Marc Zyngier
2016-02-10 16:07 ` Marc Zyngier
2016-02-04 11:00 ` [PATCH v2 21/28] ARM: KVM: Remove the old world switch Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:45 ` Christoffer Dall
2016-02-09 18:45 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 22/28] ARM: KVM: Switch to C-based stage2 init Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:45 ` Christoffer Dall
2016-02-09 18:45 ` Christoffer Dall
2016-02-10 7:42 ` Marc Zyngier
2016-02-10 7:42 ` Marc Zyngier
2016-02-10 8:04 ` Christoffer Dall
2016-02-10 8:04 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 23/28] ARM: KVM: Remove __weak attributes Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:45 ` Christoffer Dall
2016-02-09 18:45 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 24/28] ARM: KVM: Turn CP15 defines to an enum Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:45 ` Christoffer Dall
2016-02-09 18:45 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 25/28] ARM: KVM: Cleanup asm-offsets.c Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:45 ` Christoffer Dall
2016-02-09 18:45 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 26/28] ARM: KVM: Remove unused hyp_pc field Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:39 ` Christoffer Dall [this message]
2016-02-09 18:39 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 27/28] ARM: KVM: Remove handling of ARM_EXCEPTION_DATA/PREF_ABORT Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:39 ` Christoffer Dall
2016-02-09 18:39 ` Christoffer Dall
2016-02-04 11:00 ` [PATCH v2 28/28] ARM: KVM: Remove __kvm_hyp_exit/__kvm_hyp_exit_end Marc Zyngier
2016-02-04 11:00 ` Marc Zyngier
2016-02-09 18:39 ` Christoffer Dall
2016-02-09 18:39 ` Christoffer Dall
2016-02-09 18:49 ` [PATCH v2 00/28] ARM: KVM: Rewrite the world switch in C (mostly) Christoffer Dall
2016-02-09 18:49 ` Christoffer Dall
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=20160209183901.GC5171@cbox \
--to=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@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: link
Be 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.