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 E58B1C6FA86 for ; Fri, 16 Sep 2022 04:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230035AbiIPE7V (ORCPT ); Fri, 16 Sep 2022 00:59:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229886AbiIPE7D (ORCPT ); Fri, 16 Sep 2022 00:59:03 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1256A1D53 for ; Thu, 15 Sep 2022 21:59:01 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id a19-20020aa780d3000000b0052bccd363f8so12432249pfn.22 for ; Thu, 15 Sep 2022 21:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=5sbTEFvzRr7GbC/X6PZeq7okuS0vSIgMoswqUqyuUqc=; b=HMBxt0pVNHCYNbxDc8VigBQ1MXR7A+42pRZxXF2slNCnNQZ+6f5rRNNuBLP386Sh1I /xpXiblZaqt2Zw/oMm275rNOy7gxR5ESOhvXOrh3Xs9/jW9D+/1iNhcZY5IyiTicaUkm vdsRXzItacxSB6z3HdidM9p8wAhXKp7qkPuwr1QZFBuAZTTHewolt3wy8YhP+O6KUZsa 0gYQ3wFQBolHX3xKaCmoHM77d07g5ZzVOppnYoMu0GmqiRRzTgAVwH7EKg5F7lMYyYXH EzXgmLPeSb+K7mdu32DZMPuF4dZzYVMWH6/NKixpzRxtozPZUeSXdTIHgh6YMbQkrS4D K00g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=5sbTEFvzRr7GbC/X6PZeq7okuS0vSIgMoswqUqyuUqc=; b=IoB1tVqaP83Eqg8FdvTNcfEGmT37tEtRJPBqffynGCy7yKEeSZblaVq434PkuPaVH7 ZAjsHAfCk3soomg9wSgz/qkwl4nolL8YHIJ94pjuSvzYRhCXYU6XbE6CFN1DnUialsVA MOL4uAxZdVN+/KxgUQ1qbYeX8gn4STKR/5wVNynJCIse9iNSHRrJ/5xez/9AE+SldaH6 29pa/vVwTFhqlDtJSqbx+awR+kOaHD6oUgSQawh0SzvZtTQnGh1809XEIYL/OZcx8/hn zRIfl+OhCRgbuxfLT/R5YY+0GJohl2qLc6KyaviGbgRtkp4TU0Qp/qaMgC7d3sI8H9Xd 5ccg== X-Gm-Message-State: ACrzQf0jnVvF//Hfn9p78vSqZPhYXyL3KJCfQpZ7lcSGUW4I78s9cemF NzGkQeEC95sqSyvGEsxnc7Bi6FHIhAE9ow== X-Google-Smtp-Source: AMsMyM7lej8pA2zAcVKJ6uuHmUlBJhtH7xJC3YODVQ9Y2cN9cfo4/QAh/md/oFPO6DRkDPfYzJ58987yAYNHtw== X-Received: from loggerhead.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:29a]) (user=jmattson job=sendgmr) by 2002:a05:6a00:10c2:b0:547:4991:c985 with SMTP id d2-20020a056a0010c200b005474991c985mr2959344pfu.67.1663304340786; Thu, 15 Sep 2022 21:59:00 -0700 (PDT) Date: Thu, 15 Sep 2022 21:58:32 -0700 In-Reply-To: <20220916045832.461395-1-jmattson@google.com> Mime-Version: 1.0 References: <20220916045832.461395-1-jmattson@google.com> X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog Message-ID: <20220916045832.461395-6-jmattson@google.com> Subject: [PATCH 5/5] KVM: svm: Set X86_FEATURE_NO_LMSLE when !nested From: Jim Mattson To: Avi Kivity , Babu Moger , Borislav Petkov , "Chang S. Bae" , Dave Hansen , "H. Peter Anvin" , Ingo Molnar , Joerg Roedel , Josh Poimboeuf , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini , Pawan Gupta , Peter Zijlstra , Sean Christopherson , Thomas Gleixner , Wyes Karny , x86@kernel.org Cc: Jim Mattson Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org KVM has never allowed a guest to set EFER.LMSLE when the "nested" module parameter was false. In the past, there was no way for a guest to know whether or not this was a legal EFER bit. Now, we can let the guest know this bit is illegal by reporting X86_FEATURE_NO_LMSLE in KVM_GET_SUPPORTED_CPUID. Signed-off-by: Jim Mattson --- arch/x86/kvm/svm/svm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 7c4fd594166c..942602d503ad 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4945,6 +4945,8 @@ static __init void svm_set_cpu_caps(void) if (boot_cpu_has(X86_FEATURE_LS_CFG_SSBD) || boot_cpu_has(X86_FEATURE_AMD_SSBD)) kvm_cpu_cap_set(X86_FEATURE_VIRT_SSBD); + if (!nested) + kvm_cpu_cap_set(X86_FEATURE_NO_LMSLE); /* AMD PMU PERFCTR_CORE CPUID */ if (enable_pmu && boot_cpu_has(X86_FEATURE_PERFCTR_CORE)) -- 2.37.3.968.ga6b4b080e4-goog