Commit ede6d0b2 authored by Janosch Frank's avatar Janosch Frank
Browse files

Merge tag 'kvm-x86-selftests-immutable-6.6' into next 

Provide an immutable point in kvm-x86/selftests so that the guest printf()
support can be merged into other architectures' trees.
parents fdf0eaf1 740d087e

arch/x86/kvm/x86.c

+10 −3
Original line number Diff line number Diff line
@@ -11777,15 +11777,22 @@ static int sync_regs(struct kvm_vcpu *vcpu) 
		__set_regs(vcpu, &vcpu->run->s.regs.regs);

		vcpu->run->kvm_dirty_regs &= ~KVM_SYNC_X86_REGS;

	}



	if (vcpu->run->kvm_dirty_regs & KVM_SYNC_X86_SREGS) {

		if (__set_sregs(vcpu, &vcpu->run->s.regs.sregs))

		struct kvm_sregs sregs = vcpu->run->s.regs.sregs;



		if (__set_sregs(vcpu, &sregs))

			return -EINVAL;



		vcpu->run->kvm_dirty_regs &= ~KVM_SYNC_X86_SREGS;

	}



	if (vcpu->run->kvm_dirty_regs & KVM_SYNC_X86_EVENTS) {

		if (kvm_vcpu_ioctl_x86_set_vcpu_events(

				vcpu, &vcpu->run->s.regs.events))

		struct kvm_vcpu_events events = vcpu->run->s.regs.events;



		if (kvm_vcpu_ioctl_x86_set_vcpu_events(vcpu, &events))

			return -EINVAL;



		vcpu->run->kvm_dirty_regs &= ~KVM_SYNC_X86_EVENTS;

	}

tools/testing/selftests/kvm/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LIBKVM += lib/guest_modes.c 
LIBKVM += lib/io.c

LIBKVM += lib/kvm_util.c

LIBKVM += lib/memstress.c

LIBKVM += lib/guest_sprintf.c

LIBKVM += lib/rbtree.c

LIBKVM += lib/sparsebit.c

LIBKVM += lib/test_util.c
@@ -122,6 +123,7 @@ TEST_GEN_PROGS_x86_64 += access_tracking_perf_test 
TEST_GEN_PROGS_x86_64 += demand_paging_test

TEST_GEN_PROGS_x86_64 += dirty_log_test

TEST_GEN_PROGS_x86_64 += dirty_log_perf_test

TEST_GEN_PROGS_x86_64 += guest_print_test

TEST_GEN_PROGS_x86_64 += hardware_disable_test

TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus

TEST_GEN_PROGS_x86_64 += kvm_page_table_test
@@ -152,6 +154,7 @@ TEST_GEN_PROGS_aarch64 += access_tracking_perf_test 
TEST_GEN_PROGS_aarch64 += demand_paging_test

TEST_GEN_PROGS_aarch64 += dirty_log_test

TEST_GEN_PROGS_aarch64 += dirty_log_perf_test

TEST_GEN_PROGS_aarch64 += guest_print_test

TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus

TEST_GEN_PROGS_aarch64 += kvm_page_table_test

TEST_GEN_PROGS_aarch64 += memslot_modification_stress_test
@@ -168,6 +171,7 @@ TEST_GEN_PROGS_s390x += s390x/tprot 
TEST_GEN_PROGS_s390x += s390x/cmma_test

TEST_GEN_PROGS_s390x += demand_paging_test

TEST_GEN_PROGS_s390x += dirty_log_test

TEST_GEN_PROGS_s390x += guest_print_test

TEST_GEN_PROGS_s390x += kvm_create_max_vcpus

TEST_GEN_PROGS_s390x += kvm_page_table_test

TEST_GEN_PROGS_s390x += rseq_test
@@ -176,6 +180,7 @@ TEST_GEN_PROGS_s390x += kvm_binary_stats_test 


TEST_GEN_PROGS_riscv += demand_paging_test

TEST_GEN_PROGS_riscv += dirty_log_test

TEST_GEN_PROGS_riscv += guest_print_test

TEST_GEN_PROGS_riscv += kvm_create_max_vcpus

TEST_GEN_PROGS_riscv += kvm_page_table_test

TEST_GEN_PROGS_riscv += set_memory_region_test
@@ -204,6 +209,7 @@ endif 
CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \

	-Wno-gnu-variable-sized-type-not-at-end -MD\

	-fno-builtin-memcmp -fno-builtin-memcpy -fno-builtin-memset \

	-fno-builtin-strnlen \

	-fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \

	-I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \

	-I$(<D) -Iinclude/$(ARCH_DIR) -I ../rseq -I.. $(EXTRA_CFLAGS) \

tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c

+4 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void test_user_raz_wi(struct kvm_vcpu *vcpu) 
		uint64_t val;



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);



		/*

		 * Expect the ioctl to succeed with no effect on the register
@@ -107,7 +107,7 @@ static void test_user_raz_wi(struct kvm_vcpu *vcpu) 
		vcpu_set_reg(vcpu, reg_id, BAD_ID_REG_VAL);



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);

	}

}
@@ -127,14 +127,14 @@ static void test_user_raz_invariant(struct kvm_vcpu *vcpu) 
		uint64_t val;



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);



		r = __vcpu_set_reg(vcpu, reg_id, BAD_ID_REG_VAL);

		TEST_ASSERT(r < 0 && errno == EINVAL,

			    "unexpected KVM_SET_ONE_REG error: r=%d, errno=%d", r, errno);



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);

	}

}

tools/testing/selftests/kvm/aarch64/arch_timer.c

+9 −13
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
 *

 * Copyright (c) 2021, Google LLC.

 */



#define _GNU_SOURCE



#include <stdlib.h>
@@ -155,11 +154,13 @@ static void guest_validate_irq(unsigned int intid, 
	xcnt_diff_us = cycles_to_usec(xcnt - shared_data->xcnt);



	/* Make sure we are dealing with the correct timer IRQ */

	GUEST_ASSERT_2(intid == timer_irq, intid, timer_irq);

	GUEST_ASSERT_EQ(intid, timer_irq);



	/* Basic 'timer condition met' check */

	GUEST_ASSERT_3(xcnt >= cval, xcnt, cval, xcnt_diff_us);

	GUEST_ASSERT_1(xctl & CTL_ISTATUS, xctl);

	__GUEST_ASSERT(xcnt >= cval,

		       "xcnt = 0x%llx, cval = 0x%llx, xcnt_diff_us = 0x%llx",

		       xcnt, cval, xcnt_diff_us);

	__GUEST_ASSERT(xctl & CTL_ISTATUS, "xcnt = 0x%llx", xcnt);



	WRITE_ONCE(shared_data->nr_iter, shared_data->nr_iter + 1);

}
@@ -192,8 +193,7 @@ static void guest_run_stage(struct test_vcpu_shared_data *shared_data, 
			TIMER_TEST_ERR_MARGIN_US);



		irq_iter = READ_ONCE(shared_data->nr_iter);

		GUEST_ASSERT_2(config_iter + 1 == irq_iter,

				config_iter + 1, irq_iter);

		GUEST_ASSERT_EQ(config_iter + 1, irq_iter);

	}

}
@@ -243,13 +243,9 @@ static void *test_vcpu_run(void *arg) 
		break;

	case UCALL_ABORT:

		sync_global_from_guest(vm, *shared_data);

		REPORT_GUEST_ASSERT_N(uc, "values: %lu, %lu; %lu, vcpu %u; stage; %u; iter: %u",

				      GUEST_ASSERT_ARG(uc, 0),

				      GUEST_ASSERT_ARG(uc, 1),

				      GUEST_ASSERT_ARG(uc, 2),

				      vcpu_idx,

				      shared_data->guest_stage,

				      shared_data->nr_iter);

		fprintf(stderr, "Guest assert failed,  vcpu %u; stage; %u; iter: %u\n",

			vcpu_idx, shared_data->guest_stage, shared_data->nr_iter);

		REPORT_GUEST_ASSERT(uc);

		break;

	default:

		TEST_FAIL("Unexpected guest exit\n");

tools/testing/selftests/kvm/aarch64/debug-exceptions.c

+4 −4
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void guest_wp_handler(struct ex_regs *regs) 


static void guest_ss_handler(struct ex_regs *regs)

{

	GUEST_ASSERT_1(ss_idx < 4, ss_idx);

	__GUEST_ASSERT(ss_idx < 4, "Expected index < 4, got '%u'", ss_idx);

	ss_addr[ss_idx++] = regs->pc;

	regs->pstate |= SPSR_SS;

}
@@ -410,8 +410,8 @@ static void guest_code_ss(int test_cnt) 
		/* Userspace disables Single Step when the end is nigh. */

		asm volatile("iter_ss_end:\n");



		GUEST_ASSERT(bvr == w_bvr);

		GUEST_ASSERT(wvr == w_wvr);

		GUEST_ASSERT_EQ(bvr, w_bvr);

		GUEST_ASSERT_EQ(wvr, w_wvr);

	}

	GUEST_DONE();

}
@@ -450,7 +450,7 @@ static void test_guest_debug_exceptions(uint8_t bpn, uint8_t wpn, uint8_t ctx_bp 
	vcpu_run(vcpu);

	switch (get_ucall(vcpu, &uc)) {

	case UCALL_ABORT:

		REPORT_GUEST_ASSERT_2(uc, "values: %#lx, %#lx");

		REPORT_GUEST_ASSERT(uc);

		break;

	case UCALL_DONE:

		goto done;