From patchwork Thu Mar 14 23:26:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13592944 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9067FC54E69 for ; Fri, 15 Mar 2024 00:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID :References:Mime-Version:In-Reply-To:Date:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7tWDjhcckAGNMPZHNNodpN1IXC87Wvg9mYDfsyRfE3A=; b=C4Tfdn7B1MsLI/ f2NerxMw8OChTIbQIvDShRBoCwyksSLTgA2+6o6Wb8rZ7F23KpkUEmn3oTzRy+xlU174FewvqVejB i6Nal9xZwnqN8xh0YE3m2kvdZMuHmGgLk304QVxB2q32DitpmMuefo483RW5V7kLzcRzeZeM7ZqCp 4dolUatNy0wbSWRLRl5UtgpDkrV3VBI/zhwvDHbVFENpytkKQt94za9iG7xZkbCBtJfBzkn+775JE wVZNnzM2LgX0xvjQ1phiOytj8FxaQAEsfMOxtLvjhDcwQhwLbW5O4lww/monSKN5zIIPBl9bvrPJ4 8Wig/q8oV1wbRnp1iL6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkvUM-0000000GAkS-1XSy; Fri, 15 Mar 2024 00:31:58 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkuTS-0000000G03n-0KJs for linux-arm-kernel@bombadil.infradead.org; Thu, 14 Mar 2024 23:26:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To:Sender: Content-Transfer-Encoding:Content-ID:Content-Description; bh=oB3ZfcSJ5G1gMIeNmqomMwFWPYu8/DXA5zj+kntGd24=; b=P0Am12kZIyzW81bEokVH/eRVVP 7t7BQiElkcpCnNUyAPF0qXcOKc5ztk38QaOZ7dbu2syvbieRn6PrQw7ODc9tu6q3soJKnCziUEta5 9TR3iyzOm0vk6KV9YBjCUB05jFwVO91IpodwCP3L7OhDeCsA30jnNPZYRrvHayPkt/fCAWdiySURM LHaQYLbBPSSWvCp18JKDysu3LhBkeOtbz5n196qpLzrfaEkeaFSes1pMtv6kBjKtrdCXdVn5pgrJ2 nxMtGVgPgTdP9Gcz3KUvdIXcfwPtzSAAWlP3cV3b9blQjug5hMTrwqXW9Wu+J4zf28Vk4FWIEMcut 0Bzb/OYA==; Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkuTO-0000000AisE-0rjl for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2024 23:26:56 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-60ccc3cfa39so21508387b3.2 for ; Thu, 14 Mar 2024 16:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710458811; x=1711063611; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=oB3ZfcSJ5G1gMIeNmqomMwFWPYu8/DXA5zj+kntGd24=; b=hD0R0Hw6bKBwD4CjkcBv63qr5b+x/mxodEMAV6InvItyTd3g4LpL+HtwN3EUVFeFeJ UjJ4gjBqwF69fgaVYSkMVX3Jsdn9HTeh9DOLHxNV0eYueE0YgGK4W76+HJA80VA1Bwpr MNHQhjq8PKyDjEoGaR3jOmJzLafOqMo5KwHJOxe/o5FYsJZEHqTp70EBABMN/Ve0Ukj0 QoAhyPGzQk7gzRyhxCsQ/rDKBBdzrjOgGCKaS9iUSDxg/XMVxcdY6S4pGZ7a2iMwOmvd TbFNdT5mT96VtMH6B+nlG/sbQylCRQJ3ikfDJREfBkzKvAtos5Jc28iki14/9dNnr7tD ZGDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710458811; x=1711063611; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oB3ZfcSJ5G1gMIeNmqomMwFWPYu8/DXA5zj+kntGd24=; b=RCRFYgxb5j5Ac/NDVXE3pXJRviRaR5wrV159O9MPfrbQhqVbFu1pUXcq+hzJHum5O0 D3W9sgNHzRsgAPiLALa7SWENO5LNbntI55sFgEAP8NWMltrBOyhBiSXPSJHPIic8/77t GYrKXbNf9tvUS+7xftvvycbSICJ8zJ09JXVtUK6xdw/vV/w9hOvk6edKVCx8yJhe0ZnT fC9kBhEKC/9lLXSKLvbcgfSymx2rkHqLyLCnbMBJSQTFPxnuFudnLxFt4hb7Y5ffgMbI BUWlvS6THb54I11hsZ4MdheeZrFHRenqDnHU836/1xQoa/KwFihUhVWmykQDrgdvxEkq jsBw== X-Gm-Message-State: AOJu0Yw2PmkK1MXurPwH7FCB0o2EDXjbz8H1YRWV0YOBmWrxNok7LGaT z4WmSy/DowT1pqEePhNuPFe/0K+YGBQWyiLcB5PGbroT6Yi2SjEKqOo5jh7FS5i6EBiUDys6eU8 q7g== X-Google-Smtp-Source: AGHT+IHtBiTnO989+qzsWd/+jqel2tzrmASDdXlpQSt9dAnbWaw8Q3AQpPaqLMF1m7pFqRCnpY9R0RVtBJU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a0d:e288:0:b0:60a:56c2:a61f with SMTP id l130-20020a0de288000000b0060a56c2a61fmr797989ywe.8.1710458810918; Thu, 14 Mar 2024 16:26:50 -0700 (PDT) Date: Thu, 14 Mar 2024 16:26:25 -0700 In-Reply-To: <20240314232637.2538648-1-seanjc@google.com> Mime-Version: 1.0 References: <20240314232637.2538648-1-seanjc@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240314232637.2538648-7-seanjc@google.com> Subject: [PATCH 06/18] KVM: selftests: Rework platform_info_test to actually verify #GP From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240314_232654_766753_C2EC93D5 X-CRM114-Status: GOOD ( 11.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Sean Christopherson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rework platform_info_test to actually handle and verify the expected #GP on RDMSR when the associated KVM capability is disabled. Currently, the test _deliberately_ doesn't handle the #GP, and instead lets it escalated to a triple fault shutdown. In addition to verifying that KVM generates the correct fault, handling the #GP will be necessary (without even more shenanigans) when a future change to the core KVM selftests library configures the IDT and exception handlers by default (the test subtly relies on the IDT limit being '0'). Signed-off-by: Sean Christopherson --- .../selftests/kvm/x86_64/platform_info_test.c | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 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 cdad7e2124c8..6300bb70f028 100644 --- a/tools/testing/selftests/kvm/x86_64/platform_info_test.c +++ b/tools/testing/selftests/kvm/x86_64/platform_info_test.c @@ -26,40 +26,18 @@ static void guest_code(void) { uint64_t msr_platform_info; + uint8_t vector; - for (;;) { - msr_platform_info = rdmsr(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"); - } -} + GUEST_SYNC(true); + msr_platform_info = rdmsr(MSR_PLATFORM_INFO); + GUEST_ASSERT_EQ(msr_platform_info & MSR_PLATFORM_INFO_MAX_TURBO_RATIO, + MSR_PLATFORM_INFO_MAX_TURBO_RATIO); -static void test_msr_platform_info_enabled(struct kvm_vcpu *vcpu) -{ - struct ucall uc; + GUEST_SYNC(false); + vector = rdmsr_safe(MSR_PLATFORM_INFO, &msr_platform_info); + GUEST_ASSERT_EQ(vector, GP_VECTOR); - vm_enable_cap(vcpu->vm, KVM_CAP_MSR_PLATFORM_INFO, true); - vcpu_run(vcpu); - TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO); - - 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) -{ - vm_enable_cap(vcpu->vm, KVM_CAP_MSR_PLATFORM_INFO, false); - vcpu_run(vcpu); - TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_SHUTDOWN); + GUEST_DONE(); } int main(int argc, char *argv[]) @@ -67,16 +45,38 @@ int main(int argc, char *argv[]) struct kvm_vcpu *vcpu; struct kvm_vm *vm; uint64_t msr_platform_info; + struct ucall uc; TEST_REQUIRE(kvm_has_cap(KVM_CAP_MSR_PLATFORM_INFO)); vm = vm_create_with_one_vcpu(&vcpu, guest_code); + vm_init_descriptor_tables(vm); + vcpu_init_descriptor_tables(vcpu); + msr_platform_info = vcpu_get_msr(vcpu, MSR_PLATFORM_INFO); vcpu_set_msr(vcpu, MSR_PLATFORM_INFO, msr_platform_info | MSR_PLATFORM_INFO_MAX_TURBO_RATIO); - test_msr_platform_info_enabled(vcpu); - test_msr_platform_info_disabled(vcpu); + + for (;;) { + vcpu_run(vcpu); + TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO); + + switch (get_ucall(vcpu, &uc)) { + case UCALL_SYNC: + vm_enable_cap(vm, KVM_CAP_MSR_PLATFORM_INFO, uc.args[1]); + break; + case UCALL_DONE: + goto done; + case UCALL_ABORT: + REPORT_GUEST_ASSERT(uc); + default: + TEST_FAIL("Unexpected ucall %lu", uc.cmd); + break; + } + } + +done: vcpu_set_msr(vcpu, MSR_PLATFORM_INFO, msr_platform_info); kvm_vm_free(vm);