Skip to content

Commit a066bad

Browse files
committed
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.
2 parents 78d4f34 + 9af0453 commit a066bad

File tree

164 files changed

+587
-480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+587
-480
lines changed

MAINTAINERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12605,8 +12605,8 @@ F: arch/arm64/include/asm/kvm*
1260512605
F: arch/arm64/include/uapi/asm/kvm*
1260612606
F: arch/arm64/kvm/
1260712607
F: include/kvm/arm_*
12608-
F: tools/testing/selftests/kvm/*/aarch64/
12609-
F: tools/testing/selftests/kvm/aarch64/
12608+
F: tools/testing/selftests/kvm/*/arm64/
12609+
F: tools/testing/selftests/kvm/arm64/
1261012610

1261112611
KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch)
1261212612
M: Tianrui Zhao <zhaotianrui@loongson.cn>
@@ -12677,8 +12677,8 @@ F: arch/s390/kvm/
1267712677
F: arch/s390/mm/gmap.c
1267812678
F: drivers/s390/char/uvdevice.c
1267912679
F: tools/testing/selftests/drivers/s390x/uvdevice/
12680-
F: tools/testing/selftests/kvm/*/s390x/
12681-
F: tools/testing/selftests/kvm/s390x/
12680+
F: tools/testing/selftests/kvm/*/s390/
12681+
F: tools/testing/selftests/kvm/s390/
1268212682

1268312683
KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
1268412684
M: Sean Christopherson <seanjc@google.com>
@@ -12695,8 +12695,8 @@ F: arch/x86/include/uapi/asm/svm.h
1269512695
F: arch/x86/include/uapi/asm/vmx.h
1269612696
F: arch/x86/kvm/
1269712697
F: arch/x86/kvm/*/
12698-
F: tools/testing/selftests/kvm/*/x86_64/
12699-
F: tools/testing/selftests/kvm/x86_64/
12698+
F: tools/testing/selftests/kvm/*/x86/
12699+
F: tools/testing/selftests/kvm/x86/
1270012700

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
4444
#define KVM_DIRTY_LOG_PAGE_OFFSET 64
4545

46-
#define KVM_REG_SIZE(id) \
47-
(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
48-
4946
struct kvm_regs {
5047
struct user_pt_regs regs; /* sp = sp_el0 */
5148

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ struct kvm_riscv_sbi_sta {
211211
#define KVM_RISCV_TIMER_STATE_OFF 0
212212
#define KVM_RISCV_TIMER_STATE_ON 1
213213

214-
#define KVM_REG_SIZE(id) \
215-
(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
216-
217214
/* If you need to interpret the index values, here is the key: */
218215
#define KVM_REG_RISCV_TYPE_MASK 0x00000000FF000000
219216
#define KVM_REG_RISCV_TYPE_SHIFT 24

include/uapi/linux/kvm.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,10 @@ struct kvm_dirty_tlb {
10701070

10711071
#define KVM_REG_SIZE_SHIFT 52
10721072
#define KVM_REG_SIZE_MASK 0x00f0000000000000ULL
1073+
1074+
#define KVM_REG_SIZE(id) \
1075+
(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
1076+
10731077
#define KVM_REG_SIZE_U8 0x0000000000000000ULL
10741078
#define KVM_REG_SIZE_U16 0x0010000000000000ULL
10751079
#define KVM_REG_SIZE_U32 0x0020000000000000ULL

tools/testing/selftests/kvm/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
!config
1010
!settings
1111
!Makefile
12+
!Makefile.kvm

0 commit comments

Comments
 (0)