Received-SPF: pass (google.com: domain of linux-kernel+bounces-100644-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
 165.204.84.17 as permitted sender) receiver=protection.outlook.com;
 client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C
Date: Tue, 12 Mar 2024 10:19:02 -0500
From: Michael Roth <michael.roth@amd.com>
To: Paolo Bonzini <pbonzini@redhat.com>
CC: <linux-kernel@vger.kernel.org>, <kvm@vger.kernel.org>,
	<seanjc@google.com>, <aik@amd.com>
Subject: Re: [PATCH v3 03/15] KVM: SVM: Invert handling of SEV and SEV_ES
 feature flags
Message-ID: <20240312151902.xkh7bxdmecwzw77h@amd.com>
References: <20240226190344.787149-1-pbonzini@redhat.com>
 <20240226190344.787149-4-pbonzini@redhat.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240226190344.787149-4-pbonzini@redhat.com>
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 18:17:38.1328
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 7cab4da5-e4b6-4c9a-1d51-08dc42c0b2e0
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com]
X-MS-Exchange-CrossTenant-AuthSource:
	SA2PEPF00001508.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7363

On Mon, Feb 26, 2024 at 02:03:32PM -0500, Paolo Bonzini wrote:
> From: Sean Christopherson <seanjc@google.com>
> 
> Leave SEV and SEV_ES '0' in kvm_cpu_caps by default, and instead set them
> in sev_set_cpu_caps() if SEV and SEV-ES support are fully enabled.  Aside
> from the fact that sev_set_cpu_caps() is wildly misleading when it *clears*
> capabilities, this will allow compiling out sev.c without falsely
> advertising SEV/SEV-ES support in KVM_GET_SUPPORTED_CPUID.
> 
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Michael Roth <michael.roth@amd.com>

> ---
>  arch/x86/kvm/cpuid.c   | 2 +-
>  arch/x86/kvm/svm/sev.c | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index adba49afb5fe..bde4df13a7e8 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -761,7 +761,7 @@ void kvm_set_cpu_caps(void)
>  	kvm_cpu_cap_mask(CPUID_8000_000A_EDX, 0);
>  
>  	kvm_cpu_cap_mask(CPUID_8000_001F_EAX,
> -		0 /* SME */ | F(SEV) | 0 /* VM_PAGE_FLUSH */ | F(SEV_ES) |
> +		0 /* SME */ | 0 /* SEV */ | 0 /* VM_PAGE_FLUSH */ | 0 /* SEV_ES */ |
>  		F(SME_COHERENT));
>  
>  	kvm_cpu_cap_mask(CPUID_8000_0021_EAX,
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index f06f9e51ad9d..aec3453fd73c 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -2178,10 +2178,10 @@ void sev_vm_destroy(struct kvm *kvm)
>  
>  void __init sev_set_cpu_caps(void)
>  {
> -	if (!sev_enabled)
> -		kvm_cpu_cap_clear(X86_FEATURE_SEV);
> -	if (!sev_es_enabled)
> -		kvm_cpu_cap_clear(X86_FEATURE_SEV_ES);
> +	if (sev_enabled)
> +		kvm_cpu_cap_set(X86_FEATURE_SEV);
> +	if (sev_es_enabled)
> +		kvm_cpu_cap_set(X86_FEATURE_SEV_ES);
>  }
>  
>  void __init sev_hardware_setup(void)
> -- 
> 2.39.1
> 
>