From mboxrd@z Thu Jan 1 00:00:00 1970 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 C91B4C433EF for ; Tue, 14 Jun 2022 20:10:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357993AbiFNUKS (ORCPT ); Tue, 14 Jun 2022 16:10:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357609AbiFNUJM (ORCPT ); Tue, 14 Jun 2022 16:09:12 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 721664F457 for ; Tue, 14 Jun 2022 13:08:17 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id o8-20020a17090a9f8800b001dc9f554c7fso4075494pjp.4 for ; Tue, 14 Jun 2022 13:08:17 -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=K0KRVkUMqr9HilXYEGpWol1qMgJzvxP/fvNXOBy5syI=; b=LfG8d16faXS6+zLzbmXubosAUEIUFvF8bXDbPYtOUm9Y+HqjxB9YZTMUGJwf+cV2bG t5aVb5T+ahQqimNhTlj+jhunK50HNOq3m7mJ2V9zrl184ByEGKI0HwUbzOnKOSFl5ZbE 7Y9+fi06/lft1N/mCJBZ89xvjeu2eiWxrwqOVNgmWjqqWz68NIrk16C0dhMCghrmRfLf 0+sFO/5L+62MMWiUE57UF/w2cpXgwK28fM/JkcPTDDcT99kklLghX4uNFM+XHn6CSXFv ywnAFXtccbqKrAvJXL0pVPYZI/tkIQuFxPiBqp9//WpSXfdMwlalA3H4HSHtEBDzQ8N3 iggA== 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=K0KRVkUMqr9HilXYEGpWol1qMgJzvxP/fvNXOBy5syI=; b=Le8Q6AO5iqx/vml5cvxdg7Osct+jek9Gp0mpW6byy84zSHXqMsCi7dyhOs2eLegGr4 Qc5GKd/uGJm+TiR+g0J4u930wOG23uLs2ll+Mip2J8kyVk8kYgU6NtAvoq5n0RtCP1U4 t4bgVdV3f98nIEjbQw0Wa0mXZb5aWdDYyVA/JSB9qkl3tnSoatb6XHsDSucVgG8Wd19d aSu+DpjrTsGZ4O2YrDtdRf8YxcHdLR/JrG4DXFLqZ7haJZDJPoGaUXIw/h8E5fHpUL5i hoZOzxiVyKAXtiVah9TgXQNvdFA+3yH2E1xHLqoGxUnpN6twEW7GajAx/ar4GRW7mLGV VXAw== X-Gm-Message-State: AOAM530GSeUC36273Q76jbp8dSrmOgTrMXDnQH11Tljac9z4wj2ynsrx M1uUF/Eb+BYsk6IP1v8KY5Da+D0gdXM= X-Google-Smtp-Source: AGRyM1vleOyhOHbogXs9WGT/bajRXjGNAhfi3rke+40RFJIhC7SDTzq8Q1z6IuDNBNmSfiMWg8T5DlA/HpY= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:902:e0cc:b0:167:82d5:4753 with SMTP id e12-20020a170902e0cc00b0016782d54753mr5899159pla.138.1655237291812; Tue, 14 Jun 2022 13:08:11 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 14 Jun 2022 20:06:58 +0000 In-Reply-To: <20220614200707.3315957-1-seanjc@google.com> Message-Id: <20220614200707.3315957-34-seanjc@google.com> Mime-Version: 1.0 References: <20220614200707.3315957-1-seanjc@google.com> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH v2 33/42] KVM: selftests: Use this_cpu_has() in CR4/CPUID sync test From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Christopherson , Jim Mattson Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use this_cpu_has() to query OSXSAVE from the L1 guest in the CR4=>CPUID sync test. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/x86_64/processor.h | 3 --- .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 14 ++------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h index be2ce21926db..f56a3a7a4246 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -158,9 +158,6 @@ struct kvm_x86_cpu_feature { #define X86_FEATURE_KVM_HC_MAP_GPA_RANGE KVM_X86_CPU_FEATURE(0x40000001, 0, EAX, 16) #define X86_FEATURE_KVM_MIGRATION_CONTROL KVM_X86_CPU_FEATURE(0x40000001, 0, EAX, 17) -/* CPUID.1.ECX */ -#define CPUID_OSXSAVE (1ul << 27) - /* Page table bitfield declarations */ #define PTE_PRESENT_MASK BIT_ULL(0) #define PTE_WRITABLE_MASK BIT_ULL(1) diff --git a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c index 092fedbe6f52..a310674b6974 100644 --- a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +++ b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c @@ -21,19 +21,9 @@ static inline bool cr4_cpuid_is_sync(void) { - int func, subfunc; - uint32_t eax, ebx, ecx, edx; - uint64_t cr4; + uint64_t cr4 = get_cr4(); - func = 0x1; - subfunc = 0x0; - __asm__ __volatile__("cpuid" - : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) - : "a"(func), "c"(subfunc)); - - cr4 = get_cr4(); - - return (!!(ecx & CPUID_OSXSAVE)) == (!!(cr4 & X86_CR4_OSXSAVE)); + return (this_cpu_has(X86_FEATURE_OSXSAVE) == !!(cr4 & X86_CR4_OSXSAVE)); } static void guest_code(void) -- 2.36.1.476.g0c4daa206d-goog