From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DB483A257C for ; Thu, 16 Apr 2026 23:23:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776381826; cv=none; b=Qu258/7B1Ra9+w8vUHaCX+fOqVfUlnWSsxHGacQRGNK0MxcY+Aq/jeZA0WAFHRa+3JaI+1p6KsxOeErL2PWcSU0/KhCN4qmi7Uw64/QYV7g7Wva20QoK8xO3YqLi7fmL3JdCbJ/nTAp+MXt+hJba/R7bNNz1jDe0IFE6K7yc684= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776381826; c=relaxed/simple; bh=jxXG1p7zC04tYFTfJPIVEx/ypGFjINDEhD2100oJ18Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dXiA1rbi0EefIDmxvw82vacNVAca5Pcl0WmXWo6kpRYdwv9sASLjSm18yesfpGoZ1dIHz8wJZf2MoKxGvQnbhuGXz5bt7bmQ3EcN1NxJXt2PXGKDNZAoHcYDz5/F4HsN0kXbJHPt/Qy8KlflrEn5jlmtAFEvkr+IgRHpl2eiUms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=llbPAxo8; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="llbPAxo8" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c6e24ee93a6so647433a12.0 for ; Thu, 16 Apr 2026 16:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776381823; x=1776986623; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=s+DOdHTafr7BremJNOxlZjtkuJmIgjyz+aBnTy0imDs=; b=llbPAxo8QE5Iq5sD0NBopoHqTHST0ohLT32dTMypQEDaar8DnBZTIsBd8pU+95hW5a GslF38zKjjP0locuDJdzAe7Bny1UC4R3wAPaO7mc1dECVz5n1gzbxlhfiQ3t4q3xzd0b NXCC+SnYV6gUYWIRsYvYGjcX/SFHnqkJdB3EriT8A41F7IvCmjwBmdFF/qIlTaE52Inf BdAsaF1NzGXLZNW9Q73szUY3n+amA3CWe/8VA95dv1mSm3REdt1Qr0N5Hq+1Wbtufk3x D1+pG1Ta7YrYIVgxEJCJOFj6DAIERdKoowSE3pxiwqr7JCHlteVJ3KlD7AcSY1l1QucD Bzrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776381823; x=1776986623; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=s+DOdHTafr7BremJNOxlZjtkuJmIgjyz+aBnTy0imDs=; b=WPJWMA1kZIGhnexwJbODHVapIxxdaXR7dgAxi+ucz6ienO2yRGAa2mZGGg/Ho0QoOu XRazl2M1fMRcCr2qfZ0NEQyZD4+cctdGz3iwWD8BvosGKIJILpA4dymvtxm66rNBP/jA fttQiIn2Ikf5ZaM355Xz5Zfr01SsZ/9aeTVqoPks+BRFipspJj6zcjrJODOaMh8klbvo 9tO5hxr9gnXZoFMDIepe89HYArqBfeax82+IJ2wUAe357AZUkZUQU8lzw4clxV5Jlcad bliAiwrHZ1FiiM1YOm7eB42UsToKpdwhLFk7eaXe9Epdf/zlIoGP0D/7cJXStj353w3V YH3g== X-Forwarded-Encrypted: i=1; AFNElJ9Owk29M4KB4C5AP1P8l/pfcHZHY6u0bZrHQoO26mhK/Or4NA1lBDQDCJr2Lfxpr41MZ9r///LW3vp5vN0=@vger.kernel.org X-Gm-Message-State: AOJu0YwPLHWszEGywJePYZODzfNqV7aJYTwHOmy/cRXKnHB5OVoYd4bH HKm7zkfdFuqEAvmreZdrAzsvf63NuyAs0K8yt0zJrFSctG2HYBS9igiCfPg4vZM8uH37orKQzQH l4rVbWQ== X-Received: from pfaz1.prod.google.com ([2002:aa7:91c1:0:b0:82f:2efd:4159]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9389:b0:398:7daf:6d7e with SMTP id adf61e73a8af0-3a08ca74edbmr302078637.17.1776381823334; Thu, 16 Apr 2026 16:23:43 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 16 Apr 2026 16:23:25 -0700 In-Reply-To: <20260416232329.3408497-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260416232329.3408497-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.rc1.513.gad8abe7a5a-goog Message-ID: <20260416232329.3408497-4-seanjc@google.com> Subject: [PATCH v3 3/7] KVM: SEV: Set supported SEV+ VM types during sev_hardware_setup() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Ashish Kalra , Tom Lendacky , John Allen Cc: kvm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Herbert Xu , Tycho Andersen Content-Type: text/plain; charset="UTF-8" Set the supported SEV+ VM types during sev_hardware_setup() instead of waiting until sev_set_cpu_caps(). This will using the set of *fully* supported VM types to print the enabled/unusable/disabled messaged. For all intents and purposes, no functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index c2126b3c3072..ea4ce371d5f3 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3013,18 +3013,14 @@ void sev_vm_destroy(struct kvm *kvm) void __init sev_set_cpu_caps(void) { - if (sev_enabled) { + if (sev_enabled) kvm_cpu_cap_set(X86_FEATURE_SEV); - kvm_caps.supported_vm_types |= BIT(KVM_X86_SEV_VM); - } - if (sev_es_enabled) { + + if (sev_es_enabled) kvm_cpu_cap_set(X86_FEATURE_SEV_ES); - kvm_caps.supported_vm_types |= BIT(KVM_X86_SEV_ES_VM); - } - if (sev_snp_enabled) { + + if (sev_snp_enabled) kvm_cpu_cap_set(X86_FEATURE_SEV_SNP); - kvm_caps.supported_vm_types |= BIT(KVM_X86_SNP_VM); - } } static bool is_sev_snp_initialized(void) @@ -3194,6 +3190,13 @@ void __init sev_hardware_setup(void) } } + if (sev_supported) + kvm_caps.supported_vm_types |= BIT(KVM_X86_SEV_VM); + if (sev_es_supported) + kvm_caps.supported_vm_types |= BIT(KVM_X86_SEV_ES_VM); + if (sev_snp_supported) + kvm_caps.supported_vm_types |= BIT(KVM_X86_SNP_VM); + if (boot_cpu_has(X86_FEATURE_SEV)) pr_info("SEV %s (ASIDs %u - %u)\n", sev_supported ? min_sev_asid <= max_sev_asid ? "enabled" : -- 2.54.0.rc1.513.gad8abe7a5a-goog