From: "Alex Bennée" <alex.bennee@linaro.org> To: Dave Martin <Dave.Martin@arm.com> Cc: Christoffer Dall <cdall@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v10 17/18] KVM: arm64: Fold redundant exit code checks out of fixup_guest_exit() Date: Thu, 24 May 2018 16:06:47 +0100 [thread overview] Message-ID: <87wovtrt2w.fsf@linaro.org> (raw) In-Reply-To: <1527005119-6842-18-git-send-email-Dave.Martin@arm.com> Dave Martin <Dave.Martin@arm.com> writes: > The entire tail of fixup_guest_exit() is contained in if statements > of the form if (x && *exit_code == ARM_EXCEPTION_TRAP). As a result, > we can check just once and bail out of the function early, allowing > the remaining if conditions to be simplified. > > The only awkward case is where *exit_code is changed to > ARM_EXCEPTION_EL1_SERROR in the case of an illegal GICv2 CPU > interface access: in that case, the GICv3 trap handling code is > skipped using a goto. This avoids pointlessly evaluating the > static branch check for the GICv3 case, even though we can't have > vgic_v2_cpuif_trap and vgic_v3_cpuif_trap true simultaneously > unless we have a GICv3 and GICv2 on the host: that sounds stupid, > but I haven't satisfied myself that it can't happen. > > No functional change. > > Signed-off-by: Dave Martin <Dave.Martin@arm.com> > Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > arch/arm64/kvm/hyp/switch.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c > index 18d0faa..4fbee95 100644 > --- a/arch/arm64/kvm/hyp/switch.c > +++ b/arch/arm64/kvm/hyp/switch.c > @@ -387,11 +387,13 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) > * same PC once the SError has been injected, and replay the > * trapping instruction. > */ > - if (*exit_code == ARM_EXCEPTION_TRAP && !__populate_fault_info(vcpu)) > + if (*exit_code != ARM_EXCEPTION_TRAP) > + goto exit; > + > + if (!__populate_fault_info(vcpu)) > return true; > > - if (static_branch_unlikely(&vgic_v2_cpuif_trap) && > - *exit_code == ARM_EXCEPTION_TRAP) { > + if (static_branch_unlikely(&vgic_v2_cpuif_trap)) { > bool valid; > > valid = kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_DABT_LOW && > @@ -417,11 +419,12 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) > *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; > *exit_code = ARM_EXCEPTION_EL1_SERROR; > } > + > + goto exit; > } > } > > if (static_branch_unlikely(&vgic_v3_cpuif_trap) && > - *exit_code == ARM_EXCEPTION_TRAP && > (kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_SYS64 || > kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_CP15_32)) { > int ret = __vgic_v3_perform_cpuif_access(vcpu); > @@ -430,6 +433,7 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) > return true; > } > > +exit: > /* Return to the host kernel and handle the exit */ > return false; > } -- Alex Bennée _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: alex.bennee@linaro.org (Alex Bennée) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 17/18] KVM: arm64: Fold redundant exit code checks out of fixup_guest_exit() Date: Thu, 24 May 2018 16:06:47 +0100 [thread overview] Message-ID: <87wovtrt2w.fsf@linaro.org> (raw) In-Reply-To: <1527005119-6842-18-git-send-email-Dave.Martin@arm.com> Dave Martin <Dave.Martin@arm.com> writes: > The entire tail of fixup_guest_exit() is contained in if statements > of the form if (x && *exit_code == ARM_EXCEPTION_TRAP). As a result, > we can check just once and bail out of the function early, allowing > the remaining if conditions to be simplified. > > The only awkward case is where *exit_code is changed to > ARM_EXCEPTION_EL1_SERROR in the case of an illegal GICv2 CPU > interface access: in that case, the GICv3 trap handling code is > skipped using a goto. This avoids pointlessly evaluating the > static branch check for the GICv3 case, even though we can't have > vgic_v2_cpuif_trap and vgic_v3_cpuif_trap true simultaneously > unless we have a GICv3 and GICv2 on the host: that sounds stupid, > but I haven't satisfied myself that it can't happen. > > No functional change. > > Signed-off-by: Dave Martin <Dave.Martin@arm.com> > Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Alex Benn?e <alex.bennee@linaro.org> > --- > arch/arm64/kvm/hyp/switch.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c > index 18d0faa..4fbee95 100644 > --- a/arch/arm64/kvm/hyp/switch.c > +++ b/arch/arm64/kvm/hyp/switch.c > @@ -387,11 +387,13 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) > * same PC once the SError has been injected, and replay the > * trapping instruction. > */ > - if (*exit_code == ARM_EXCEPTION_TRAP && !__populate_fault_info(vcpu)) > + if (*exit_code != ARM_EXCEPTION_TRAP) > + goto exit; > + > + if (!__populate_fault_info(vcpu)) > return true; > > - if (static_branch_unlikely(&vgic_v2_cpuif_trap) && > - *exit_code == ARM_EXCEPTION_TRAP) { > + if (static_branch_unlikely(&vgic_v2_cpuif_trap)) { > bool valid; > > valid = kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_DABT_LOW && > @@ -417,11 +419,12 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) > *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; > *exit_code = ARM_EXCEPTION_EL1_SERROR; > } > + > + goto exit; > } > } > > if (static_branch_unlikely(&vgic_v3_cpuif_trap) && > - *exit_code == ARM_EXCEPTION_TRAP && > (kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_SYS64 || > kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_CP15_32)) { > int ret = __vgic_v3_perform_cpuif_access(vcpu); > @@ -430,6 +433,7 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) > return true; > } > > +exit: > /* Return to the host kernel and handle the exit */ > return false; > } -- Alex Benn?e
next prev parent reply other threads:[~2018-05-24 15:06 UTC|newest] Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-22 16:05 [PATCH v10 00/18] KVM: arm64: Optimise FPSIMD context switching Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 01/18] arm64: fpsimd: Fix TIF_FOREIGN_FPSTATE after invalidating cpu regs Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 11:33 ` Christoffer Dall 2018-05-23 11:33 ` Christoffer Dall 2018-05-23 13:44 ` Alex Bennée 2018-05-23 13:44 ` Alex Bennée 2018-05-23 13:46 ` Catalin Marinas 2018-05-23 13:46 ` Catalin Marinas 2018-05-22 16:05 ` [PATCH v10 02/18] thread_info: Add update_thread_flag() helpers Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 13:46 ` Alex Bennée 2018-05-23 13:46 ` Alex Bennée 2018-05-23 13:57 ` Dave Martin 2018-05-23 13:57 ` Dave Martin 2018-05-23 14:35 ` Alex Bennée 2018-05-23 14:35 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 03/18] arm64: Use update{,_tsk}_thread_flag() Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 13:48 ` Alex Bennée 2018-05-23 13:48 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 04/18] KVM: arm/arm64: Introduce kvm_arch_vcpu_run_pid_change Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 14:34 ` Alex Bennée 2018-05-23 14:34 ` Alex Bennée 2018-05-23 14:40 ` Dave Martin 2018-05-23 14:40 ` Dave Martin 2018-05-24 8:11 ` Christoffer Dall 2018-05-24 8:11 ` Christoffer Dall 2018-05-24 9:18 ` Alex Bennée 2018-05-24 9:18 ` Alex Bennée 2018-05-24 10:04 ` Dave Martin 2018-05-24 10:04 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 05/18] KVM: arm64: Convert lazy FPSIMD context switch trap to C Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 19:35 ` Alex Bennée 2018-05-23 19:35 ` Alex Bennée 2018-05-24 8:12 ` Christoffer Dall 2018-05-24 8:12 ` Christoffer Dall 2018-05-24 8:54 ` Dave Martin 2018-05-24 8:54 ` Dave Martin 2018-05-24 9:14 ` Alex Bennée 2018-05-24 9:14 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 06/18] arm64: fpsimd: Generalise context saving for non-task contexts Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 20:15 ` Alex Bennée 2018-05-23 20:15 ` Alex Bennée 2018-05-24 9:03 ` Dave Martin 2018-05-24 9:03 ` Dave Martin 2018-05-24 9:41 ` Alex Bennée 2018-05-24 9:41 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 07/18] arm64: fpsimd: Eliminate task->mm checks Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 11:48 ` Christoffer Dall 2018-05-23 11:48 ` Christoffer Dall 2018-05-23 13:31 ` Dave Martin 2018-05-23 13:31 ` Dave Martin 2018-05-23 14:56 ` Catalin Marinas 2018-05-23 14:56 ` Catalin Marinas 2018-05-23 15:03 ` Dave Martin 2018-05-23 15:03 ` Dave Martin 2018-05-23 16:42 ` Catalin Marinas 2018-05-23 16:42 ` Catalin Marinas 2018-05-24 8:33 ` Christoffer Dall 2018-05-24 8:33 ` Christoffer Dall 2018-05-24 9:16 ` Alex Bennée 2018-05-24 9:16 ` Alex Bennée 2018-05-24 9:50 ` Dave Martin 2018-05-24 9:50 ` Dave Martin 2018-05-24 10:06 ` Christoffer Dall 2018-05-24 10:06 ` Christoffer Dall 2018-05-24 14:37 ` Dave Martin 2018-05-24 14:37 ` Dave Martin 2018-05-25 9:00 ` Christoffer Dall 2018-05-25 9:00 ` Christoffer Dall 2018-05-25 9:45 ` Dave Martin 2018-05-25 9:45 ` Dave Martin 2018-05-25 11:28 ` Christoffer Dall 2018-05-25 11:28 ` Christoffer Dall 2018-05-24 9:19 ` Alex Bennée 2018-05-24 9:19 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 08/18] arm64/sve: Refactor user SVE trap maintenance for external use Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 20:16 ` Alex Bennée 2018-05-23 20:16 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 09/18] KVM: arm64: Repurpose vcpu_arch.debug_flags for general-purpose flags Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 9:21 ` Alex Bennée 2018-05-24 9:21 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 10/18] KVM: arm64: Optimise FPSIMD handling to reduce guest/host thrashing Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:09 ` Alex Bennée 2018-05-24 10:09 ` Alex Bennée 2018-05-24 10:18 ` Dave Martin 2018-05-24 10:18 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 11/18] arm64/sve: Move read_zcr_features() out of cpufeature.h Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:12 ` Alex Bennée 2018-05-24 10:12 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 12/18] arm64/sve: Switch sve_pffr() argument from task to thread Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:12 ` Alex Bennée 2018-05-24 10:12 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 13/18] arm64/sve: Move sve_pffr() to fpsimd.h and make inline Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:20 ` Alex Bennée 2018-05-24 10:20 ` Alex Bennée 2018-05-24 11:22 ` Dave Martin 2018-05-24 11:22 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 14/18] KVM: arm64: Save host SVE context as appropriate Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 14:59 ` Catalin Marinas 2018-05-23 14:59 ` Catalin Marinas 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 14:49 ` Alex Bennée 2018-05-24 14:49 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 15/18] KVM: arm64: Remove eager host SVE state saving Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 14:54 ` Alex Bennée 2018-05-24 14:54 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 16/18] KVM: arm64: Remove redundant *exit_code changes in fpsimd_guest_exit() Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 15:02 ` Alex Bennée 2018-05-24 15:02 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 17/18] KVM: arm64: Fold redundant exit code checks out of fixup_guest_exit() Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 9:12 ` Christoffer Dall 2018-05-24 9:12 ` Christoffer Dall 2018-05-24 15:06 ` Alex Bennée [this message] 2018-05-24 15:06 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 18/18] KVM: arm64: Invoke FPSIMD context switch trap from C Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 15:09 ` Alex Bennée 2018-05-24 15:09 ` Alex Bennée
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=87wovtrt2w.fsf@linaro.org \ --to=alex.bennee@linaro.org \ --cc=Dave.Martin@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=cdall@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.