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

Merge tag 'kvm-s390-next-5.3-1' of... 

Merge tag 'kvm-s390-next-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: add kselftests

This is the initial implementation for KVM selftests on s390.
parents a6a6d3b1 8343ba2d

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -8797,6 +8797,8 @@ F: arch/s390/include/asm/gmap.h 
F:	arch/s390/include/asm/kvm*

F:	arch/s390/kvm/

F:	arch/s390/mm/gmap.c

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

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



KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)

M:	Paolo Bonzini <pbonzini@redhat.com>

tools/testing/selftests/kvm/Makefile

+12 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ UNAME_M := $(shell uname -m) 
LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebit.c

LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c

LIBKVM_aarch64 = lib/aarch64/processor.c

LIBKVM_s390x = lib/s390x/processor.c



TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test

TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test

TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid

TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus

TEST_GEN_PROGS_x86_64 += x86_64/mmio_warning_test

TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test

TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
@@ -26,9 +26,14 @@ TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test 
TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test

TEST_GEN_PROGS_x86_64 += clear_dirty_log_test

TEST_GEN_PROGS_x86_64 += dirty_log_test

TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus



TEST_GEN_PROGS_aarch64 += clear_dirty_log_test

TEST_GEN_PROGS_aarch64 += dirty_log_test

TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus



TEST_GEN_PROGS_s390x += s390x/sync_regs_test

TEST_GEN_PROGS_s390x += kvm_create_max_vcpus



TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))

LIBKVM += $(LIBKVM_$(UNAME_M))
@@ -43,7 +48,12 @@ CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ 
no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \

        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)



LDFLAGS += -pthread $(no-pie-option)

# On s390, build the testcases KVM-enabled

pgste-option = $(call try-run, echo 'int main() { return 0; }' | \

	$(CC) -Werror -Wl$(comma)--s390-pgste -x c - -o "$$TMP",-Wl$(comma)--s390-pgste)





LDFLAGS += -pthread $(no-pie-option) $(pgste-option)



# After inclusion, $(OUTPUT) is defined and

# $(TEST_GEN_PROGS) starts with $(OUTPUT)/

tools/testing/selftests/kvm/include/kvm_util.h

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ enum vm_guest_mode { 
	NUM_VM_MODES,

};



#ifdef __aarch64__

#define VM_MODE_DEFAULT VM_MODE_P40V48_4K

#else

#define VM_MODE_DEFAULT VM_MODE_P52V48_4K

#endif



#define vm_guest_mode_string(m) vm_guest_mode_string[m]

extern const char * const vm_guest_mode_string[];
@@ -111,10 +117,12 @@ void vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid, 
		    struct kvm_sregs *sregs);

int _vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid,

		    struct kvm_sregs *sregs);

#ifdef __KVM_HAVE_VCPU_EVENTS

void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_vcpu_events *events);

void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_vcpu_events *events);

#endif

#ifdef __x86_64__

void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,

			   struct kvm_nested_state *state);

tools/testing/selftests/kvm/include/s390x/processor.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * s390x processor specific defines

 */

#ifndef SELFTEST_KVM_PROCESSOR_H

#define SELFTEST_KVM_PROCESSOR_H



/* Bits in the region/segment table entry */

#define REGION_ENTRY_ORIGIN	~0xfffUL /* region/segment table origin	   */

#define REGION_ENTRY_PROTECT	0x200	 /* region protection bit	   */

#define REGION_ENTRY_NOEXEC	0x100	 /* region no-execute bit	   */

#define REGION_ENTRY_OFFSET	0xc0	 /* region table offset		   */

#define REGION_ENTRY_INVALID	0x20	 /* invalid region table entry	   */

#define REGION_ENTRY_TYPE	0x0c	 /* region/segment table type mask */

#define REGION_ENTRY_LENGTH	0x03	 /* region third length		   */



/* Bits in the page table entry */

#define PAGE_INVALID	0x400		/* HW invalid bit    */

#define PAGE_PROTECT	0x200		/* HW read-only bit  */

#define PAGE_NOEXEC	0x100		/* HW no-execute bit */



#endif

tools/testing/selftests/kvm/x86_64/kvm_create_max_vcpus.c→tools/testing/selftests/kvm/kvm_create_max_vcpus.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus) 
	printf("Testing creating %d vCPUs, with IDs %d...%d.\n",

	       num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus - 1);



	vm = vm_create(VM_MODE_P52V48_4K, DEFAULT_GUEST_PHY_PAGES, O_RDWR);

	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR);



	for (i = 0; i < num_vcpus; i++) {

		int vcpu_id = first_vcpu_id + i;