On Tue, 04 Apr 2023 16:40:45 +0100,
Oliver Upton <oliver.upton@xxxxxxxxx> wrote:
>
> In anticipation of user hypercall filters, add the necessary plumbing to
> get SMCCC calls out to userspace. Even though the exit structure has
> space for KVM to pass register arguments, let's just avoid it altogether
> and let userspace poke at the registers via KVM_GET_ONE_REG.
>
> This deliberately stretches the definition of a 'hypercall' to cover
> SMCs from EL1 in addition to the HVCs we know and love. KVM doesn't
> support EL1 calls into secure services, but now we can paint that as a
> userspace problem and be done with it.
>
> Finally, we need a flag to let userspace know what conduit instruction
> was used (i.e. SMC vs. HVC).
>
> Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx>
> ---
> Documentation/virt/kvm/api.rst | 18 ++++++++++++++++--
> arch/arm64/include/uapi/asm/kvm.h | 4 ++++
> arch/arm64/kvm/handle_exit.c | 4 +++-
> arch/arm64/kvm/hypercalls.c | 16 ++++++++++++++++
> 4 files changed, 39 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
> index 9b01e3d0e757..9497792c4ee5 100644
> --- a/Documentation/virt/kvm/api.rst
> +++ b/Documentation/virt/kvm/api.rst
> @@ -6221,11 +6221,25 @@ to the byte array.
> __u64 flags;
> } hypercall;
>
> -Unused. This was once used for 'hypercall to userspace'. To implement
> -such functionality, use KVM_EXIT_IO (x86) or KVM_EXIT_MMIO (all except s390).
> +
> +It is strongly recommended that userspace use ``KVM_EXIT_IO`` (x86) or
> +``KVM_EXIT_MMIO`` (all except s390) to implement functionality that
> +requires a guest to interact with host userpace.
>
> .. note:: KVM_EXIT_IO is significantly faster than KVM_EXIT_MMIO.
>
> +For arm64:
> +----------
> +
> +``nr`` contains the function ID of the guest's SMCCC call. Userspace is
> +expected to use the ``KVM_GET_ONE_REG`` ioctl to retrieve the call
> +parameters from the vCPU's GPRs.
> +
> +Definition of ``flags``:
> + - ``KVM_HYPERCALL_EXIT_SMC``: Indicates that the guest used the SMC
> + conduit to initiate the SMCCC call. If this bit is 0 then the guest
> + used the HVC conduit for the SMCCC call.
> +
> ::
>
> /* KVM_EXIT_TPR_ACCESS */
> diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h
> index f9672ef1159a..f86446c5a7e3 100644
> --- a/arch/arm64/include/uapi/asm/kvm.h
> +++ b/arch/arm64/include/uapi/asm/kvm.h
> @@ -472,12 +472,16 @@ enum {
> enum kvm_smccc_filter_action {
> KVM_SMCCC_FILTER_HANDLE = 0,
> KVM_SMCCC_FILTER_DENY,
> + KVM_SMCCC_FILTER_FWD_TO_USER,
>
> #ifdef __KERNEL__
> NR_SMCCC_FILTER_ACTIONS
> #endif
> };
>
> +/* arm64-specific KVM_EXIT_HYPERCALL flags */
> +#define KVM_HYPERCALL_EXIT_SMC (1U << 0)
> +
> #endif
>
> #endif /* __ARM_KVM_H__ */
> diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
> index 68f95dcd41a1..3f43e20c48b6 100644
> --- a/arch/arm64/kvm/handle_exit.c
> +++ b/arch/arm64/kvm/handle_exit.c
> @@ -71,7 +71,9 @@ static int handle_smc(struct kvm_vcpu *vcpu)
> * Trap exception, not a Secure Monitor Call exception [...]"
> *
> * We need to advance the PC after the trap, as it would
> - * otherwise return to the same address...
> + * otherwise return to the same address. Furthermore, pre-incrementing
> + * the PC before potentially exiting to userspace maintains the same
> + * abstraction for both SMCs and HVCs.
nit: this comment really needs to find its way in the documentation so
that a VMM author can determine the PC of the SMC/HVC. This is
specially important for 32bit, which has a 16bit encodings for
SMC/HVC.
And thinking of it, this outlines a small flaw in this API. If
luserspace needs to find out about the address of the HVC/SMC, it
needs to know the *size* of the instruction. But we don't propagate
the ESR value. I think this still works by construction (userspace can
check PSTATE and work out whether we're in ARM or Thumb mode), but
this feels fragile.
Should we expose the ESR, or at least ESR_EL2.IL as an additional
flag?
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
