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));