KVM: s390: arm64: Implement vCPU IOCTLs

Implement all required vCPU (arch) IOCTLs.

Co-developed-by: Andreas Grapentin <gra@linux.ibm.com>
Signed-off-by: Andreas Grapentin <gra@linux.ibm.com>
Co-developed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com>
This commit is contained in:
Steffen Eiden 2026-04-02 06:00:00 +02:00 committed by Christian Borntraeger
parent 90246e7d14
commit 0630ce34a0
6 changed files with 609 additions and 1 deletions

View File

@ -6,11 +6,19 @@
#include <linux/kvm.h>
#include <linux/kvm_types.h>
#include <linux/kvm_host.h>
#include <linux/cleanup.h>
#include <linux/fpu.h>
#include <asm/access-regs.h>
#include <arm64/kvm_emulate.h>
#include <arm64/sysreg.h>
#include <gmap.h>
#include <kvm_mmu.h>
#include "arm.h"
#include "handle_exit.h"
#define CREATE_TRACE_POINTS
#include "trace.h"
@ -200,6 +208,22 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
VCPU_EVENT(vcpu, 3, "%s", "free cpu");
}
void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
{
save_access_regs(&vcpu->arch.host_acrs[0]);
vcpu->cpu = cpu;
lasrm(&vcpu->arch.save_area);
}
void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
{
stiasrm(&vcpu->arch.save_area);
vcpu->cpu = -1;
restore_access_regs(&vcpu->arch.host_acrs[0]);
}
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
struct kvm_mp_state *mp_state)
{
@ -225,6 +249,399 @@ static unsigned long system_supported_vcpu_features(struct kvm_vcpu *vcpu)
return features;
}
bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu)
{
return vcpu_mode_priv(vcpu);
}
int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)
{
struct kvm *kvm = vcpu->kvm;
if (!kvm_vcpu_initialized(vcpu))
return -ENOEXEC;
if (!kvm_arm_vcpu_is_finalized(vcpu))
return -EPERM;
if (likely(READ_ONCE(vcpu->pid)))
return 0;
scoped_guard(mutex, &kvm->arch.config_lock)
set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags);
return 0;
}
/**
* check_vcpu_requests - check and handle pending vCPU requests
* @vcpu: the VCPU pointer
*
* Return: 1 if we should enter the guest
* 0 if we should exit to userspace
* < 0 if we should exit to userspace, where the return value indicates
* an error
*/
static int check_vcpu_requests(struct kvm_vcpu *vcpu)
{
if (kvm_request_pending(vcpu)) {
if (kvm_test_request(KVM_REQ_VM_DEAD, vcpu))
return -EIO;
if (kvm_check_request(KVM_REQ_VCPU_RESET, vcpu))
kvm_reset_vcpu(vcpu);
/*
* Clear IRQ_PENDING requests that were made to guarantee
* that a VCPU sees new virtual interrupts.
*/
kvm_check_request(KVM_REQ_IRQ_PENDING, vcpu);
if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu))
asce_flush_tlb(vcpu->kvm->arch.gmap->asce);
}
return 1;
}
static int kvm_vcpu_initialize(struct kvm_vcpu *vcpu,
const struct kvm_vcpu_init *init)
{
unsigned long features = init->features[0];
struct kvm *kvm = vcpu->kvm;
guard(mutex)(&kvm->arch.config_lock);
if (test_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags) &&
kvm_vcpu_init_changed(vcpu, init))
return -EINVAL;
bitmap_copy(kvm->arch.vcpu_features, &features, KVM_VCPU_MAX_FEATURES);
kvm_reset_vcpu(vcpu);
set_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags);
vcpu_set_flag(vcpu, VCPU_INITIALIZED);
return 0;
}
static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
const struct kvm_vcpu_init *init)
{
int ret;
if (init->target != KVM_ARM_TARGET_GENERIC_V8)
return -EINVAL;
ret = kvm_vcpu_init_check_features(vcpu, init);
if (ret)
return ret;
if (!kvm_vcpu_initialized(vcpu))
return kvm_vcpu_initialize(vcpu, init);
if (kvm_vcpu_init_changed(vcpu, init))
return -EINVAL;
kvm_reset_vcpu(vcpu);
return 0;
}
static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,
struct kvm_vcpu_init *init)
{
struct kvm_sae_save_area *save_area = &vcpu->arch.save_area;
struct kvm_sae_block *sae_block = &vcpu->arch.sae_block;
int ret;
sae_block->save_area = virt_to_phys(save_area);
save_area->sdo = virt_to_phys(sae_block);
ret = kvm_vcpu_set_target(vcpu, init);
if (ret)
return ret;
scoped_guard(spinlock, &vcpu->arch.mp_state_lock) {
WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_RUNNABLE);
}
return 0;
}
int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level,
bool line_status)
{
/* stub for now*/
return -EINVAL;
}
static void adjust_pc(struct kvm_vcpu *vcpu)
{
if (vcpu_get_flag(vcpu, INCREMENT_PC)) {
kvm_skip_instr(vcpu);
vcpu_clear_flag(vcpu, INCREMENT_PC);
}
}
static noinstr void arm_vcpu_enter_exit(phys_addr_t sae_block)
{
guest_timing_enter_irqoff();
guest_state_enter_irqoff();
/*
* External interrupts may occur while the SAE instruction is executing
* and must preempt guest execution to maintain responsiveness of the
* host.
*
* As a temporary workaround, run SAE with interrupts enabled so that any
* interrupt is taken via the normal host interrupt path rather than
* being subsumed inside the SAE window.
*/
raw_local_irq_enable();
sae(sae_block);
raw_local_irq_disable();
guest_state_exit_irqoff();
guest_timing_exit_irqoff();
}
/** kvm_arch_vcpu_ioctl_run() - run arm64 vCPU
*
* Execute arm64 guest instructions using SAE.
*
* Returns:
* 1 enter the guest (should not be observed by userspace)
* 0 exit to userspace
* < 0 exit to userspace, where the return value indicates an error
*
*
*/
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
{
DECLARE_KERNEL_FPU_ONSTACK32(fpu_save);
struct kvm_run *kvm_run = vcpu->run;
int ret;
if (kvm_run->exit_reason == KVM_EXIT_MMIO) {
ret = kvm_handle_mmio_return(vcpu);
if (ret <= 0)
return ret;
}
vcpu_load(vcpu);
kernel_fpu_begin(&fpu_save, KERNEL_FPC | KERNEL_VXR);
load_vx_regs((vcpu->arch.ctxt.vregs));
if (!vcpu->wants_to_run) {
ret = -EINTR;
goto out;
}
kvm_sigset_activate(vcpu);
might_fault();
ret = 1;
kvm_run->exit_reason = KVM_EXIT_UNKNOWN;
while (ret > 0) {
ret = kvm_xfer_to_guest_mode_handle_work(vcpu);
if (!ret)
ret = 1;
if (ret > 0)
ret = check_vcpu_requests(vcpu);
vcpu->arch.sae_block.icptr = 0;
local_irq_disable();
xfer_to_guest_mode_prepare();
/*
* The full memory barrier in smp_store_mb() orders the mode
* store against the kvm_request_pending() check below, so
* any pending kick is visible before we decide to enter the
* guest.
*/
smp_store_mb(vcpu->mode, IN_GUEST_MODE);
if (ret <= 0 || kvm_request_pending(vcpu) ||
xfer_to_guest_mode_work_pending()) {
vcpu->mode = OUTSIDE_GUEST_MODE;
local_irq_enable();
continue;
}
trace_kvm_entry(*vcpu_pc(vcpu));
adjust_pc(vcpu);
arm_vcpu_enter_exit(virt_to_phys(&vcpu->arch.sae_block));
vcpu->mode = OUTSIDE_GUEST_MODE;
vcpu->stat.exits++;
local_irq_enable();
trace_kvm_exit(kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));
ret = handle_exit(vcpu);
}
kvm_sigset_deactivate(vcpu);
out:
if (unlikely(vcpu_get_flag(vcpu, INCREMENT_PC)))
adjust_pc(vcpu);
save_vx_regs(vcpu->arch.ctxt.vregs);
kernel_fpu_end(&fpu_save, KERNEL_FPC | KERNEL_VXR);
vcpu_put(vcpu);
return ret;
}
static int kvm_arm_vcpu_set_attr(struct kvm_vcpu *vcpu,
struct kvm_device_attr *attr)
{
int ret;
switch (attr->group) {
default:
ret = -ENXIO;
break;
}
return ret;
}
static int kvm_arm_vcpu_get_attr(struct kvm_vcpu *vcpu,
struct kvm_device_attr *attr)
{
int ret;
switch (attr->group) {
default:
ret = -ENXIO;
break;
}
return ret;
}
static int kvm_arm_vcpu_has_attr(struct kvm_vcpu *vcpu,
struct kvm_device_attr *attr)
{
int ret;
switch (attr->group) {
default:
ret = -ENXIO;
break;
}
return ret;
}
long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
{
struct kvm_vcpu *vcpu = filp->private_data;
void __user *argp = (void __user *)arg;
struct kvm_device_attr attr;
int ret;
switch (ioctl) {
case KVM_ARM_VCPU_INIT: {
struct kvm_vcpu_init init;
ret = -EFAULT;
if (copy_from_user(&init, argp, sizeof(init)))
break;
ret = kvm_arch_vcpu_ioctl_vcpu_init(vcpu, &init);
break;
}
case KVM_SET_ONE_REG:
case KVM_GET_ONE_REG: {
struct kvm_one_reg reg;
ret = -ENOEXEC;
if (unlikely(!kvm_vcpu_initialized(vcpu)))
break;
ret = -EFAULT;
if (copy_from_user(&reg, argp, sizeof(reg)))
break;
if (kvm_check_request(KVM_REQ_VCPU_RESET, vcpu))
kvm_reset_vcpu(vcpu);
if (ioctl == KVM_SET_ONE_REG)
ret = kvm_arm_set_reg(vcpu, &reg);
else
ret = kvm_arm_get_reg(vcpu, &reg);
break;
}
case KVM_GET_REG_LIST: {
struct kvm_reg_list __user *user_list = argp;
struct kvm_reg_list reg_list;
unsigned int n;
ret = -ENOEXEC;
if (unlikely(!kvm_vcpu_initialized(vcpu)))
break;
ret = -EPERM;
if (!kvm_arm_vcpu_is_finalized(vcpu))
break;
ret = -EFAULT;
if (copy_from_user(&reg_list, user_list, sizeof(reg_list)))
break;
n = reg_list.n;
reg_list.n = kvm_arm_num_regs(vcpu);
if (copy_to_user(user_list, &reg_list, sizeof(reg_list)))
break;
ret = -E2BIG;
if (n < reg_list.n)
break;
ret = kvm_arm_copy_reg_indices(vcpu, user_list->reg);
break;
}
case KVM_ARM_VCPU_FINALIZE: {
int what;
if (!kvm_vcpu_initialized(vcpu))
return -ENOEXEC;
if (get_user(what, (const int __user *)argp))
return -EFAULT;
ret = kvm_arm_vcpu_finalize(vcpu, what);
break;
}
case KVM_SET_DEVICE_ATTR: {
ret = -EFAULT;
if (copy_from_user(&attr, argp, sizeof(attr)))
break;
ret = kvm_arm_vcpu_set_attr(vcpu, &attr);
break;
}
case KVM_GET_DEVICE_ATTR: {
ret = -EFAULT;
if (copy_from_user(&attr, argp, sizeof(attr)))
break;
ret = kvm_arm_vcpu_get_attr(vcpu, &attr);
break;
}
case KVM_HAS_DEVICE_ATTR: {
ret = -EFAULT;
if (copy_from_user(&attr, argp, sizeof(attr)))
break;
ret = kvm_arm_vcpu_has_attr(vcpu, &attr);
break;
}
default:
ret = -EINVAL;
}
return ret;
}
int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
struct kvm_dirty_log *log)
{

View File

@ -45,6 +45,51 @@ const struct kvm_stats_header kvm_vcpu_stats_header = {
sizeof(kvm_vcpu_stats_desc),
};
int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
{
int ret;
ret = copy_core_reg_indices(vcpu, uindices);
if (ret < 0)
return ret;
uindices += ret;
return 0;
}
unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu)
{
return num_core_regs(vcpu);
}
int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
{
/* We currently use nothing arch-specific in upper 32 bits */
if ((reg->id & ~KVM_REG_SIZE_MASK) >> 32 != KVM_REG_ARM64 >> 32)
return -EINVAL;
switch (reg->id & KVM_REG_ARM_COPROC_MASK) {
case KVM_REG_ARM_CORE:
return get_core_reg(vcpu, reg);
default:
return -EINVAL;
}
}
int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
{
/* We currently use nothing arch-specific in upper 32 bits */
if ((reg->id & ~KVM_REG_SIZE_MASK) >> 32 != KVM_REG_ARM64 >> 32)
return -EINVAL;
switch (reg->id & KVM_REG_ARM_COPROC_MASK) {
case KVM_REG_ARM_CORE:
return set_core_reg(vcpu, reg);
default:
return -EINVAL;
}
}
int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
{
return -EINVAL;

View File

@ -5,6 +5,8 @@
#include <arm64/esr.h>
#include <arm64/kvm_emulate.h>
#include "handle_exit.h"
typedef int (*exit_handle_fn)(struct kvm_vcpu *);
#define PSCI_0_2_FN_SYSTEM_OFF 0x84000008
@ -84,6 +86,36 @@ static int handle_trap_exceptions(struct kvm_vcpu *vcpu)
return exit_handler(vcpu);
}
/*
* Return > 0 to return to guest, < 0 on error, 0 (and set exit_reason) on
* proper exit to userspace.
*/
int handle_exit(struct kvm_vcpu *vcpu)
{
u8 icptr = vcpu->arch.sae_block.icptr;
int ret = 1;
switch (icptr) {
case SAE_ICPTR_SPURIOUS:
break;
case SAE_ICPTR_VALIDITY:
WARN_ONCE(true, "SAE: validity intercept. vir: 0x%04x",
vcpu->arch.sae_block.vir);
vcpu->run->exit_reason = KVM_EXIT_FAIL_ENTRY;
ret = 0;
break;
case SAE_ICPTR_GUEST_ADDRESS_SIZE:
case SAE_ICPTR_HOST_ACCESS_EXCEPTION:
case SAE_ICPTR_SYNCHRONOUS_EXCEPTION:
ret = handle_trap_exceptions(vcpu);
break;
default:
vcpu->run->exit_reason = KVM_EXIT_FAIL_ENTRY;
ret = 0;
}
return ret;
}
/* manually copied from arch/arm64/kernel/traps.c */
static const char * const esr_class_str[] = {
[0 ... ESR_ELx_EC_MAX] = "UNRECOGNIZED EC",

View File

@ -0,0 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef KVM_ARM64_HANDLE_EXIT_H
#define KVM_ARM64_HANDLE_EXIT_H
#include <linux/kvm_host.h>
int handle_exit(struct kvm_vcpu *vcpu);
#endif /* KVM_ARM64_HANDLE_EXIT_H */

View File

@ -0,0 +1,71 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/kvm_host.h>
#include <linux/fpu.h>
#include <arm64/kvm_emulate.h>
#include <arm64/kvm_nested.h>
bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu)
{
return true;
}
static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
{
vcpu->arch.hcr_el2 = HCR_EL2_E2H | HCR_EL2_RW | HCR_EL2_AMO |
HCR_EL2_IMO | HCR_EL2_FMO | HCR_EL2_PTW;
/* traps */
vcpu->arch.hcr_el2 |= HCR_EL2_TSC | HCR_EL2_TID1 | HCR_EL2_TID2 |
HCR_EL2_TID3 | HCR_EL2_TID4 | HCR_EL2_TID5 |
HCR_EL2_TIDCP | HCR_EL2_TLOR;
}
void kvm_reset_vcpu(struct kvm_vcpu *vcpu)
{
struct vcpu_reset_state reset_state;
bool loaded;
scoped_guard(spinlock, &vcpu->arch.mp_state_lock) {
reset_state = vcpu->arch.reset_state;
vcpu->arch.reset_state.reset = false;
}
/*
* Disable preemption around the vcpu reset as we might otherwise race with
* preempt notifiers which call stiasrm/lasrm from put/load
*/
preempt_disable();
/* The reset must run with an unloaded save area */
loaded = vcpu_is_loaded(vcpu);
if (loaded)
vcpu_put(vcpu);
kvm_reset_vcpu_core(vcpu);
/* Reset special registers */
vcpu_reset_hcr(vcpu);
if (reset_state.reset) {
*vcpu_pc(vcpu) = reset_state.pc;
vcpu_clear_flag(vcpu, PENDING_EXCEPTION);
vcpu_clear_flag(vcpu, EXCEPT_MASK);
vcpu_clear_flag(vcpu, INCREMENT_PC);
vcpu_set_reg(vcpu, 0, reset_state.r0);
}
/* Load new vx-regs into HW if they are currently loaded */
if (current->thread.kfpu_flags)
load_vx_regs(vcpu->arch.ctxt.vregs);
if (loaded)
vcpu_load(vcpu);
preempt_enable();
}
int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature)
{
return -EINVAL;
}

View File

@ -5,7 +5,41 @@
#include <linux/tracepoint.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm
#define TRACE_SYSTEM kvm_arm64
#undef TRACE_SYSTEM_VAR
#define TRACE_SYSTEM_VAR kvm_arm64
TRACE_EVENT(kvm_entry,
TP_PROTO(unsigned long vcpu_pc),
TP_ARGS(vcpu_pc),
TP_STRUCT__entry(
__field(unsigned long, vcpu_pc)
),
TP_fast_assign(__entry->vcpu_pc = vcpu_pc;),
TP_printk("PC: 0x%016lx", __entry->vcpu_pc)
);
TRACE_EVENT(kvm_exit,
TP_PROTO(unsigned int esr_ec, unsigned long vcpu_pc),
TP_ARGS(esr_ec, vcpu_pc),
TP_STRUCT__entry(
__field(unsigned int, esr_ec )
__field(unsigned long, vcpu_pc )
),
TP_fast_assign(
__entry->esr_ec = esr_ec;
__entry->vcpu_pc = vcpu_pc;
),
TP_printk("HSR_EC: 0x%04x, PC: 0x%016lx",
__entry->esr_ec,
__entry->vcpu_pc)
);
#endif /* KVM_ARM64_TRACE_KVM_H */