From 9a3d32d5180626c70aab7733d7eda9c2d307cb98 Mon Sep 17 00:00:00 2001 From: Peng Liang Date: Mon, 8 Feb 2021 17:16:34 +0800 Subject: [PATCH] kvm: arm64: add KVM_CAP_ARM_CPU_FEATURE extension hulk inclusion category: feature bugzilla: 48052 CVE: NA ------------------------------ Add KVM_CAP_ARM_CPU_FEATURE extension for userpace to check whether KVM supports to set CPU features in AArch64. Signed-off-by: zhanghailiang Signed-off-by: Peng Liang Reviewed-by: Zhanghailiang Signed-off-by: Zheng Zengkai --- arch/arm64/kvm/arm.c | 1 + include/uapi/linux/kvm.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index e0d15e3b8b4b..cc915396275d 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -198,6 +198,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_ARM_IRQ_LINE_LAYOUT_2: case KVM_CAP_ARM_NISV_TO_USER: case KVM_CAP_ARM_INJECT_EXT_DABT: + case KVM_CAP_ARM_CPU_FEATURE: r = 1; break; case KVM_CAP_ARM_SET_DEVICE_ADDR: diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 9976b79da52a..3c0dcfed4835 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1062,6 +1062,8 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_X86_MSR_FILTER 189 #define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190 +#define KVM_CAP_ARM_CPU_FEATURE 555 + #ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing_irqchip { -- GitLab