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