Merge tag 'kvm-s390-next-5.4-1' of... (17a81bdb) · Commits · 戴 / test

Documentation/virt/kvm/api.txt

+8 −6

Original line number	Diff line number	Diff line
		@@ -3092,12 +3092,14 @@ This exception is also raised directly at the corresponding VCPU if the
		flag KVM_S390_MEMOP_F_INJECT_EXCEPTION is set in the "flags" field.

		The start address of the memory region has to be specified in the "gaddr"
		field, and the length of the region in the "size" field. "buf" is the buffer
		supplied by the userspace application where the read data should be written
		to for KVM_S390_MEMOP_LOGICAL_READ, or where the data that should be written
		is stored for a KVM_S390_MEMOP_LOGICAL_WRITE. "buf" is unused and can be NULL
		when KVM_S390_MEMOP_F_CHECK_ONLY is specified. "ar" designates the access
		register number to be used.
		field, and the length of the region in the "size" field (which must not
		be 0). The maximum value for "size" can be obtained by checking the
		KVM_CAP_S390_MEM_OP capability. "buf" is the buffer supplied by the
		userspace application where the read data should be written to for
		KVM_S390_MEMOP_LOGICAL_READ, or where the data that should be written is
		stored for a KVM_S390_MEMOP_LOGICAL_WRITE. When KVM_S390_MEMOP_F_CHECK_ONLY
		is specified, "buf" is unused and can be NULL. "ar" designates the access
		register number to be used; the valid range is 0..15.

		The "reserved" field is meant for future extensions. It is not used by
		KVM with the currently defined set of flags.

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,12 @@ struct kvm_guest_debug_arch {
		#define KVM_SYNC_GSCB (1UL << 9)
		#define KVM_SYNC_BPBC (1UL << 10)
		#define KVM_SYNC_ETOKEN (1UL << 11)

		#define KVM_SYNC_S390_VALID_FIELDS \
		(KVM_SYNC_PREFIX \| KVM_SYNC_GPRS \| KVM_SYNC_ACRS \| KVM_SYNC_CRS \| \
		KVM_SYNC_ARCH0 \| KVM_SYNC_PFAULT \| KVM_SYNC_VRS \| KVM_SYNC_RICCB \| \
		KVM_SYNC_FPRS \| KVM_SYNC_GSCB \| KVM_SYNC_BPBC \| KVM_SYNC_ETOKEN)

		/* length and alignment of the sdnx as a power of two */
		#define SDNXC 8
		#define SDNXL (1UL << SDNXC)

arch/s390/kvm/kvm-s390.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -3998,6 +3998,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run kvm_run)
		if (kvm_run->immediate_exit)
		return -EINTR;

		if (kvm_run->kvm_valid_regs & ~KVM_SYNC_S390_VALID_FIELDS \|\|
		kvm_run->kvm_dirty_regs & ~KVM_SYNC_S390_VALID_FIELDS)
		return -EINVAL;

		vcpu_load(vcpu);

		if (guestdbg_exit_pending(vcpu)) {
		@@ -4255,7 +4259,7 @@ static long kvm_s390_guest_mem_op(struct kvm_vcpu *vcpu,
		const u64 supported_flags = KVM_S390_MEMOP_F_INJECT_EXCEPTION
		\| KVM_S390_MEMOP_F_CHECK_ONLY;

		if (mop->flags & ~supported_flags)
		if (mop->flags & ~supported_flags \|\| mop->ar >= NUM_ACRS \|\| !mop->size)
		return -EINVAL;

		if (mop->size > MEM_OP_MAX_SIZE)

tools/testing/selftests/kvm/Makefile

+6 −4

Original line number	Diff line number	Diff line
		@@ -7,10 +7,10 @@ top_srcdir = ../../../..
		KSFT_KHDR_INSTALL := 1
		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
		LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/sparsebit.c
		LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c lib/x86_64/ucall.c
		LIBKVM_aarch64 = lib/aarch64/processor.c lib/aarch64/ucall.c
		LIBKVM_s390x = lib/s390x/processor.c lib/s390x/ucall.c

		TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
		TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
		@@ -32,7 +32,9 @@ 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/memop
		TEST_GEN_PROGS_s390x += s390x/sync_regs_test
		TEST_GEN_PROGS_s390x += dirty_log_test
		TEST_GEN_PROGS_s390x += kvm_create_max_vcpus

		TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))

tools/testing/selftests/kvm/dirty_log_test.c

+53 −8

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@
		/* The memory slot index to track dirty pages */
		#define TEST_MEM_SLOT_INDEX 1

		/* Default guest test memory offset, 1G */
		#define DEFAULT_GUEST_TEST_MEM 0x40000000
		/* Default guest test virtual memory offset */
		#define DEFAULT_GUEST_TEST_MEM 0xc0000000

		/* How many pages to dirty for each guest loop */
		#define TEST_PAGES_PER_LOOP 1024
		@@ -38,6 +38,27 @@
		/* Interval for each host loop (ms) */
		#define TEST_HOST_LOOP_INTERVAL 10UL

		/* Dirty bitmaps are always little endian, so we need to swap on big endian */
		#if defined(__s390x__)
		# define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7)
		# define test_bit_le(nr, addr) \
		test_bit((nr) ^ BITOP_LE_SWIZZLE, addr)
		# define set_bit_le(nr, addr) \
		set_bit((nr) ^ BITOP_LE_SWIZZLE, addr)
		# define clear_bit_le(nr, addr) \
		clear_bit((nr) ^ BITOP_LE_SWIZZLE, addr)
		# define test_and_set_bit_le(nr, addr) \
		test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, addr)
		# define test_and_clear_bit_le(nr, addr) \
		test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, addr)
		#else
		# define test_bit_le test_bit
		# define set_bit_le set_bit
		# define clear_bit_le clear_bit
		# define test_and_set_bit_le test_and_set_bit
		# define test_and_clear_bit_le test_and_clear_bit
		#endif

		/*
		* Guest/Host shared variables. Ensure addr_gva2hva() and/or
		* sync_global_to/from_guest() are used when accessing from
		@@ -69,11 +90,23 @@ static uint64_t guest_test_virt_mem = DEFAULT_GUEST_TEST_MEM;
		*/
		static void guest_code(void)
		{
		uint64_t addr;
		int i;

		/*
		* On s390x, all pages of a 1M segment are initially marked as dirty
		* when a page of the segment is written to for the very first time.
		* To compensate this specialty in this test, we need to touch all
		* pages during the first iteration.
		*/
		for (i = 0; i < guest_num_pages; i++) {
		addr = guest_test_virt_mem + i * guest_page_size;
		(uint64_t )addr = READ_ONCE(iteration);
		}

		while (true) {
		for (i = 0; i < TEST_PAGES_PER_LOOP; i++) {
		uint64_t addr = guest_test_virt_mem;
		addr = guest_test_virt_mem;
		addr += (READ_ONCE(random_array[i]) % guest_num_pages)
		* guest_page_size;
		addr &= ~(host_page_size - 1);
		@@ -158,15 +191,15 @@ static void vm_dirty_log_verify(unsigned long *bmap)
		value_ptr = host_test_mem + page * host_page_size;

		/* If this is a special page that we were tracking... */
		if (test_and_clear_bit(page, host_bmap_track)) {
		if (test_and_clear_bit_le(page, host_bmap_track)) {
		host_track_next_count++;
		TEST_ASSERT(test_bit(page, bmap),
		TEST_ASSERT(test_bit_le(page, bmap),
		"Page %"PRIu64" should have its dirty bit "
		"set in this iteration but it is missing",
		page);
		}

		if (test_bit(page, bmap)) {
		if (test_bit_le(page, bmap)) {
		host_dirty_count++;
		/*
		* If the bit is set, the value written onto
		@@ -209,7 +242,7 @@ static void vm_dirty_log_verify(unsigned long *bmap)
		* should report its dirtyness in the
		* next run
		*/
		set_bit(page, host_bmap_track);
		set_bit_le(page, host_bmap_track);
		}
		}
		}
		@@ -293,6 +326,10 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations,
		* case where the size is not aligned to 64 pages.
		*/
		guest_num_pages = (1ul << (30 - guest_page_shift)) + 16;
		#ifdef __s390x__
		/* Round up to multiple of 1M (segment size) */
		guest_num_pages = (guest_num_pages + 0xff) & ~0xffUL;
		#endif
		host_page_size = getpagesize();
		host_num_pages = (guest_num_pages * guest_page_size) / host_page_size +
		!!((guest_num_pages * guest_page_size) % host_page_size);
		@@ -304,6 +341,11 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations,
		guest_test_phys_mem = phys_offset;
		}

		#ifdef __s390x__
		/* Align to 1M (segment size) */
		guest_test_phys_mem &= ~((1 << 20) - 1);
		#endif

		DEBUG("guest physical test memory offset: 0x%lx\n", guest_test_phys_mem);

		bmap = bitmap_alloc(host_num_pages);
		@@ -337,7 +379,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations,
		vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
		#endif
		#ifdef __aarch64__
		ucall_init(vm, UCALL_MMIO, NULL);
		ucall_init(vm, NULL);
		#endif

		/* Export the shared variables to the guest */
		@@ -454,6 +496,9 @@ int main(int argc, char *argv[])
		vm_guest_mode_params_init(VM_MODE_P48V48_64K, true, true);
		}
		#endif
		#ifdef __s390x__
		vm_guest_mode_params_init(VM_MODE_P40V48_4K, true, true);
		#endif

		while ((opt = getopt(argc, argv, "hi:I:p:m:")) != -1) {
		switch (opt) {

Admin message