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 D6E62C43334 for ; Tue, 14 Jun 2022 20:07:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351902AbiFNUHi (ORCPT ); Tue, 14 Jun 2022 16:07:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351053AbiFNUHW (ORCPT ); Tue, 14 Jun 2022 16:07:22 -0400 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 AC7F44D9CA for ; Tue, 14 Jun 2022 13:07:20 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id c11-20020a17090a4d0b00b001e4e081d525so8643475pjg.7 for ; Tue, 14 Jun 2022 13:07:20 -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=yVOVbpSs8meRSwOuAAzFlzcoWe8mEuzABJ9vClZbdV8=; b=b0vt+aJdZXu3gcnC37y/5e+nUMyiMnti+YljfyQH7TKjOBYB1863wGkYlxkdqIHY0p SRxHhk8DMTFh8GIqpZ+eIz1bRFutZOG1j82+Klk06fpYOOjg2oO5ZSfk5KSxBxHcRii2 0aXtbkoHXjEFRv8GX8S0m82cwgVu9harL1y/CvD0WfoojpZKfXuL4KWJskjLxsIodbo3 MAtZpOKYSpGv9aD4eguoGr4VMqbckuV3n8jGm2StS/gZuRZ5Csv4oaSSD3yOJirNbiuL M3HlbA72vsbMsYtL2E2yK6NLYAgkOuBRoVMfQw6ZRu9h7LN9zAW0xBl2bFAyMKYeCA5P gV7Q== 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=yVOVbpSs8meRSwOuAAzFlzcoWe8mEuzABJ9vClZbdV8=; b=vW3cyN91hVvCRxl+1tCHmau/yF4tnrxe/RpYS4Up4F0JA9Vf1UiOXCQ5whIUduJ4es tqZiLNJheSy1Djsd+YbVHcKEvw7pQylUv5HrZPZFGsMteNFs0Jgxkwj8GRghMpB9gFYl 8JlBYlydN7P4WBDkfRHVq43ls4Xu+5JSjBLeKL5bUEbMV86uIdM4ufKAVIAPR02mBJGR 9HHZsbR0kEEVjc7xoJaD8nN077YqbiiC/fsZzeKlSfcCToHSfTjUvVsvzV6GN2z5EsXI 9XSuFO+Vyy0lTBrLZPl56BVO18UflDWbc/al7oJlf5L7mz6V3Jn8aGqVhlwnwUg0UUIy 5zXw== X-Gm-Message-State: AJIora9kpBwcO6GLUJtEhKBhJBmxcbIDXe9TRLRxPwQmS2NOwHnWRg+8 69/oB1Wkooe7/b3uLFp+c81yIH9j9is= X-Google-Smtp-Source: AGRyM1tteAYoZg835mQqJ4PAc0QqFzsuk2Zip7QKmP5O7OvvtmePboUPr90NwUfweM2Iv43VIwG1mUjxaPc= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:902:b407:b0:168:e554:33be with SMTP id x7-20020a170902b40700b00168e55433bemr5948707plr.130.1655237240171; Tue, 14 Jun 2022 13:07:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 14 Jun 2022 20:06:29 +0000 In-Reply-To: <20220614200707.3315957-1-seanjc@google.com> Message-Id: <20220614200707.3315957-5-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 04/42] KVM: selftests: Use kvm_cpu_has() in the SEV migration 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 kvm_cpu_has() in the SEV migration test instead of open coding equivalent functionality using kvm_get_supported_cpuid_entry(). No functional change intended. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/x86_64/processor.h | 2 ++ .../selftests/kvm/x86_64/sev_migrate_tests.c | 13 ++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h index ee3f7239cea7..e1f9aa34f90a 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -127,6 +127,8 @@ struct kvm_x86_cpu_feature { #define X86_FEATURE_PAUSEFILTER KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 10) #define X86_FEATURE_PFTHRESHOLD KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 12) #define X86_FEATURE_VGIF KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 16) +#define X86_FEATURE_SEV KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 1) +#define X86_FEATURE_SEV_ES KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 3) /* CPUID.1.ECX */ #define CPUID_VMX (1ul << 5) diff --git a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c index 76ba6fc80e37..56a5932165ce 100644 --- a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +++ b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c @@ -393,23 +393,14 @@ static void test_sev_move_copy(void) kvm_vm_free(sev_vm); } -#define X86_FEATURE_SEV (1 << 1) -#define X86_FEATURE_SEV_ES (1 << 3) - int main(int argc, char *argv[]) { - struct kvm_cpuid_entry2 *cpuid; - TEST_REQUIRE(kvm_has_cap(KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM)); TEST_REQUIRE(kvm_has_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM)); - cpuid = kvm_get_supported_cpuid_entry(0x80000000); - TEST_REQUIRE(cpuid->eax >= 0x8000001f); + TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_SEV)); - cpuid = kvm_get_supported_cpuid_entry(0x8000001f); - TEST_REQUIRE(cpuid->eax & X86_FEATURE_SEV); - - have_sev_es = !!(cpuid->eax & X86_FEATURE_SEV_ES); + have_sev_es = kvm_cpu_has(X86_FEATURE_SEV_ES); if (kvm_check_cap(KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM)) { test_sev_migrate_from(/* es= */ false); -- 2.36.1.476.g0c4daa206d-goog