Commit 920541bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "A small fix to the reported set of supported CPUID bits, and selftests
  fixes:

   - Skip tests that require EPT when it is not available

   - Do not hang when a test fails with an empty stack trace

   - avoid spurious failure when running access_tracking_perf_test in a
     KVM guest

   - work around GCC's tendency to optimize loops into mem*() functions,
     which breaks because the guest code in selftests cannot call into
     PLTs

   - fix -Warray-bounds error in fix_hypercall_test"

* tag 'for-linus-6.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: selftests: Compare insn opcodes directly in fix_hypercall_test
  KVM: selftests: Implement memcmp(), memcpy(), and memset() for guest use
  KVM: x86: Hide IA32_PLATFORM_DCA_CAP[31:0] from the guest
  KVM: selftests: Gracefully handle empty stack traces
  KVM: selftests: replace assertion with warning in access_tracking_perf_test
  KVM: selftests: Skip tests that require EPT when it is not available
parents 70575e77 39426507

arch/x86/kvm/cpuid.c

+0 −2
Original line number Diff line number Diff line
@@ -902,8 +902,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
			entry->edx = 0;

		}

		break;

	case 9:

		break;

	case 0xa: { /* Architectural Performance Monitoring */

		union cpuid10_eax eax;

		union cpuid10_edx edx;

tools/testing/selftests/kvm/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ LIBKVM += lib/rbtree.c 
LIBKVM += lib/sparsebit.c

LIBKVM += lib/test_util.c



LIBKVM_STRING += lib/string_override.c



LIBKVM_x86_64 += lib/x86_64/apic.c

LIBKVM_x86_64 += lib/x86_64/handlers.S

LIBKVM_x86_64 += lib/x86_64/perf_test_util.c
@@ -220,7 +222,8 @@ LIBKVM_C := $(filter %.c,$(LIBKVM)) 
LIBKVM_S := $(filter %.S,$(LIBKVM))

LIBKVM_C_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_C))

LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S))

LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ)

LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING))

LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ)



EXTRA_CLEAN += $(LIBKVM_OBJS) cscope.*
@@ -231,6 +234,12 @@ $(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c 
$(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S

	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@



# Compile the string overrides as freestanding to prevent the compiler from

# generating self-referential code, e.g. without "freestanding" the compiler may

# "optimize" memcmp() by invoking memcmp(), thus causing infinite recursion.

$(LIBKVM_STRING_OBJ): $(OUTPUT)/%.o: %.c

	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -ffreestanding $< -o $@



x := $(shell mkdir -p $(sort $(dir $(TEST_GEN_PROGS))))

$(TEST_GEN_PROGS): $(LIBKVM_OBJS)

$(TEST_GEN_PROGS_EXTENDED): $(LIBKVM_OBJS)

tools/testing/selftests/kvm/access_tracking_perf_test.c

+16 −9
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ 
 * These limitations are worked around in this test by using a large enough

 * region of memory for each vCPU such that the number of translations cached in

 * the TLB and the number of pages held in pagevecs are a small fraction of the

 * overall workload. And if either of those conditions are not true this test

 * will fail rather than silently passing.

 * overall workload. And if either of those conditions are not true (for example

 * in nesting, where TLB size is unlimited) this test will print a warning

 * rather than silently passing.

 */

#include <inttypes.h>

#include <limits.h>
@@ -172,16 +173,22 @@ static void mark_vcpu_memory_idle(struct kvm_vm *vm, 
		    vcpu_idx, no_pfn, pages);



	/*

	 * Test that at least 90% of memory has been marked idle (the rest might

	 * not be marked idle because the pages have not yet made it to an LRU

	 * list or the translations are still cached in the TLB). 90% is

	 * Check that at least 90% of memory has been marked idle (the rest

	 * might not be marked idle because the pages have not yet made it to an

	 * LRU list or the translations are still cached in the TLB). 90% is

	 * arbitrary; high enough that we ensure most memory access went through

	 * access tracking but low enough as to not make the test too brittle

	 * over time and across architectures.

	 *

	 * Note that when run in nested virtualization, this check will trigger

	 * much more frequently because TLB size is unlimited and since no flush

	 * happens, much more pages are cached there and guest won't see the

	 * "idle" bit cleared.

	 */

	TEST_ASSERT(still_idle < pages / 10,

		    "vCPU%d: Too many pages still idle (%"PRIu64 " out of %"

		    PRIu64 ").\n",

	if (still_idle < pages / 10)

		printf("WARNING: vCPU%d: Too many pages still idle (%" PRIu64

		       "out of %" PRIu64 "), this will affect performance results"

		       ".\n",

		       vcpu_idx, still_idle, pages);



	close(page_idle_fd);

tools/testing/selftests/kvm/include/x86_64/vmx.h

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ void nested_map_memslot(struct vmx_pages *vmx, struct kvm_vm *vm, 
			uint32_t memslot);

void nested_identity_map_1g(struct vmx_pages *vmx, struct kvm_vm *vm,

			    uint64_t addr, uint64_t size);

bool kvm_vm_has_ept(struct kvm_vm *vm);

void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm,

		  uint32_t eptp_memslot);

void prepare_virtualize_apic_accesses(struct vmx_pages *vmx, struct kvm_vm *vm);

tools/testing/selftests/kvm/lib/assert.c

+13 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static void test_dump_stack(void) 
	 * Build and run this command:

	 *

	 *	addr2line -s -e /proc/$PPID/exe -fpai {backtrace addresses} | \

	 *		grep -v test_dump_stack | cat -n 1>&2

	 *		cat -n 1>&2

	 *

	 * Note that the spacing is different and there's no newline.

	 */
@@ -36,18 +36,24 @@ static void test_dump_stack(void) 
		 n * (((sizeof(void *)) * 2) + 1) +

		 /* Null terminator: */

		 1];

	char *c;

	char *c = cmd;



	n = backtrace(stack, n);

	c = &cmd[0];

	c += sprintf(c, "%s", addr2line);

	/*

	 * Skip the first 3 frames: backtrace, test_dump_stack, and

	 * test_assert. We hope that backtrace isn't inlined and the other two

	 * we've declared noinline.

	 * Skip the first 2 frames, which should be test_dump_stack() and

	 * test_assert(); both of which are declared noinline.  Bail if the

	 * resulting stack trace would be empty. Otherwise, addr2line will block

	 * waiting for addresses to be passed in via stdin.

	 */

	if (n <= 2) {

		fputs("  (stack trace empty)\n", stderr);

		return;

	}



	c += sprintf(c, "%s", addr2line);

	for (i = 2; i < n; i++)

		c += sprintf(c, " %lx", ((unsigned long) stack[i]) - 1);



	c += sprintf(c, "%s", pipeline);

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-result"