From nobody Sun Apr 19 12:42:12 2026 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 1EFCCC04A68 for ; Thu, 28 Jul 2022 00:02:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234563AbiG1ACe (ORCPT ); Wed, 27 Jul 2022 20:02:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234327AbiG1ACd (ORCPT ); Wed, 27 Jul 2022 20:02:33 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 922EC491F1 for ; Wed, 27 Jul 2022 17:02:31 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id m12so575225lfj.4 for ; Wed, 27 Jul 2022 17:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=profian-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mBsuLV2Kcuz0I195V1tt9wJXgZd8wQhbwFhjdKnnIJE=; b=l3MGDDEdS9t9yQxk624TuJG1yi8Q65z7u1Kbu1NGAGE5iTZqEyvSpMIssIgZqFbcog tgnqIdBLB5ZyY01UAVkhNmm08bUwvtYktXorCFReTU6g1W3UEQ71DFIvS1QxHdwBYaBe l1dkPVjdWppEix7iwqiFhqXCBId631FcZLwaU+RdLbVqguhF2XtJkWgCGKKKWQ7+EOi3 YVyXFf9I+QMPBz/N/FzKGSfpAidyW1O2O2Q9dqX9sywEb0g7SbOSdNzAhzbhRSLirQ9R f06nl3wGAqpcepN/PuNK/WvfOceNFDYHD+Bzpj+S7lEbu5x1YuTZzkIvVBFEO41MccVj J/Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mBsuLV2Kcuz0I195V1tt9wJXgZd8wQhbwFhjdKnnIJE=; b=YfS8xulMTPwmrF7AMQ/odiIkSJKsW4OHCAlD0jYeznB4CXZUMlm8ZGyHUzYkTPfcn+ F/6k10L3rseS8jnH55gmbvX4DOrpGUgQar+4NOd+PvoPkkMgD6gY7t5aAC/t80jMAkkP dNInA/dWPRyLx3dmDmYykv0SOclLoCGDQfZVHCS6GJUPVi3g3xMZEbOapGJrlpByy+U/ X2Y1LR6mD8lIWr3Pxsy8/mkN4nRYbP4pczLzFW12wa4+H1Ghh4l6Qolxmkny5mkfKyLn q4WoR10kxVY0NoICD1zLcgpBtl/pivWj4zoitMVvWC9vo8ID2F4l4u8VTI3uP/VDdJR1 44Vw== X-Gm-Message-State: AJIora/ydXNObzmZHJh3FYUalpURKt6nJHsoCjqQdvUwviHLycUDlBtP h9uw3G/vh3YNg0E12xjdYKUvFA== X-Google-Smtp-Source: AGRyM1uJOZj/Ud8yjL00jfvfNrl8tmJjn2jtL+kO+cqfm7FOI+GilysBPfZMbkNBrIU8/Qy5rZM+9g== X-Received: by 2002:a05:6512:1694:b0:48a:9d45:763f with SMTP id bu20-20020a056512169400b0048a9d45763fmr4368355lfb.662.1658966549714; Wed, 27 Jul 2022 17:02:29 -0700 (PDT) Received: from localhost (91-154-92-55.elisa-laajakaista.fi. [91.154.92.55]) by smtp.gmail.com with ESMTPSA id q27-20020ac2515b000000b0048a897adbc9sm2096529lfd.211.2022.07.27.17.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 17:02:29 -0700 (PDT) From: Jarkko Sakkinen To: Paolo Bonzini Cc: Jarkko Sakkinen , stable@vger.kernel.org, Jarkko Sakkinen , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , Brijesh Singh , Isaku Yamahata , kvm@vger.kernel.org (open list:KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)), linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH] KVM: x86/mmu: Fix incorrect use of CONFIG_RETPOLINE Date: Thu, 28 Jul 2022 03:02:21 +0300 Message-Id: <20220728000221.19088-1-jarkko@profian.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use "#ifdef" instead of "#if", as it is possible to select KVM without enabling RETPOLINE. Adding the following list of flags on top of tinyconfig is an example of a failing config file: CONFIG_64BIT=3Dy CONFIG_PCI=3Dy CONFIG_ACPI=3Dy CONFIG_VIRTUALIZATION=3Dy CONFIG_HIGH_RES_TIMERS=3Dy CONFIG_CRYPTO=3Dy CONFIG_DMADEVICES=3Dy CONFIG_X86_MCE=3Dy CONFIG_RETPOLINE=3Dy CONFIG_MEMORY_FAILURE=3Dy CONFIG_KVM=3Dy CONFIG_KVM_AMD=3Dy CONFIG_CRYPTO_DEV_CCP=3Dy CONFIG_CRYPTO_DEV_CCP_DD=3Dy CONFIG_CRYPTO_DEV_SP_CCP=3Dy CONFIG_CRYPTO_DEV_SP_PSP=3Dy CONFIG_KVM_AMD_SEV=3Dy CONFIG_AMD_MEM_ENCRYPT=3Dy CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=3Dn Cc: stable@vger.kernel.org # 5.19 Cc: Jarkko Sakkinen Fixes: d1f5c8366288 ("KVM: x86/mmu: Introduce kvm_mmu_map_tdp_page() for us= e by TDX and SNP") Signed-off-by: Jarkko Sakkinen --- arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 0b99ee4ea184..e08c7e85bbb9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4213,7 +4213,7 @@ kvm_pfn_t kvm_mmu_map_tdp_page(struct kvm_vcpu *vcpu,= gpa_t gpa, * direct_page_fault() when appropriate. */ //r =3D direct_page_fault(vcpu, &fault); -#if CONFIG_RETPOLINE +#ifdef CONFIG_RETPOLINE if (fault.is_tdp) r =3D kvm_tdp_page_fault(vcpu, &fault); #else --=20 2.36.1