Hi Fuad,
On Wed, 18 Aug 2021 17:45:50 +0100,
Marc Zyngier <maz@xxxxxxxxxx> wrote:
>
> On Tue, 17 Aug 2021 09:11:30 +0100,
> Fuad Tabba <tabba@xxxxxxxxxx> wrote:
> >
> > Add an array of pointers to handlers for various trap reasons in
> > nVHE code.
> >
> > The current code selects how to fixup a guest on exit based on a
> > series of if/else statements. Future patches will also require
> > different handling for guest exists. Create an array of handlers
> > to consolidate them.
> >
> > No functional change intended as the array isn't populated yet.
> >
> > Acked-by: Will Deacon <will@xxxxxxxxxx>
> > Signed-off-by: Fuad Tabba <tabba@xxxxxxxxxx>
> > ---
> > arch/arm64/kvm/hyp/include/hyp/switch.h | 43 +++++++++++++++++++++++++
> > arch/arm64/kvm/hyp/nvhe/switch.c | 33 +++++++++++++++++++
> > 2 files changed, 76 insertions(+)
> >
> > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
> > index a0e78a6027be..5a2b89b96c67 100644
> > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h
> > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
> > @@ -409,6 +409,46 @@ static inline bool __hyp_handle_ptrauth(struct kvm_vcpu *vcpu)
> > return true;
> > }
> >
> > +typedef int (*exit_handle_fn)(struct kvm_vcpu *);
>
> This returns an int...
>
> > +
> > +exit_handle_fn kvm_get_nvhe_exit_handler(struct kvm_vcpu *vcpu);
> > +
> > +static exit_handle_fn kvm_get_hyp_exit_handler(struct kvm_vcpu *vcpu)
> > +{
> > + return is_nvhe_hyp_code() ? kvm_get_nvhe_exit_handler(vcpu) : NULL;
> > +}
> > +
> > +/*
> > + * Allow the hypervisor to handle the exit with an exit handler if it has one.
> > + *
> > + * Returns true if the hypervisor handled the exit, and control should go back
> > + * to the guest, or false if it hasn't.
> > + */
> > +static bool kvm_hyp_handle_exit(struct kvm_vcpu *vcpu)
> > +{
> > + bool is_handled = false;
>
> ... which you then implicitly cast as a bool.
>
> > + exit_handle_fn exit_handler = kvm_get_hyp_exit_handler(vcpu);
> > +
> > + if (exit_handler) {
> > + /*
> > + * There's limited vcpu context here since it's not synced yet.
> > + * Ensure that relevant vcpu context that might be used by the
> > + * exit_handler is in sync before it's called and if handled.
> > + */
> > + *vcpu_pc(vcpu) = read_sysreg_el2(SYS_ELR);
> > + *vcpu_cpsr(vcpu) = read_sysreg_el2(SYS_SPSR);
> > +
> > + is_handled = exit_handler(vcpu);
>
> What does 'is_handled' mean here? By definition, any trap *must* be
> handled, one way or another. By the look of it, what you really mean
> is something like "I have updated the vcpu state and you'd better
> reload it". Is that what it means?
>
> > +
> > + if (is_handled) {
> > + write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR);
> > + write_sysreg_el2(*vcpu_cpsr(vcpu), SYS_SPSR);
> > + }
> > + }
> > +
> > + return is_handled;
> > +}
>
> All these functions really should be marked inline. Have you checked
> how this expands on VHE? I think some compilers could be pretty
> unhappy about the undefined symbol in kvm_get_hyp_exit_handler().
>
> It is also unfortunate that we get a bunch of tests for various
> flavours of traps (FP, PAuth, page faults...), only to hit yet another
> decoding tree. Is there a way we could use this infrastructure for
> everything?
I realised that I wasn't very forthcoming here. I've decided to put
the code where my mouth is and pushed out a branch [1] with your first
10 patches, followed by my own take on this particular problem. It
compiles, and even managed to boot a Debian guest on a nVHE box.
As you can see, most of the early exit handling is now moved to
specific handlers, unifying the handling. For the protected mode, you
can provide your own handler array (just hack
kvm_get_exit_handler_array() to return something else), which will do
the right thing as long as you call into the existing handlers first.
When it comes to the ELR/SPSR handling, it is better left to the
individual handlers (which we already do in some cases, see how we
skip instructions, for example).
Please let me know what you think.
Thanks,
M.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/pkvm-fixed-features
--
Without deviation from the norm, progress is not possible.
