KVM: move KVM_CAP_DEVICE_CTRL to the generic check
PATCH RESEND v2 1/1 KVM: move KVM_CAP_DEVICE_CTRL to the generic check
KVM_CAP_DEVICE_CTRL allows userspace to check if the kvm_device framework (e.g. KVM_CREATE_DEVICE) is supported by KVM. Move KVM_CAP_DEVICE_CTRL to the generic check for the two reasons:
1) it already supports arch agnostic usages (i.e. KVM_DEV_TYPE_VFIO). For example, userspace VFIO implementation may needs to create KVM_DEV_TYPE_VFIO on x86, riscv, or arm etc. It is simpler to have it checked at the generic code than at each arch's code.
2) KVM_CREATE_DEVICE has been added to the generic code.
--- arch/arm64/kvm/arm.c | 1 - arch/powerpc/kvm/powerpc.c | 1 - arch/riscv/kvm/vm.c | 1 - arch/s390/kvm/kvm-s390.c | 1 - virt/kvm/kvm_main.c | 1 + 5 files changed, 1 insertion(+), 4 deletions(-)
arch/arm64/kvm/arm.c +0 -1
@@ -202,7 +202,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = vgic_present;break ;case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :
arch/powerpc/kvm/powerpc.c +0 -1
@@ -526,7 +526,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ENABLE_CAP :case KVM_CAP_ONE_REG :case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_IMMEDIATE_EXIT :case KVM_CAP_SET_GUEST_DEBUG : r =1 ;
arch/riscv/kvm/vm.c +0 -1
@@ -57,7 +57,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)switch (ext) {case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :
arch/s390/kvm/kvm-s390.c +0 -1
@@ -556,7 +556,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ENABLE_CAP :case KVM_CAP_S390_CSS_SUPPORT :case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_S390_IRQCHIP :case KVM_CAP_VM_ATTRIBUTES :case KVM_CAP_MP_STATE :
virt/kvm/kvm_main.c +1 -0
@@ -4523,6 +4523,7 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)#endif case KVM_CAP_BINARY_STATS_FD :case KVM_CAP_SYSTEM_EVENT_DATA : +case KVM_CAP_DEVICE_CTRL :return 1 ;default :break ;
Signature · 1 line
2.27.0
Sean Christopherson
reviewer+<everyone else>
Please use scripts/get_maintainer.pl to generate the To/Cc lists. This may be trivial, but it still needs eyeballs from the relevant maintainers.
Quoted 83 lines · Wei Wang
KVM_CAP_DEVICE_CTRLallows userspace to check if thekvm_deviceframework (e.g.KVM_CREATE_DEVICE) is supported by KVM. MoveKVM_CAP_DEVICE_CTRLto the generic check for the two reasons:
1) it already supports arch agnostic usages (i.e.KVM_DEV_TYPE_VFIO). For example, userspace VFIO implementation may needs to createKVM_DEV_TYPE_VFIOon x86, riscv, or arm etc. It is simpler to have it checked at the generic code than at each arch's code.
2)KVM_CREATE_DEVICEhas been added to the generic code.Link https://lore.kernel.org/all/20221215115207.14784-1-wei.w.wang at intel.comSigned-off-by Wei Wang <[email protected]>Reviewed-by Sean Christopherson <[email protected]>--- arch/arm64/kvm/arm.c | 1 - arch/powerpc/kvm/powerpc.c | 1 - arch/riscv/kvm/vm.c | 1 - arch/s390/kvm/kvm-s390.c | 1 - virt/kvm/kvm_main.c | 1 + 5 files changed, 1 insertion(+), 4 deletions(-)arch/arm64/kvm/arm.c +0
-1@@ -202,7 +202,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = vgic_present;break ;case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :arch/powerpc/kvm/powerpc.c +0
-1@@ -526,7 +526,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ENABLE_CAP :case KVM_CAP_ONE_REG :case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_IMMEDIATE_EXIT :case KVM_CAP_SET_GUEST_DEBUG : r =1 ;arch/riscv/kvm/vm.c +0
-1@@ -57,7 +57,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)switch (ext) {case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :arch/s390/kvm/kvm-s390.c +0
-1@@ -556,7 +556,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ENABLE_CAP :case KVM_CAP_S390_CSS_SUPPORT :case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_S390_IRQCHIP :case KVM_CAP_VM_ATTRIBUTES :case KVM_CAP_MP_STATE :virt/kvm/kvm_main.c +1
-0@@ -4523,6 +4523,7 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)#endif case KVM_CAP_BINARY_STATS_FD :case KVM_CAP_SYSTEM_EVENT_DATA : +case KVM_CAP_DEVICE_CTRL :return 1 ;default :break ;Signature · 1 line
2.27.0
Oliver Upton
Reviewed-byQuoted 4 lines · Sean Christopherson
+<everyone else>
Please use
scripts/get_maintainer.plto generate the To/Cc lists. This may be trivial, but it still needs eyeballs from the relevant maintainers.
+1000. I'd buy someone a beer if they made a bot that just ran get_maintainer on patches that hit the list :)
Quoted 21 lines · Wei Wang
Quoted 20 lines
KVM_CAP_DEVICE_CTRLallows userspace to check if thekvm_deviceframework (e.g.KVM_CREATE_DEVICE) is supported by KVM. MoveKVM_CAP_DEVICE_CTRLto the generic check for the two reasons:
1) it already supports arch agnostic usages (i.e.KVM_DEV_TYPE_VFIO). For example, userspace VFIO implementation may needs to createKVM_DEV_TYPE_VFIOon x86, riscv, or arm etc. It is simpler to have it checked at the generic code than at each arch's code.
2)KVM_CREATE_DEVICEhas been added to the generic code.Link https://lore.kernel.org/all/20221215115207.14784-1-wei.w.wang at intel.comSigned-off-by Wei Wang <[email protected]>Reviewed-by Sean Christopherson <[email protected]>--- arch/arm64/kvm/arm.c | 1 - arch/powerpc/kvm/powerpc.c | 1 - arch/riscv/kvm/vm.c | 1 - arch/s390/kvm/kvm-s390.c | 1 - virt/kvm/kvm_main.c | 1 + 5 files changed, 1 insertion(+), 4 deletions(-)
Quoted 12 lines
arch/arm64/kvm/arm.c int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) · line 207
Quoted 12 lines
arch/arm64/kvm/arm.c +0
-1@@ -202,7 +202,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = vgic_present;break ;case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :
for arm64:
Signature · 2 lines
Thanks, Oliver
Quoted 9 lines · Wei Wang
KVM_CAP_DEVICE_CTRLallows userspace to check if thekvm_deviceframework (e.g.KVM_CREATE_DEVICE) is supported by KVM. MoveKVM_CAP_DEVICE_CTRLto the generic check for the two reasons:
1) it already supports arch agnostic usages (i.e.KVM_DEV_TYPE_VFIO). For example, userspace VFIO implementation may needs to createKVM_DEV_TYPE_VFIOon x86, riscv, or arm etc. It is simpler to have it checked at the generic code than at each arch's code.
2)KVM_CREATE_DEVICEhas been added to the generic code.
Quoted 6 lines
Signed-off-by Wei Wang <[email protected]>Reviewed-by Sean Christopherson <[email protected]>--- arch/arm64/kvm/arm.c | 1 - arch/powerpc/kvm/powerpc.c | 1 -
cheers
Quoted 10 lines · Wei Wang
KVM_CAP_DEVICE_CTRLallows userspace to check if thekvm_deviceframework (e.g.KVM_CREATE_DEVICE) is supported by KVM. MoveKVM_CAP_DEVICE_CTRLto the generic check for the two reasons:
1) it already supports arch agnostic usages (i.e.KVM_DEV_TYPE_VFIO). For example, userspace VFIO implementation may needs to createKVM_DEV_TYPE_VFIOon x86, riscv, or arm etc. It is simpler to have it checked at the generic code than at each arch's code.
2)KVM_CREATE_DEVICEhas been added to the generic code.
Quoted 3 lines
Signed-off-by Wei Wang <[email protected]>Reviewed-by Sean Christopherson <[email protected]>
Thanks,
Anup
Quoted 71 lines
--- arch/arm64/kvm/arm.c | 1 - arch/powerpc/kvm/powerpc.c | 1 - arch/riscv/kvm/vm.c | 1 - arch/s390/kvm/kvm-s390.c | 1 - virt/kvm/kvm_main.c | 1 + 5 files changed, 1 insertion(+), 4 deletions(-)arch/arm64/kvm/arm.c +0
-1@@ -202,7 +202,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = vgic_present;break ;case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :arch/powerpc/kvm/powerpc.c +0
-1@@ -526,7 +526,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ENABLE_CAP :case KVM_CAP_ONE_REG :case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_IMMEDIATE_EXIT :case KVM_CAP_SET_GUEST_DEBUG : r =1 ;arch/riscv/kvm/vm.c +0
-1@@ -57,7 +57,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)switch (ext) {case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_USER_MEMORY :case KVM_CAP_SYNC_MMU :case KVM_CAP_DESTROY_MEMORY_REGION_WORKS :arch/s390/kvm/kvm-s390.c +0
-1@@ -556,7 +556,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ENABLE_CAP :case KVM_CAP_S390_CSS_SUPPORT :case KVM_CAP_IOEVENTFD : -case KVM_CAP_DEVICE_CTRL :case KVM_CAP_S390_IRQCHIP :case KVM_CAP_VM_ATTRIBUTES :case KVM_CAP_MP_STATE :virt/kvm/kvm_main.c +1
-1@@ -4523,6 +4523,7 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)#endif case KVM_CAP_BINARY_STATS_FD :case KVM_CAP_SYSTEM_EVENT_DATA : +case KVM_CAP_DEVICE_CTRL :return 1 ;default :break ; --2.27.0
Quoted 10 lines · Wei Wang
KVM_CAP_DEVICE_CTRLallows userspace to check if thekvm_deviceframework (e.g.KVM_CREATE_DEVICE) is supported by KVM. MoveKVM_CAP_DEVICE_CTRLto the generic check for the two reasons:
1) it already supports arch agnostic usages (i.e.KVM_DEV_TYPE_VFIO). For example, userspace VFIO implementation may needs to createKVM_DEV_TYPE_VFIOon x86, riscv, or arm etc. It is simpler to have it checked at the generic code than at each arch's code.
2)KVM_CREATE_DEVICEhas been added to the generic code.[...]
Applied to kvm-x86 generic, thanks!
[1/1] KVM: move KVM_CAP_DEVICE_CTRL to the generic check
https://github.com/kvm-x86/linux/commit/63912245c19d