From patchwork Mon Nov 28 22:57:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13057977 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8C51C4321E for ; Mon, 28 Nov 2022 22:57:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234170AbiK1W5q (ORCPT ); Mon, 28 Nov 2022 17:57:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234212AbiK1W5m (ORCPT ); Mon, 28 Nov 2022 17:57:42 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A64DC17889 for ; Mon, 28 Nov 2022 14:57:41 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id mn20-20020a17090b189400b0021941492f66so65595pjb.0 for ; Mon, 28 Nov 2022 14:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=xbF3GtKExTV4CBXx46DHT6EYJ+r9IUebdLWn8AinFs4=; b=jkF4pjyASAuV8OAvihGrz8X5YmXhQoqnwhE1kAeHK3REfDhlgq34FlevBK6WvzVwcS qmT91ayRYpbkT9sJTz5/uK72CTH/RAfWLB+n8+rC7xyeMdiup12BPnNhLBfZZ0bfL8cT v+CesiynWJFujgAjsecgvS7HIQSVVH5nr2e/tq4hxcHx3dZWjHlbpnOlkQiG8Qx6DZuJ VmI1z04hiOnaCXKJfWQ5yd7UgoLRW/jJLWYtL1w8xJ9pEuNn5T2Qofk6aY+ldRnyScCr P9rAk8N1kEaAovNgewZkw/Ej/fGDWIarmcJ3OcIdxkVn/e524+LGGXZUGZ90jhfJPEwr 79Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=xbF3GtKExTV4CBXx46DHT6EYJ+r9IUebdLWn8AinFs4=; b=nnwTeG+SMY2RUFHRIE8bka7kBCPhZm5rv80WS8wV2ZAIxqlChSvf6wZL2cWqoJqnws qaxIbzPFSYhh/9UUBHPMz27WrwAk0I0agh5xtuWjrM31q+xm+2E5m4p/LH9CZVamAjHI 8Ee8yXPm8pzbdV18+pEWCuNg26trJcqy8+APxHBHb4MlFIY0aCrPzonfNeYuoROd+tNj ht2i3z/Dc1szGesynKNUktKSp8IqQDlRtOL2znRhWmGc7RNqknpC0wCEyGsWAYeOLd7J HjzY2qMKTMfb09MMNQSOb/zHCaYUv9uTOds6rfu0oowzNrfyij0kDtPqokMw3hXKs8QH z8lg== X-Gm-Message-State: ANoB5pmDznt2RBb0e6vOqVSPFul4pcbOrImpYXTfgK3QEBT4/shJrttE LsHbGRSyg9q9C/+O60Us0Qse4NChC94= X-Google-Smtp-Source: AA0mqf40KtgfnF2nI/LoyPseNNxPo1ZShvrHoEC5JR1GArSXiBxcKQIu6PMYL3PoDb8qQOEk1FpwZbiNuRQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:bc86:b0:187:282c:9b95 with SMTP id bb6-20020a170902bc8600b00187282c9b95mr34477380plb.41.1669676261240; Mon, 28 Nov 2022 14:57:41 -0800 (PST) Reply-To: Sean Christopherson Date: Mon, 28 Nov 2022 22:57:32 +0000 In-Reply-To: <20221128225735.3291648-1-seanjc@google.com> Mime-Version: 1.0 References: <20221128225735.3291648-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221128225735.3291648-2-seanjc@google.com> Subject: [PATCH v2 1/4] KVM: selftests: Move XFD CPUID checking out of __vm_xsave_require_permission() From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lei Wang , Sean Christopherson Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Lei Wang Move the kvm_cpu_has() check on X86_FEATURE_XFD out of the helper to enable off-by-default XSAVE-managed features and into the one test that currenty requires XFD (XFeature Disable) support. kvm_cpu_has() uses kvm_get_supported_cpuid() and thus caches KVM_GET_SUPPORTED_CPUID, and so using kvm_cpu_has() before ARCH_REQ_XCOMP_GUEST_PERM effectively results in the test caching stale values, e.g. subsequent checks on AMX_TILE will get false negatives. Although off-by-default features are nonsensical without XFD, checking for XFD virtualization prior to enabling such features isn't strictly required. Signed-off-by: Lei Wang Fixes: 7fbb653e01fd ("KVM: selftests: Check KVM's supported CPUID, not host CPUID, for XFD") Link: https://lore.kernel.org/r/20221125023839.315207-1-lei4.wang@intel.com [sean: add Fixes, reword changelog] Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 -- tools/testing/selftests/kvm/x86_64/amx_test.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c index d532c20c74fd..aac7b32a794b 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -563,8 +563,6 @@ void __vm_xsave_require_permission(int bit, const char *name) .addr = (unsigned long) &bitmask }; - TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XFD)); - kvm_fd = open_kvm_dev_path_or_exit(); rc = __kvm_ioctl(kvm_fd, KVM_GET_DEVICE_ATTR, &attr); close(kvm_fd); diff --git a/tools/testing/selftests/kvm/x86_64/amx_test.c b/tools/testing/selftests/kvm/x86_64/amx_test.c index 21de6ae42086..1256c7faadd3 100644 --- a/tools/testing/selftests/kvm/x86_64/amx_test.c +++ b/tools/testing/selftests/kvm/x86_64/amx_test.c @@ -254,6 +254,7 @@ int main(int argc, char *argv[]) /* Create VM */ vm = vm_create_with_one_vcpu(&vcpu, guest_code); + TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XFD)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XSAVE)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_AMX_TILE)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XTILECFG)); From patchwork Mon Nov 28 22:57:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13057978 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48715C43217 for ; Mon, 28 Nov 2022 22:57:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234567AbiK1W5t (ORCPT ); Mon, 28 Nov 2022 17:57:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233446AbiK1W5p (ORCPT ); Mon, 28 Nov 2022 17:57:45 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61DAC183AA for ; Mon, 28 Nov 2022 14:57:43 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id l7-20020a170902f68700b001890d921b36so11412556plg.2 for ; Mon, 28 Nov 2022 14:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=zg00uXws3lbVg3WmOqt0KpGktbnRibsEvuUvf38EKYM=; b=SNEgHTuGepcVT0hleAXFeoidYnrZiTOu7AkH1RwjlgjAosXoj3yc1R/6F0kUvHY7MY 4DBYI6QMKEWoS5M//J9FBtvLrYhjPojsC4VZuLtPdW2O/SPUDeEZAtuF0TW3frT4K0e4 pYXGa2J04ZbXHsBHLxiGK1JuUgJOa66Uq2eCkISqQ+4lCJ/tDR1njpPMzHxR8TEWDXHQ hf0DcH+JUueqy9AjZOTM8u14qMNII20fpQZ2sE8WyuhzRZwDeppDhhwowMqggp9EsLCQ RdzCut7ZXqwQDBhIlUJaq166VW8OEdr/7fxCw7mAveyt/Bxe3KITHfFqT4ewtd9sfbZ5 j1mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zg00uXws3lbVg3WmOqt0KpGktbnRibsEvuUvf38EKYM=; b=Sxc0c/3hB4dU1CfUIriT6RzrUaM9XnoYcdLRG8ifst4Qz7sWO/gwd0a6cFIVYiJYHE IyEMcsgHB9J7u0/rHIFKKo0qw8biV+2bQ0yNpjWcBJIaSNWCKK8BqAE/UnfG2cO7TkSx zeQhQPIrlEQpJzcqhQ1VV/hAlOjmfZSHR0zmQipzT8SZR1/apP+YjoBq+z88gfUrbnI4 CGJ/kwBWrTGum7d9AW3bjC8EGLsqxBwAxcL/gv143PXYPbGFnmwj5bEUz1vRz1SKRfSh q19liBjlPxkZd242yKB8bzeYPng9Xw1DqGCNrDQhbmh81E07AyhJHK5Rv5J+1YcHFkvG cPlg== X-Gm-Message-State: ANoB5plbPsgaJyCeOljYSCJ50nMLOEJtGwlmfqg6MtGT2tVElAbEO9o3 O2ubmW13OE4tMgut7O0Y6NstR8nAkpI= X-Google-Smtp-Source: AA0mqf4sPgJrNPggTk8EPKR2ZTR0EsdjpcO1b2cyeDyCdqWYpYpz4yM89OYrhWQlkWwe9xl2r6d8kAjPvPs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:aa7:9f0d:0:b0:56b:e16d:b08 with SMTP id g13-20020aa79f0d000000b0056be16d0b08mr34328668pfr.70.1669676262984; Mon, 28 Nov 2022 14:57:42 -0800 (PST) Reply-To: Sean Christopherson Date: Mon, 28 Nov 2022 22:57:33 +0000 In-Reply-To: <20221128225735.3291648-1-seanjc@google.com> Mime-Version: 1.0 References: <20221128225735.3291648-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221128225735.3291648-3-seanjc@google.com> Subject: [PATCH v2 2/4] KVM: selftests: Move __vm_xsave_require_permission() below CPUID helpers From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lei Wang , Sean Christopherson Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Move __vm_xsave_require_permission() below the CPUID helpers so that a future change can reference the cached result of KVM_GET_SUPPORTED_CPUID while keeping the definition of the variable close to its intended user, kvm_get_supported_cpuid(). No functional change intended. Signed-off-by: Sean Christopherson --- .../selftests/kvm/lib/x86_64/processor.c | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c index aac7b32a794b..23067465c035 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -552,38 +552,6 @@ static void vcpu_setup(struct kvm_vm *vm, struct kvm_vcpu *vcpu) vcpu_sregs_set(vcpu, &sregs); } -void __vm_xsave_require_permission(int bit, const char *name) -{ - int kvm_fd; - u64 bitmask; - long rc; - struct kvm_device_attr attr = { - .group = 0, - .attr = KVM_X86_XCOMP_GUEST_SUPP, - .addr = (unsigned long) &bitmask - }; - - kvm_fd = open_kvm_dev_path_or_exit(); - rc = __kvm_ioctl(kvm_fd, KVM_GET_DEVICE_ATTR, &attr); - close(kvm_fd); - - if (rc == -1 && (errno == ENXIO || errno == EINVAL)) - __TEST_REQUIRE(0, "KVM_X86_XCOMP_GUEST_SUPP not supported"); - - TEST_ASSERT(rc == 0, "KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP) error: %ld", rc); - - __TEST_REQUIRE(bitmask & (1ULL << bit), - "Required XSAVE feature '%s' not supported", name); - - TEST_REQUIRE(!syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM, bit)); - - rc = syscall(SYS_arch_prctl, ARCH_GET_XCOMP_GUEST_PERM, &bitmask); - TEST_ASSERT(rc == 0, "prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %ld", rc); - TEST_ASSERT(bitmask & (1ULL << bit), - "prctl(ARCH_REQ_XCOMP_GUEST_PERM) failure bitmask=0x%lx", - bitmask); -} - void kvm_arch_vm_post_create(struct kvm_vm *vm) { vm_create_irqchip(vm); @@ -705,6 +673,38 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index) return buffer.entry.data; } +void __vm_xsave_require_permission(int bit, const char *name) +{ + int kvm_fd; + u64 bitmask; + long rc; + struct kvm_device_attr attr = { + .group = 0, + .attr = KVM_X86_XCOMP_GUEST_SUPP, + .addr = (unsigned long) &bitmask + }; + + kvm_fd = open_kvm_dev_path_or_exit(); + rc = __kvm_ioctl(kvm_fd, KVM_GET_DEVICE_ATTR, &attr); + close(kvm_fd); + + if (rc == -1 && (errno == ENXIO || errno == EINVAL)) + __TEST_REQUIRE(0, "KVM_X86_XCOMP_GUEST_SUPP not supported"); + + TEST_ASSERT(rc == 0, "KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP) error: %ld", rc); + + __TEST_REQUIRE(bitmask & (1ULL << bit), + "Required XSAVE feature '%s' not supported", name); + + TEST_REQUIRE(!syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM, bit)); + + rc = syscall(SYS_arch_prctl, ARCH_GET_XCOMP_GUEST_PERM, &bitmask); + TEST_ASSERT(rc == 0, "prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %ld", rc); + TEST_ASSERT(bitmask & (1ULL << bit), + "prctl(ARCH_REQ_XCOMP_GUEST_PERM) failure bitmask=0x%lx", + bitmask); +} + void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid) { TEST_ASSERT(cpuid != vcpu->cpuid, "@cpuid can't be the vCPU's CPUID"); From patchwork Mon Nov 28 22:57:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13057980 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FCA2C4321E for ; Mon, 28 Nov 2022 22:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234615AbiK1W5z (ORCPT ); Mon, 28 Nov 2022 17:57:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234589AbiK1W5q (ORCPT ); Mon, 28 Nov 2022 17:57:46 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 195FF1D30E for ; Mon, 28 Nov 2022 14:57:45 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id v16-20020a62a510000000b005745a58c197so9577120pfm.23 for ; Mon, 28 Nov 2022 14:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=xELzf4EoZMDlLUFpchpTMdst44hVrjj4VfJq2w9Ep4g=; b=tfGq1I9Ag4TRomwGArbD/e7Y8OTucyzeGIBpiuBA8HCvwovRyzZMr0jL1essdKJxRl AsLiTHBqMnFPfYFL6W6Gg7mrjwghkx+mm5CkL9sermoxxif5geNncKOnzhv9WJMna7+6 EPztlMnA0Oomg6EENpjW8lYY6HTV4pMsV6RsBaky6LIIuYQSC81VQlR7T/MBuaYTWxpQ f5UDgsfX+NOHM+75d9ZexrzlpgZuMggqW0WB5v/Wh074p4fD/QcK7Gu/EJn7qY53pFPB GawhLmEMkaB82ICjvMdzs3LpOgwabZXU5VPUQVxNfTlONzJDpAGPE3cFsxOXcyO0tlwn 4clQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=xELzf4EoZMDlLUFpchpTMdst44hVrjj4VfJq2w9Ep4g=; b=g9HG6NH9i15hm26EMLqaPIO+xHYmsj1bdrW3wOTd8iRaHucqzA7je/6cNyrVperN1i eeCUWdVSQJnyVhQ7bFTx11pi3eZyVreBV3iVf6DeuJGf3n0uCG3No8hWuOQxciSwvaCJ udbXJnsPrwmb3FX/7DnHsqX38BhW34vjCaP0bQSEqUDKH9wa1LqBAbaiWS905b++DADr 08MwFYaNU05dqVqGuZ/YGFyv7wz2xzEX6048Up/HTfwGzOEMd6tmxKP1qPaC8Lf1JYaF RyK4cRApFu9gKVvI8Ol/VYZVDsVji18V2U8vEaMwaBY1/bHlT6SWSeQ/dRPS/GH9cv/k 1rww== X-Gm-Message-State: ANoB5pk9TM/zEXITQFvZVANxANnRHAn97URBqWWMxVkjtWGufGUTRAak jS9TPWCIXI6lq7/Yb83Xc/Wl6jcWy9o= X-Google-Smtp-Source: AA0mqf7XlYSOiBUAPxiV1JPp5qojEVpBxwXB4xMCDPs7V/2pUAuGBNrlhEa8A1+VJ8AZPriNzHDsDb7tf1Y= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:820c:b0:189:505b:73dd with SMTP id x12-20020a170902820c00b00189505b73ddmr26974391pln.143.1669676264666; Mon, 28 Nov 2022 14:57:44 -0800 (PST) Reply-To: Sean Christopherson Date: Mon, 28 Nov 2022 22:57:34 +0000 In-Reply-To: <20221128225735.3291648-1-seanjc@google.com> Mime-Version: 1.0 References: <20221128225735.3291648-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221128225735.3291648-4-seanjc@google.com> Subject: [PATCH v2 3/4] KVM: selftests: Disallow "get supported CPUID" before REQ_XCOMP_GUEST_PERM From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lei Wang , Sean Christopherson Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Disallow using kvm_get_supported_cpuid() and thus caching KVM's supported CPUID info before enabling XSAVE-managed features that are off-by-default and must be enabled by ARCH_REQ_XCOMP_GUEST_PERM. Caching the supported CPUID before all XSAVE features are enabled can result in false negatives due to testing features that were cached before they were enabled. Signed-off-by: Sean Christopherson --- .../selftests/kvm/lib/x86_64/processor.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c index 23067465c035..1d3829e652e6 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -601,21 +601,24 @@ void vcpu_arch_free(struct kvm_vcpu *vcpu) free(vcpu->cpuid); } +/* Do not use kvm_supported_cpuid directly except for validity checks. */ +static void *kvm_supported_cpuid; + const struct kvm_cpuid2 *kvm_get_supported_cpuid(void) { - static struct kvm_cpuid2 *cpuid; int kvm_fd; - if (cpuid) - return cpuid; + if (kvm_supported_cpuid) + return kvm_supported_cpuid; - cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES); + kvm_supported_cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES); kvm_fd = open_kvm_dev_path_or_exit(); - kvm_ioctl(kvm_fd, KVM_GET_SUPPORTED_CPUID, cpuid); + kvm_ioctl(kvm_fd, KVM_GET_SUPPORTED_CPUID, + (struct kvm_cpuid2 *)kvm_supported_cpuid); close(kvm_fd); - return cpuid; + return kvm_supported_cpuid; } static uint32_t __kvm_cpu_has(const struct kvm_cpuid2 *cpuid, @@ -684,6 +687,9 @@ void __vm_xsave_require_permission(int bit, const char *name) .addr = (unsigned long) &bitmask }; + TEST_ASSERT(!kvm_supported_cpuid, + "kvm_get_supported_cpuid() cannot be used before ARCH_REQ_XCOMP_GUEST_PERM"); + kvm_fd = open_kvm_dev_path_or_exit(); rc = __kvm_ioctl(kvm_fd, KVM_GET_DEVICE_ATTR, &attr); close(kvm_fd); From patchwork Mon Nov 28 22:57:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13057979 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86D5AC46467 for ; Mon, 28 Nov 2022 22:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234279AbiK1W5x (ORCPT ); Mon, 28 Nov 2022 17:57:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234527AbiK1W5u (ORCPT ); Mon, 28 Nov 2022 17:57:50 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84464248D8 for ; Mon, 28 Nov 2022 14:57:46 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id mn20-20020a17090b189400b0021941492f66so65661pjb.0 for ; Mon, 28 Nov 2022 14:57:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=mddWw5jKkHynMjtMRFmmyuPdlM0MlcX7j/7PK75k6Fw=; b=A8Bw/jcyude8mvJeyhvG0HWYCaDtNd8TCZ6n1g+c8b3ghSqGvHqMqrYXPH8VP556mb E6r9KGnHMz46viuiQHZd+W+VUVk/Ed97KOP9/S0l3TWyM/dw+1zfeUHsANfc4GpLfWLm bLl5tgvc0l+h44FLiGvDF3XQAsJAmXvBVTXukyk7Cvwed/c65p4SSpM2kKuf055xHzZW Mecs//0a0jHnt2Z8GkK9RDlsCCK1jYdU0VWPCOu1uZlJRbFewEiBv9o+Bdf1uXK8PfgV hy7SINcNdFlAwW7KTa7jBLGDMc/un7zWUtmtuO0kzdE6zMdmoaAXWOjRzR/quqs/yXF/ t4mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=mddWw5jKkHynMjtMRFmmyuPdlM0MlcX7j/7PK75k6Fw=; b=iYZFZfalN22HJScWCBP3YP1VYU3YChT2n1CsJAGH4HTWqOrEn8Cq061+Hx3g4nKbfP wKlTKHOezm6gf6tNgx/AzMlYtqPJQNmucTHYTBa2EPC5rGkmrZfnoQm1bG2P673gb41y TnG/MyOW68oNfsWVpJ0g+cEZzI3RMUiuonSw8tHsk2+TGfr2yHdqW33r4mF2b7NmcEhV Mgc2nFYdiwBZ+gOBYLHMbEL0Ra0ezqQIy32bKOQX3ACxZQ/sSoLqn+amiF9o0wIeBIY3 IeyLbexZVpPRwzPErDYjwKkxVHrr13JwusYQpXPhEAgMaqJ/Z1Qd2tOadAaeNb966QJ0 JPig== X-Gm-Message-State: ANoB5pk65wpFnokcyLgTdJvi6nz5elqTvXgEUnrFHnDeUEtDRUPt0izG YG78FnE9arq5bj/ehi2V5NyggZM0bDY= X-Google-Smtp-Source: AA0mqf75QNoz0uFUxUkbOt2QBaSZk0y7e+IggdUQyFCPqIir30jBIikAqa5KY0RwSyhBWysxfyKExE86MiU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:3c04:b0:218:4b47:9c29 with SMTP id pb4-20020a17090b3c0400b002184b479c29mr55128611pjb.54.1669676266304; Mon, 28 Nov 2022 14:57:46 -0800 (PST) Reply-To: Sean Christopherson Date: Mon, 28 Nov 2022 22:57:35 +0000 In-Reply-To: <20221128225735.3291648-1-seanjc@google.com> Mime-Version: 1.0 References: <20221128225735.3291648-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221128225735.3291648-5-seanjc@google.com> Subject: [PATCH v2 4/4] KVM: selftests: Do kvm_cpu_has() checks before creating VM+vCPU From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lei Wang , Sean Christopherson Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Move the AMX test's kvm_cpu_has() checks before creating the VM+vCPU, there are no dependencies between the two operations. Opportunistically add a comment to call out that enabling off-by-default XSAVE-managed features must be done before KVM_GET_SUPPORTED_CPUID is cached. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/amx_test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/amx_test.c b/tools/testing/selftests/kvm/x86_64/amx_test.c index 1256c7faadd3..bd72c6eb3b67 100644 --- a/tools/testing/selftests/kvm/x86_64/amx_test.c +++ b/tools/testing/selftests/kvm/x86_64/amx_test.c @@ -249,17 +249,21 @@ int main(int argc, char *argv[]) u32 amx_offset; int stage, ret; + /* + * Note, all off-by-default features must be enabled before anything + * caches KVM_GET_SUPPORTED_CPUID, e.g. before using kvm_cpu_has(). + */ vm_xsave_require_permission(XSTATE_XTILE_DATA_BIT); - /* Create VM */ - vm = vm_create_with_one_vcpu(&vcpu, guest_code); - TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XFD)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XSAVE)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_AMX_TILE)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XTILECFG)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XTILEDATA)); + /* Create VM */ + vm = vm_create_with_one_vcpu(&vcpu, guest_code); + TEST_ASSERT(kvm_cpu_has_p(X86_PROPERTY_XSTATE_MAX_SIZE), "KVM should enumerate max XSAVE size when XSAVE is supported"); xsave_restore_size = kvm_cpu_property(X86_PROPERTY_XSTATE_MAX_SIZE);