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: 26967 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5992480wrr; Mon, 28 Nov 2022 14:59:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7AAnN60fZCS5R6dEsSlZr7qfNY2VPXNdp4HsoIDeEbaCg5srpAbI4AxxRZuXqBTpFFFZPB X-Received: by 2002:a17:902:d650:b0:189:f86:ecb with SMTP id y16-20020a170902d65000b001890f860ecbmr44765464plh.45.1669676363434; Mon, 28 Nov 2022 14:59:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669676363; cv=none; d=google.com; s=arc-20160816; b=NDwdPSiVabZjR60BT4vNcfa9dF1TfkF1dp73sV3dymC3VetogVUobnA0pOP6K3gAng B8SX0OzZ4bqi2Jh6sFveBz7tKMDAid87o8/bmHxfaM9WmIBtJORLtqe5kOONJg5L5A/A B1CVTkGXEaHd01gDmkXIRkpUPKwlMPSWIHhwI60zkV/wTwxBRka+1GeolG+7mfLk8g3P +1ryEEac5nPwaFHGJRGGm2dalVlU6XSO7TA6FIx4y2eQu7vR3rkl7LXgBkbFZ6OiN89X 3wLvNajSgYFsWeoORKuMruAXhDzO0R0nhUot+YF8PIyAgxW7317DacnqQWcded+32QCv ahnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=xbF3GtKExTV4CBXx46DHT6EYJ+r9IUebdLWn8AinFs4=; b=D1HFNnLlpHLDTxXYy5YujmppTPUYUmd++j2szIZx6FJvFvjDYSBAmk356xdioj4yq4 N8xxIS7DYPAKCyE7s8gIFbiH15TrrOQ0fETjdmU6BOjXrrT3s1+dKSInFf4gKNnYWNLu Q5qRv6qlc1J+0zpLq5S56xdIJFKfUzNqPk9KQODkYk9mQlz+2hbnLWfbNP56btV9R8yU bzbhjxXR8lK63lpjkCdP2JBtd5FJtslazqwOJA+Vn0aCB/2rjUh4CEE8tAM5/4THjdaC Nv/wsmRR1BU+oNXa3StmOPIWlQpfLdLqmB57pbpLa+oAlQmQ+ynt4VBshhjehQgZHZ0C dnqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=jkF4pjyA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 18-20020a630112000000b0046af2452ed8si14178599pgb.766.2022.11.28.14.59.10; Mon, 28 Nov 2022 14:59:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=jkF4pjyA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234592AbiK1W5r (ORCPT + 99 others); Mon, 28 Nov 2022 17:57:47 -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-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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750782562555849802?= X-GMAIL-MSGID: =?utf-8?q?1750782562555849802?= 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: 26968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5992918wrr; Mon, 28 Nov 2022 15:00:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf7vX6Dd9k8L6IGDy5D8H0S73N8d5x6H38zVarKQVvRrB6J4fWH9W7BfttGAtM43IuU3laia X-Received: by 2002:a63:1e5b:0:b0:477:3c62:49ba with SMTP id p27-20020a631e5b000000b004773c6249bamr29263065pgm.446.1669676416420; Mon, 28 Nov 2022 15:00:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669676416; cv=none; d=google.com; s=arc-20160816; b=xNOGq1nLX/p29ZiKhvB+aRNzxgphdPjYr++WuxW+2bA0wxP2E+ekuxVcEIPwNbwdg1 7WbkYW3WMctu690kUv3GnrGVYMVqWYo+RbgSZyOCR5KmsmlS+j1oXcWRuWQImQq2e8wP 3CpcZfw5h7T2CljB981oexlXl75Mnl/BCz1hpX7RI4CLjHozO3ja/HQYSAI6piQGAkyb lDgS8WFvocrRP0Bqds1MaUsLt+LZB/o5yX1q+muQg3Z5G3xgCXW5C9UkUxqTuB9ZH2vo g9Jz1lv9k5PG0OJ5feTEZt/09BpsPCxYDGivEx7jZeZxwdp/y/x9h/FMU3z0g0sCh7I0 YNNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=zg00uXws3lbVg3WmOqt0KpGktbnRibsEvuUvf38EKYM=; b=eVfPUN/6HUZAZvu6TzBrvWYp2J2qJW4SKboM+HXWBj8MaKmdklV97FsyURfaZkgBhE YT+O1XhJxLpPoJ2Sd1+MWsjeRVnJ/QEPHch52O3Vb1TNwVYF/JgRtp5RD4G3kzX7wpSM FsyThBfqYRQ0vdgcdPRoMEYO3Uuc0dZDZRE2QUZCb6pWl42/hilnrKMzE8ZAFvasEMDb qx8hrFkUfEm5WLhvrsJ6jeF+gAP/ZQFbi1RGjbZnBTSZDaBlWpQmRaNTqMZ3po7ip+H2 2XHCpIl416EPGfqWYoz84hyQp8KAZXRvaTOZsGncv+IYAfkbUlRFNZjIIALdPzr0hLQX A29A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=SNEgHTuG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x9-20020a1709028ec900b0018981c84015si5368039plo.10.2022.11.28.15.00.03; Mon, 28 Nov 2022 15:00:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=SNEgHTuG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234603AbiK1W5v (ORCPT + 99 others); Mon, 28 Nov 2022 17:57:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232648AbiK1W5p (ORCPT ); Mon, 28 Nov 2022 17:57:45 -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 60C8517889 for ; Mon, 28 Nov 2022 14:57:43 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id a3-20020a17090a8c0300b00218bfce4c03so12931141pjo.1 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=x0XnNNfsToeihTvfMHnzP1j9Lx6+0rqNoLdH/HFfrRiR8RrM/P4ISBNMM0U5Q6Ukra jdCqzj3FIh6aPdyUuDwfcxiP6NGhE+3DybRu4pmyUXXWGqsiVuzP9sNuleURPmRXyOdv BoVYKMV9miRJjcXvWojTv0aCPFaQp2S8ymEINJ1V70WTShsyilzBkDizV4Ypjj050zVI Z4TGywq3qdyUwvjsmuwQLwp3PX+9GufVfFHbOzXBrqbP2cUof/FmwUZzDsSRxrbGik+J N/mhPew3SGyhlKqWqtrAK5wP3QP5L35iU8oHQOGAq6GnutfxqZN51+QG8vTOXwb5iqcl vE7Q== X-Gm-Message-State: ANoB5plHsdz9eUMm7mI8MuJ+bZ2Q/fX+Tqwx4HKZSSChk3bcLGZ6RBHE ASZAKnfse71yuBLwy3ZG/EGdIhuWnZY= 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750782617678679611?= X-GMAIL-MSGID: =?utf-8?q?1750782617678679611?= 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: 26969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5992953wrr; Mon, 28 Nov 2022 15:00:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ROmauqeU1LiWtUr4seUJNfr0tIPslIXIAJyLT8xKvQbIFMGvb5fhXOPOXB75HIgeeK7N8 X-Received: by 2002:a17:90a:588b:b0:219:c40:e5f with SMTP id j11-20020a17090a588b00b002190c400e5fmr19609862pji.49.1669676419312; Mon, 28 Nov 2022 15:00:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669676419; cv=none; d=google.com; s=arc-20160816; b=ntxh76U8KHpPJtY1bd8CC6rgjbk4yh9gdVsXF8nt3S41DGW/nXRmc3MD2/XNkRdOcW TrYQvJRGzmWxkjF5Z0/61YPQ4nF2Tpxj/FmDrSjpxSYYkFKgPpCksYqH4p1hCIilx7lT aqLWCsTlgAHaDwLSFsWEFcB3t3Q1pLKEtDLqlv1kommqJvXNKdLjKfrD5PD/0HFacxKw NVfdhOzeGkncSX7Fwkhyz7vDlBc6BLgwmTa8+KVxuViUynF3rmE9uq3smHjBvzbVSO/l khoHzvpn3mp9KJ2eS62l3c50CWtYLlyZITXBJyn9BwEVS2uXvXcMy2jE40HGvrLlwrMl imig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=xELzf4EoZMDlLUFpchpTMdst44hVrjj4VfJq2w9Ep4g=; b=Lz/glq5NMfaA7nL9Sp/Rqw042Suin/62bkU2bFAsBCkl2BzJMXMS5aNuGT0QEqOgl4 JPy1OtqM4FUqzErIZAltWcsA6GGnczm6IUnP9YnlKcgIh8qi3kbhlGmOF77Q/Obm3ubQ OB7/AeQkcw/0/WsN2dQ33z83BB9gn3dpr7c1oAhKHvlM0HiLetCd/Ppm3TJYL3JgPjIo 9fWiQE3ijZ3AZ1Wfp9jxa7HQA9lb/OjxX593x22xavy/jCt1NfVrAAFfmOUC5kGMpWRF MboffqOlIKmJujdcfPpU0rCT5I3ykYxd0uKt0usL31XF4q1PJzL4eGVUKh25UkLoAZNc 4tDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=tfGq1I9A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d26-20020a631d1a000000b00477ad8e26c3si12719392pgd.469.2022.11.28.15.00.06; Mon, 28 Nov 2022 15:00:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=tfGq1I9A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234614AbiK1W5z (ORCPT + 99 others); Mon, 28 Nov 2022 17:57:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234427AbiK1W5p (ORCPT ); Mon, 28 Nov 2022 17:57:45 -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 1A27C1D331 for ; Mon, 28 Nov 2022 14:57:45 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id pi2-20020a17090b1e4200b0021834843687so12942610pjb.0 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=VjX9hLOnbfhY5H2/SLVONYdDelavIfJMYRCPPpG0c1qMAYAWwSWTiZbTU/e9GUV7Hm scuCMFDtVbYJipaxRBv+1Ou1E5MwnRvwSARiVcSM/JgAGDQjA8nVtg5evaJao42K3Bcc w38Ju87ae5QcDCV9912UOliTf4XZET+W6/c0dt5yBg0ZKXnEj82eFN4K0n65ucQcud+c tPklcmcXOBLFFnyhdfewEJnj24VKGZnlKUgSl1p7y6ixW3HFT8ImUhWwVmXsP236mCMK yGrE7Lv6NQ3Q05Za5wTGoVXhCO9dGFu73/vDxvUi7aYW3ZPKmga7A8XjF9D78LPaTy1n FEtg== X-Gm-Message-State: ANoB5pmt/K3wJNoMHxfR4ermMNd+Ks8/eoEnwdiX50N+6p9LbYG+nAzb OGokGIsNE8Eo7NZLJb5Izcq69FHxnjQ= 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750782621340735088?= X-GMAIL-MSGID: =?utf-8?q?1750782621340735088?= 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: 26970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5993059wrr; Mon, 28 Nov 2022 15:00:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf7zj+K+uCH72tYqiR3mBkClEXA3kX3bmQBsjP2cQiDMpt6XxCJpsMfPO1aTVWNpmkr2R4MT X-Received: by 2002:a63:d516:0:b0:477:857d:d264 with SMTP id c22-20020a63d516000000b00477857dd264mr29238471pgg.224.1669676431517; Mon, 28 Nov 2022 15:00:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669676431; cv=none; d=google.com; s=arc-20160816; b=eaf+pAAqkSdk/YCV6vEHjjinnLq+S8CeFkPeT/VFEnBU8mOVb6KNERULDKaOwBS7mP UvjPRw5JDFhq4ACbFP2NZWI9Axvs0sLz9SSCCmD8pEkMsvrbU41nLBelck6lzX17v1pD jAyFhy2/92sP7u/EuF5mvYjVllTLqYCoOqa3jxAXrL2bTQqrXYAIfLCGYhAO+g8d/z1J HyoH4c4wlaq5Ep9WTLaGW2BgHrl7aIUaJg8/K+FtVE8SMEwzdbqDfyjd8ibCEq6xmNdF OWFoGiFZLXsbINi3vsL/8KAK1xvjlcU53ZTtE8RasCePOTytuRzXPoktynobaX8/1YNv 6mGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=mddWw5jKkHynMjtMRFmmyuPdlM0MlcX7j/7PK75k6Fw=; b=NgkoDmMxBvlplC/8a35j1HYu65GVM1K0Xe1OHB7ynlqTltqgkTTYW0rcTcCjAFk8jr yhpZjDBocA+dHMBactLMcclWFOHOEBLqxAhaQpnPWh71lsc+JrNL/5vqaHUJQY8O4sr2 8yMA3Dw8RvTcO43XBI1xyxzr6H8nuG9GlVPjz7dmJ4DDMBv7vq0PZmego4XM/AZTmlO6 zyRlDkBu7QS0CL2kA8SPxSVPBu5emWQS9yROql2vOn1sAVD+YE1zx0iXGeBRKNy3EJT2 OKhV8ofrmhJ1mZZcyF4l1GkukDBjO2DbkBQ7/YmEMb0i3nPhzX5ckyJc75x0mRqGxy3s P8NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="A8Bw/jcy"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i4-20020a635404000000b00477bfab5a83si12050116pgb.2.2022.11.28.15.00.16; Mon, 28 Nov 2022 15:00:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="A8Bw/jcy"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234601AbiK1W56 (ORCPT + 99 others); Mon, 28 Nov 2022 17:57:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234594AbiK1W5u (ORCPT ); Mon, 28 Nov 2022 17:57:50 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B555824BFD for ; Mon, 28 Nov 2022 14:57:46 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id a33-20020a630b61000000b00429d91cc649so7508806pgl.8 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=PXbCOeQ/E3+UiAcQimqp1leM4LMkLtprvHci3bEiWCMvPUkIF7KTGe7/Xwi2VZlD/L Q7ssfZoVannhAB2GwNx9JjNkhnzyOj3Hr4d0dnaE/9O4nm1Gv9LXvvAXbN33eVpKEEb6 z2YN943OgHQI8+clWZZ2mHK3M6gNNV4KxEepqT5NAzdbL6MhBXaGKCnoveEsPKT30oSX 5EMns/oDbzzz5snOI4jg2+nGtlg7PWbz7L8bCGoYixIVNOACeUySCna+qhPTuWx+ctu0 YpLaQNVWgNewFm0Gta1AlZ3xef1XZL+29aqn2t8Qnc//DDQeqq19H5agO/62jP/623Ir 97zw== X-Gm-Message-State: ANoB5pkDvShVIGjroe6cewhwn8ElhhgVJknUKgT61sez/Kt5AB/8/jAi DDArq/f0MrP9J7CobcCyIZmydCJBUy4= 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750782633969336665?= X-GMAIL-MSGID: =?utf-8?q?1750782633969336665?= 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);