Linux-RISC-V Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Marc Zyngier <maz@kernel.org>,
	Oliver Upton <oliver.upton@linux.dev>,
	 Paolo Bonzini <pbonzini@redhat.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	 Janosch Frank <frankja@linux.ibm.com>,
	Claudio Imbrenda <imbrenda@linux.ibm.com>,
	 Sean Christopherson <seanjc@google.com>,
	Anup Patel <anup@brainfault.org>,
	 Paul Walmsley <paul.walmsley@sifive.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	 Albert Ou <aou@eecs.berkeley.edu>
Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
	 kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
	 linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
	 Ackerley Tng <ackerleytng@google.com>
Subject: [PATCH 05/18] KVM: selftests: Move platform_info_test's main assert into guest code
Date: Thu, 14 Mar 2024 16:26:24 -0700	[thread overview]
Message-ID: <20240314232637.2538648-6-seanjc@google.com> (raw)
In-Reply-To: <20240314232637.2538648-1-seanjc@google.com>

As a first step toward gracefully handling the expected #GP on RDMSR in
platform_info_test, move the test's assert on the non-faulting RDMSR
result into the guest itself.  This will allow using a unified flow for
the host userspace side of things.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 .../selftests/kvm/x86_64/platform_info_test.c | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/testing/selftests/kvm/x86_64/platform_info_test.c b/tools/testing/selftests/kvm/x86_64/platform_info_test.c
index 87011965dc41..cdad7e2124c8 100644
--- a/tools/testing/selftests/kvm/x86_64/platform_info_test.c
+++ b/tools/testing/selftests/kvm/x86_64/platform_info_test.c
@@ -29,7 +29,9 @@ static void guest_code(void)
 
 	for (;;) {
 		msr_platform_info = rdmsr(MSR_PLATFORM_INFO);
-		GUEST_SYNC(msr_platform_info);
+		GUEST_ASSERT_EQ(msr_platform_info & MSR_PLATFORM_INFO_MAX_TURBO_RATIO,
+				MSR_PLATFORM_INFO_MAX_TURBO_RATIO);
+		GUEST_SYNC(0);
 		asm volatile ("inc %r11");
 	}
 }
@@ -42,13 +44,15 @@ static void test_msr_platform_info_enabled(struct kvm_vcpu *vcpu)
 	vcpu_run(vcpu);
 	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);
 
-	get_ucall(vcpu, &uc);
-	TEST_ASSERT(uc.cmd == UCALL_SYNC,
-			"Received ucall other than UCALL_SYNC: %lu", uc.cmd);
-	TEST_ASSERT((uc.args[1] & MSR_PLATFORM_INFO_MAX_TURBO_RATIO) ==
-		MSR_PLATFORM_INFO_MAX_TURBO_RATIO,
-		"Expected MSR_PLATFORM_INFO to have max turbo ratio mask: %i.",
-		MSR_PLATFORM_INFO_MAX_TURBO_RATIO);
+	switch (get_ucall(vcpu, &uc)) {
+	case UCALL_SYNC:
+		break;
+	case UCALL_ABORT:
+		REPORT_GUEST_ASSERT(uc);
+	default:
+		TEST_FAIL("Unexpected ucall %lu", uc.cmd);
+		break;
+	}
 }
 
 static void test_msr_platform_info_disabled(struct kvm_vcpu *vcpu)
-- 
2.44.0.291.gc1ea87d7ee-goog


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  parent reply	other threads:[~2024-03-14 23:28 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-14 23:26 [PATCH 00/18] KVM: selftests: Clean up x86's DT initialization Sean Christopherson
2024-03-14 23:26 ` [PATCH 01/18] Revert "kvm: selftests: move base kvm_util.h declarations to kvm_util_base.h" Sean Christopherson
2024-03-28  2:49   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 02/18] KVM: sefltests: Add kvm_util_types.h to hold common types, e.g. vm_vaddr_t Sean Christopherson
2024-03-28  2:48   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 03/18] KVM: selftests: Move GDT, IDT, and TSS fields to x86's kvm_vm_arch Sean Christopherson
2024-03-28  2:48   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 04/18] KVM: selftests: Fix off-by-one initialization of GDT limit Sean Christopherson
2024-03-14 23:26 ` Sean Christopherson [this message]
2024-03-14 23:26 ` [PATCH 06/18] KVM: selftests: Rework platform_info_test to actually verify #GP Sean Christopherson
2024-03-14 23:26 ` [PATCH 07/18] KVM: selftests: Explicitly clobber the IDT in the "delete memslot" testcase Sean Christopherson
2024-03-14 23:26 ` [PATCH 08/18] KVM: selftests: Move x86's descriptor table helpers "up" in processor.c Sean Christopherson
2024-03-28  2:47   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 09/18] KVM: selftests: Rename x86's vcpu_setup() to vcpu_init_sregs() Sean Christopherson
2024-03-28  2:47   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 10/18] KVM: selftests: Init IDT and exception handlers for all VMs/vCPUs on x86 Sean Christopherson
2024-03-28  2:46   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 11/18] KVM: selftests: Map x86's exception_handlers at VM creation, not vCPU setup Sean Christopherson
2024-03-28  2:35   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 12/18] KVM: selftests: Allocate x86's GDT during VM creation Sean Christopherson
2024-03-28  2:33   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 13/18] KVM: selftests: Drop superfluous switch() on vm->mode in vcpu_init_sregs() Sean Christopherson
2024-03-28  2:28   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 14/18] KVM: selftests: Fold x86's descriptor tables helpers into vcpu_init_sregs() Sean Christopherson
2024-03-28  2:50   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 15/18] KVM: selftests: Allocate x86's TSS at VM creation Sean Christopherson
2024-03-28  2:50   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 16/18] KVM: selftests: Add macro for TSS selector, rename up code/data macros Sean Christopherson
2024-03-28  2:52   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 17/18] KVM: selftests: Init x86's segments during VM creation Sean Christopherson
2024-03-28  2:51   ` Ackerley Tng
2024-03-14 23:26 ` [PATCH 18/18] KVM: selftests: Drop @selector from segment helpers Sean Christopherson
2024-03-28  2:51   ` Ackerley Tng
2024-04-29 20:45 ` [PATCH 00/18] KVM: selftests: Clean up x86's DT initialization Sean Christopherson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240314232637.2538648-6-seanjc@google.com \
    --to=seanjc@google.com \
    --cc=ackerleytng@google.com \
    --cc=anup@brainfault.org \
    --cc=aou@eecs.berkeley.edu \
    --cc=borntraeger@linux.ibm.com \
    --cc=frankja@linux.ibm.com \
    --cc=imbrenda@linux.ibm.com \
    --cc=kvm-riscv@lists.infradead.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=maz@kernel.org \
    --cc=oliver.upton@linux.dev \
    --cc=palmer@dabbelt.com \
    --cc=paul.walmsley@sifive.com \
    --cc=pbonzini@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox