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 X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DFD6C433B4 for ; Thu, 22 Apr 2021 02:12:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 142F161354 for ; Thu, 22 Apr 2021 02:12:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234717AbhDVCMi (ORCPT ); Wed, 21 Apr 2021 22:12:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234475AbhDVCMX (ORCPT ); Wed, 21 Apr 2021 22:12:23 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A70CFC06174A for ; Wed, 21 Apr 2021 19:11:46 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id e65-20020a25e7440000b02904ecfeff1ed8so6818745ybh.19 for ; Wed, 21 Apr 2021 19:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=M+EV17K09Jw3Z2+bqjVXisuWTECXp2lypwrOyx6edfg=; b=WdjBYY714q1SkVGA3+8FJWIs7t1KO+Td1j8qqTAn2t8XbOY4FwT+cb3XDSglS/CmN3 /h1eIwTnx4MMBV2bpq08Ovt1fNSVKIMnzfVDOMYAJoiNZLBTnooWjA/iynUcYuPZ3nE6 2f+jOOGBYLanQ7YHhVNISUNniQ5QXERn5vEvCz0GEODVRwh3fReqBXWjT1PmwoQrIP6c /b31qsu+5OEQXl0HVKoY45f4Paur5Cfw1LvBxMcMza/PDZEjS1Ph162g7lZjfK8zlAdQ WCs/914EiqBCwBu4PU7d/rW+vDkl6cZ2Abnaj+shbydw0uf/azp7/Nvm1FAjBprdCYjM B6zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=M+EV17K09Jw3Z2+bqjVXisuWTECXp2lypwrOyx6edfg=; b=er4hh/qgv0QntCjHUNfMx+lnpzoZAI6XfVBt6A9dKNIovCi6tLgP7dO5ZdjCeGg25B pD3fDyIgf4LbBwU7Xwd24UJQHkYR+ze0zKwDyNVTu1IujNkDyhPN+vm/kdTdTNTAh+GZ TlHD0PQMDNJbOYxSyDokRZyJ/lKRg4vPmvPRLJzIH/2Pj7RqTN9mdpzV1J0jPhqy3gra 4J7WAuloE6/InAQIdhhTD7qXSiHPg41tsk/1tCosjsPcwkFJ65b/1f4BwmyvselvwJXq Dyn/XUZlVK+PkTMxNuMxpdfm3oHIkl5OnR6PFis44o7AG3gTlUlzTf5zrhs29GWUqIPM 57Qg== X-Gm-Message-State: AOAM5332uOCKPsS2Ik9Yvr8M9D3vxzW9DE1SDYRyh4iE9t52kuJfvkGM Fk7z/AXCfC2XU/baAJRShWDPMUjg6Wg= X-Google-Smtp-Source: ABdhPJzmkoZ/wR2M9/j0Oli7wOyopQFHQ7eWa7OLjd19YvFmX/zlUayyAhTAzAPlMHL6YWbvEXW5EyhunF8= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:e012:374c:592:6194]) (user=seanjc job=sendgmr) by 2002:a25:3251:: with SMTP id y78mr1332201yby.455.1619057505890; Wed, 21 Apr 2021 19:11:45 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 21 Apr 2021 19:11:18 -0700 In-Reply-To: <20210422021125.3417167-1-seanjc@google.com> Message-Id: <20210422021125.3417167-9-seanjc@google.com> Mime-Version: 1.0 References: <20210422021125.3417167-1-seanjc@google.com> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog Subject: [PATCH v5 08/15] KVM: SVM: Condition sev_enabled and sev_es_enabled on CONFIG_KVM_AMD_SEV=y From: Sean Christopherson To: Paolo Bonzini , Dave Hansen , Andy Lutomirski , Peter Zijlstra Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Tom Lendacky , Brijesh Singh Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Define sev_enabled and sev_es_enabled as 'false' and explicitly #ifdef out all of sev_hardware_setup() if CONFIG_KVM_AMD_SEV=n. This kills three birds at once: - Makes sev_enabled and sev_es_enabled off by default if CONFIG_KVM_AMD_SEV=n. Previously, they could be on by default if CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y, regardless of KVM SEV support. - Hides the sev and sev_es modules params when CONFIG_KVM_AMD_SEV=n. - Resolves a false positive -Wnonnull in __sev_recycle_asids() that is currently masked by the equivalent IS_ENABLED(CONFIG_KVM_AMD_SEV) check in svm_sev_enabled(), which will be dropped in a future patch. Reviewed by: Tom Lendacky Reviewed-by: Brijesh Singh Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 9b6adc493cc8..2fe545102d12 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -28,6 +28,7 @@ #define __ex(x) __kvm_handle_fault_on_reboot(x) +#ifdef CONFIG_KVM_AMD_SEV /* enable/disable SEV support */ static bool sev_enabled = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT); module_param_named(sev, sev_enabled, bool, 0444); @@ -35,6 +36,10 @@ module_param_named(sev, sev_enabled, bool, 0444); /* enable/disable SEV-ES support */ static bool sev_es_enabled = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT); module_param_named(sev_es, sev_es_enabled, bool, 0444); +#else +#define sev_enabled false +#define sev_es_enabled false +#endif /* CONFIG_KVM_AMD_SEV */ static u8 sev_enc_bit; static int sev_flush_asids(void); @@ -1774,11 +1779,12 @@ void __init sev_set_cpu_caps(void) void __init sev_hardware_setup(void) { +#ifdef CONFIG_KVM_AMD_SEV unsigned int eax, ebx, ecx, edx; bool sev_es_supported = false; bool sev_supported = false; - if (!IS_ENABLED(CONFIG_KVM_AMD_SEV) || !sev_enabled || !npt_enabled) + if (!sev_enabled || !npt_enabled) goto out; /* Does the CPU support SEV? */ @@ -1834,6 +1840,7 @@ void __init sev_hardware_setup(void) out: sev_enabled = sev_supported; sev_es_enabled = sev_es_supported; +#endif } void sev_hardware_teardown(void) -- 2.31.1.498.g6c1eba8ee3d-goog