From patchwork Sat Jun 4 01:20:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12869483 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 1A717C433EF for ; Sat, 4 Jun 2022 01:21:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231495AbiFDBVn (ORCPT ); Fri, 3 Jun 2022 21:21:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350024AbiFDBVU (ORCPT ); Fri, 3 Jun 2022 21:21:20 -0400 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 09E3859300 for ; Fri, 3 Jun 2022 18:21:16 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id i16-20020a170902cf1000b001540b6a09e3so5073017plg.0 for ; Fri, 03 Jun 2022 18:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=2CIyo9+62gy+JEf6/FTcvhLOqsH6XI1aGgGR7RbhZy8=; b=e/CoQ6N1BLk/odGMKewDlRxYI9eMw5DUZwQ0JyS1vL18okZj3CyJgGnGtyTa2MGbpw /VBTEUVkRpuD3RR08dlwZJKxo5jSx8Dfu99Mm3BuLrUFYhBONNkNQMYHbekj0lbFLIGf 0LYhWpkFcjJZtEx+x2uLF/aPiev/CqY6CENPXAUCoolt+k3jRjcD0s3AQ6jgPOzWbOAp xIBrdWIWguF3/dR+ph5HhbQjExv4LNXd3d/Ezrday3GwFjdZ5JwahHQzyHLIZvQfBkUd 42np6xTe3W40uvhVw/bBPakuMvqndav7GibHDa9oQqF/50egSBsiGwRTfmI9OnYOYRhJ pqSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=2CIyo9+62gy+JEf6/FTcvhLOqsH6XI1aGgGR7RbhZy8=; b=NAKVLUC2p9YofnnZfyG34IVvNKYBiZpVv6pvnqo9o/oDuI6SizvTw82uycTOqjt0bj PwTva8GKvzdP34tX7tSW5+RnkacgOKyou45ToWvWzoopI1i4dZAvkpcG2bTsuG8buq1B iOBGZYsrrkm3Qz5k9jvv5dAaALuqLhJQbaF0S82OQ8RMimScqAZFLad+2sMujAcRWRuw SkT78I7tTDc6O/fv6yFWX7ZhElDKPR81PtC2uFq6ZgTojuvRz1cL5LWML/Fey+E5JwOZ kieZ/mSN09Y+jUgi9S9ce5eylvpdn7oRRMOkiuaZpKbqEGinxxl0gdSVFr+qp5mEqFHk dCAA== X-Gm-Message-State: AOAM531USQ9u3zRx8BCC8BD+PVAVYxI2qYQP8Tmdi7My52Dkcl6TrvvC 7j7PkTZrlGRSV7jKSbxvex8x4KO2jKM= X-Google-Smtp-Source: ABdhPJyEpE1eRHJzScLoumLROn6x7qNvOlhYu2NSqd5gJxBk6thivXmfFul7gtdrANkMicJfmvZmO2zR11g= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:902:f34c:b0:163:fa4f:2ff5 with SMTP id q12-20020a170902f34c00b00163fa4f2ff5mr12474825ple.174.1654305676584; Fri, 03 Jun 2022 18:21:16 -0700 (PDT) Reply-To: Sean Christopherson Date: Sat, 4 Jun 2022 01:20:25 +0000 In-Reply-To: <20220604012058.1972195-1-seanjc@google.com> Message-Id: <20220604012058.1972195-10-seanjc@google.com> Mime-Version: 1.0 References: <20220604012058.1972195-1-seanjc@google.com> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog Subject: [PATCH 09/42] KVM: selftests: Use kvm_cpu_has() for XSAVES in XSS MSR test From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, Vitaly Kuznetsov , David Matlack , Jim Mattson , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use kvm_cpu_has() in the XSS MSR test instead of open coding equivalent functionality using kvm_get_supported_cpuid_index(). No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/x86_64/processor.h | 1 + tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h index ff8b92c435f5..7992c665be1f 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -110,6 +110,7 @@ struct kvm_x86_cpu_feature { #define X86_FEATURE_SPEC_CTRL KVM_X86_CPU_FEATURE(0x7, 0, EDX, 26) #define X86_FEATURE_ARCH_CAPABILITIES KVM_X86_CPU_FEATURE(0x7, 0, EDX, 29) #define X86_FEATURE_PKS KVM_X86_CPU_FEATURE(0x7, 0, ECX, 31) +#define X86_FEATURE_XSAVES KVM_X86_CPU_FEATURE(0xD, 1, EAX, 3) /* * Extended Leafs, a.k.a. AMD defined diff --git a/tools/testing/selftests/kvm/x86_64/xss_msr_test.c b/tools/testing/selftests/kvm/x86_64/xss_msr_test.c index 4e2e08059b95..e0ddf47362e7 100644 --- a/tools/testing/selftests/kvm/x86_64/xss_msr_test.c +++ b/tools/testing/selftests/kvm/x86_64/xss_msr_test.c @@ -14,11 +14,8 @@ #define MSR_BITS 64 -#define X86_FEATURE_XSAVES (1<<3) - int main(int argc, char *argv[]) { - struct kvm_cpuid_entry2 *entry; bool xss_in_msr_list; struct kvm_vm *vm; struct kvm_vcpu *vcpu; @@ -28,10 +25,7 @@ int main(int argc, char *argv[]) /* Create VM */ vm = vm_create_with_one_vcpu(&vcpu, NULL); - TEST_REQUIRE(kvm_get_cpuid_max_basic() >= 0xd); - - entry = kvm_get_supported_cpuid_index(0xd, 1); - TEST_REQUIRE(entry->eax & X86_FEATURE_XSAVES); + TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XSAVES)); xss_val = vcpu_get_msr(vcpu, MSR_IA32_XSS); TEST_ASSERT(xss_val == 0,