From nobody Sat Feb 7 16:53:16 2026 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 AFCB7C46467 for ; Mon, 28 Nov 2022 22:57:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234381AbiK1W5t (ORCPT ); Mon, 28 Nov 2022 17:57:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234322AbiK1W5m (ORCPT ); Mon, 28 Nov 2022 17:57:42 -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 A6811183AA for ; Mon, 28 Nov 2022 14:57:41 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id u6-20020a170903124600b00188cd4769bcso11397723plh.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=lsCUo2XA5hsmabjuTuztewgiOtwdIJjzBjNUVMhaAwsbUu+oD00nRB2bco1bTrb1Rn FrB8h92e5WZHcKysuH+QHifbb0fP0aDuUgB6uCsnbk+FGz+HnMynZxlJNhbqhkE/JvoK 57EZPhV7nOJAsd9G7kD/l51ngVvPDp/4yYoanOmt5RuArs+mRp4WA/H4vbMLoDxvuEYV ZA05/3UHHAso6qUfGWevUai0FxEsxh1rtoHbiNtJeEId1+DbY2T99tLDZwlJ14Jo9JaX jcZVRx5JXBp0up+G+pzBXKzlFTiq2wftRm9txcKAIlb1URMm7iHDM+r0BfDHSp70+ELl fBUA== X-Gm-Message-State: ANoB5pl21E5Zrr4iHuhaQ++Ak5UeVfX0v+9uCs0ZA8vNeIwWpV0mCVEf mR9MpEruk34YjfWecFC9BtBEdnuShRU= 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: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/tes= ting/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 =3D (unsigned long) &bitmask }; =20 - TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XFD)); - kvm_fd =3D open_kvm_dev_path_or_exit(); rc =3D __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 =3D vm_create_with_one_vcpu(&vcpu, guest_code); =20 + 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)); --=20 2.38.1.584.g0f3c55d4c2-goog