Commit a066bad8 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-selftests-treewide-6.14' of https://github.com/kvm-x86/linux into HEAD 

KVM selftests "tree"-wide changes for 6.14:

 - Rework vcpu_get_reg() to return a value instead of using an out-param, and
   update all affected arch code accordingly.

 - Convert the max_guest_memory_test into a more generic mmu_stress_test.
   The basic gist of the "conversion" is to have the test do mprotect() on
   guest memory while vCPUs are accessing said memory, e.g. to verify KVM
   and mmu_notifiers are working as intended.

 - Play nice with treewrite builds of unsupported architectures, e.g. arm
   (32-bit), as KVM selftests' Makefile doesn't do anything to ensure the
   target architecture is actually one KVM selftests supports.

 - Use the kernel's $(ARCH) definition instead of the target triple for arch
   specific directories, e.g. arm64 instead of aarch64, mainly so as not to
   be different from the rest of the kernel.
parents 78d4f34e 9af04539

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -12605,8 +12605,8 @@ F: arch/arm64/include/asm/kvm* 
F:	arch/arm64/include/uapi/asm/kvm*

F:	arch/arm64/kvm/

F:	include/kvm/arm_*

F:	tools/testing/selftests/kvm/*/aarch64/

F:	tools/testing/selftests/kvm/aarch64/

F:	tools/testing/selftests/kvm/*/arm64/

F:	tools/testing/selftests/kvm/arm64/









KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch)









M:	Tianrui Zhao <zhaotianrui@loongson.cn>








@@ -12677,8 +12677,8 @@ F:	arch/s390/kvm/







F:	arch/s390/mm/gmap.c









F:	drivers/s390/char/uvdevice.c









F:	tools/testing/selftests/drivers/s390x/uvdevice/









F:	tools/testing/selftests/kvm/*/s390x/









F:	tools/testing/selftests/kvm/s390x/









F:	tools/testing/selftests/kvm/*/s390/









F:	tools/testing/selftests/kvm/s390/

















KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)









M:	Sean Christopherson <seanjc@google.com>








@@ -12695,8 +12695,8 @@ F:	arch/x86/include/uapi/asm/svm.h







F:	arch/x86/include/uapi/asm/vmx.h









F:	arch/x86/kvm/









F:	arch/x86/kvm/*/









F:	tools/testing/selftests/kvm/*/x86_64/









F:	tools/testing/selftests/kvm/x86_64/









F:	tools/testing/selftests/kvm/*/x86/









F:	tools/testing/selftests/kvm/x86/

















KERNFS









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
































arch/arm64/include/uapi/asm/kvm.h



+0
−3






























Original line number
Diff line number
Diff line







@@ -43,9 +43,6 @@







#define KVM_COALESCED_MMIO_PAGE_OFFSET 1









#define KVM_DIRTY_LOG_PAGE_OFFSET 64



















#define KVM_REG_SIZE(id)						\









	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))



















struct kvm_regs {









	struct user_pt_regs regs;	/* sp = sp_el0 */










































arch/riscv/include/uapi/asm/kvm.h



+0
−3






























Original line number
Diff line number
Diff line







@@ -211,9 +211,6 @@ struct kvm_riscv_sbi_sta {







#define KVM_RISCV_TIMER_STATE_OFF	0









#define KVM_RISCV_TIMER_STATE_ON	1



















#define KVM_REG_SIZE(id)		\









	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))



















/* If you need to interpret the index values, here is the key: */









#define KVM_REG_RISCV_TYPE_MASK		0x00000000FF000000









#define KVM_REG_RISCV_TYPE_SHIFT	24
































include/uapi/linux/kvm.h



+4
−0






























Original line number
Diff line number
Diff line







@@ -1070,6 +1070,10 @@ struct kvm_dirty_tlb {

















#define KVM_REG_SIZE_SHIFT	52









#define KVM_REG_SIZE_MASK	0x00f0000000000000ULL



















#define KVM_REG_SIZE(id)		\









	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))



















#define KVM_REG_SIZE_U8		0x0000000000000000ULL









#define KVM_REG_SIZE_U16	0x0010000000000000ULL









#define KVM_REG_SIZE_U32	0x0020000000000000ULL
































tools/testing/selftests/kvm/.gitignore



+1
−0






























Original line number
Diff line number
Diff line







@@ -9,3 +9,4 @@







!config









!settings









!Makefile









!Makefile.kvm








 No newline at end of file