Received-SPF: pass (google.com: domain of linux-kernel+bounces-201757-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <adf40ee9-8b8a-4cac-a207-4d3d4ded2135@amd.com>
Date: Wed, 5 Jun 2024 10:25:23 +0530
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] KVM: SEV-ES: Fix svm_get_msr()/svm_set_msr() for
 KVM_SEV_ES_INIT guests
To: Michael Roth <michael.roth@amd.com>, kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
 Sean Christopherson <seanjc@google.com>,
 Ravi Bangoria <ravi.bangoria@amd.com>, Nikunj A Dadhania <nikunj@amd.com>
References: <20240604233510.764949-1-michael.roth@amd.com>
Content-Language: en-US
From: "Aithal, Srikanth" <sraithal@amd.com>
In-Reply-To: <20240604233510.764949-1-michael.roth@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?amZoMWNKQW9PZ3RjeDQ0dU84MU0wLy9QSzZBbGl2RzlZMEFKN2prWVBmbFEz?=
 =?utf-8?B?QnNtT3dNeko4TDF0ZjVMOGZ1c0N3bzlmRjhVbzYxeXdSNDA2Zzl1Q1hTdXhi?=
 =?utf-8?B?OGVxek1pWEFjRlY5cmlFYVVUNlo5NXhuRmVBUkc4czlQQUk4OFBjL3NGdjcv?=
 =?utf-8?B?SjlBajlXSFAySFpBMHozWllGWTVtdXhpVGQvc3dRQlhJbnJFZ3o4MmJ0MnEv?=
 =?utf-8?B?R0xGWnJYSGdlSGNNL0F3dU9HTzlRYVFaZm1OOGRTSGhTTnBqaTdKSkJkZTA5?=
 =?utf-8?B?OVkrSllnZ2dxY2pyckYwaG05OEVBbE9xdW5LMkJkamxRZlFnZDZvNWxkN2w5?=
 =?utf-8?B?K1F3THE5MmlMdHcwMnN6VnlrUVpSTHkxeXdSRDV6cVNjVmlqTm9DVC93OTRV?=
 =?utf-8?B?VCtSbmloTVVIdDNzS0VVQ0F0VTl2MWV3UjNNNTl0d1ppZnJBZGtVcjNRTWVU?=
 =?utf-8?B?RUhQT2ZkOVFucnNlcThZM25Zc05rUGVHb29sempGL0htMEZYOHFiOG5SQ3ha?=
 =?utf-8?B?OEpOUFV0dEZ2Nm05L3F6REY0b2JobnpsOFNzZTdqUmV0TlRVUGlwa0pYMkJm?=
 =?utf-8?B?NVhOU3VKZ0w2eWdISnN4NFR5MFpKUnZGNTNjdW95ODNDM1AweUpib1ZzR3hl?=
 =?utf-8?B?OWFpNkNtVmpiV3BSR1RzdGVkZU1raFU1U0t1UDFSS1kvWGVKb1NVdU9ieFdh?=
 =?utf-8?B?S1BSWW91djkwcFV2NmxhK2YzMXlOTXd2UmYyV3FmRzJHRjJtcmU1N1ppcHdx?=
 =?utf-8?B?aUgyaDFQT3RWb01SMGRkYWtMaHV2V2RPQjJFbnNsNW1GSElyTUVtUEJVc1NZ?=
 =?utf-8?B?RDJJY0NMWEFRYWZNWWtuQzlIb3cycUpZb0tzTEEza3RuUzVmelZnUVNuWlRW?=
 =?utf-8?B?TmpPZUtRQWhyM1BwN1ZEYnc2UUZvakUwcXZ5RTBZUlZKV2pJaEVONVVJQktS?=
 =?utf-8?B?cHB3c1pJYVRHZ3EzaXJ4ZEhESDFraVpLQW9VYzZQMDl4SThVZTUzejliOXpM?=
 =?utf-8?B?SWN2R3JpME41RHFyamw0Wm45QWt0aE1TRmF2dmh1Tld2QWZyM0psL2UvUUEw?=
 =?utf-8?B?ejcxKzVsdExkMWNEMFV3QTVQaVFkV3c4L2VjcW41UUNkNFozVEs5eEZjdjRV?=
 =?utf-8?B?d2RKVzAvSWs2bEdVQlRuWjVIQkMwYzdlZEFYTnlCM1NXSUFKKzJhRzNCU2t2?=
 =?utf-8?B?b2VJWlV4SDZDcWxJRndPVDZIV2E5MlRxckY5bDA4cVY0NmN2b2d4aWhZTy9h?=
 =?utf-8?B?Rys1bHJVczY2cUNUWXBCUFRsTHBHZm5IaWJpU2lENmRGQTVCSkdOOTY4SGRK?=
 =?utf-8?B?U2o0NzBkZyt4Y3VZcnN0MmdhRkUwV28rSWFZMUdZalVkYkZUa3dSb0VodHRV?=
 =?utf-8?B?djFyOTZ2dlg2R3h1MG1sMGx4aWUxTThWSjJiUTdlai9WT3pVMWp0V1p6Tk1k?=
 =?utf-8?B?eUxQbGNCSUJpNm1LeXRaUXNiSi9zSm1PQmZjRWRyVURnZG1VNlBvcmk1V1ln?=
 =?utf-8?B?d3RoaUNlY1VRb0YzS3lXZDlkeE5zSDk2c0R4NFVkT0UvbUFiY08zaUdSc0FK?=
 =?utf-8?B?U29rK216OXpoMU9sV3hNNE43VndKYTlUWnNsVWY5N3R2NG9Mc2RweGRMeVV5?=
 =?utf-8?B?cHpHR0VDc1hGZ0RZSGRzc2NZUnRpdzlrWTUxOEZLWTM4UFBBMzk0STJNMVFI?=
 =?utf-8?B?YzduU25LaGJEMkN5ZU5pY054TEphajhramVFWnBJQU9MNG5EaFJFS0VmZVhV?=
 =?utf-8?B?d1AzdE94UWkvVWRlWCtKM0NVRkZTWWtIeXlVTmZCdTZFQzFlbmpYNlBtUVll?=
 =?utf-8?B?dDNsUVZvbTdGUmRZYk5ZLzYzQVVZbmYwMFlYbU8yMnpSa2JrRjhyWW9ucy9K?=
 =?utf-8?B?dERNVGpFR2c3UVI4UWVKSnF0c1ZkYmpaRWFWaFE5dTdlOFcvR0REQnRtanpQ?=
 =?utf-8?B?THdjdXVXZDd0L2R3dGxMWDM5RFdsUzNEbGROSmFadnJ4WHhwcTUwVWgzajdh?=
 =?utf-8?B?S0xWcFFqU1ZZL01aOVpXaExFc2xhRzMzeC96WTFJdjNUV0kxNytZQlJxNUhk?=
 =?utf-8?B?YUhuN2RNaGgvMjlwVXFXZjd6RW5TQ1hLQTcrTk85VlVsSVN1bk1yYTR4V3p6?=
 =?utf-8?Q?kaSvl7DsNFyfzwYJ+y9B604kS?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5f72764e-b9ca-4750-8973-08dc851bba3a
X-MS-Exchange-CrossTenant-AuthSource: IA1PR12MB6460.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 04:55:31.7882
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lknLxl2gsmp5Jf+8fQu3NpSBlu7/jEhMAnhe1ERJIegBBF+9RjjFFpl59qIwMOOw/B0nFbmLvusM62rUBO8enQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4220

On 6/5/2024 5:05 AM, Michael Roth wrote:
> With commit 27bd5fdc24c0 ("KVM: SEV-ES: Prevent MSR access post VMSA
> encryption"), older VMMs like QEMU 9.0 and older will fail when booting
> SEV-ES guests with something like the following error:
> 
>    qemu-system-x86_64: error: failed to get MSR 0x174
>    qemu-system-x86_64: ../qemu.git/target/i386/kvm/kvm.c:3950: kvm_get_msrs: Assertion `ret == cpu->kvm_msr_buf->nmsrs' failed.
> 
> This is because older VMMs that might still call
> svm_get_msr()/svm_set_msr() for SEV-ES guests after guest boot even if
> those interfaces were essentially just noops because of the vCPU state
> being encrypted and stored separately in the VMSA. Now those VMMs will
> get an -EINVAL and generally crash.
> 
> Newer VMMs that are aware of KVM_SEV_INIT2 however are already aware of
> the stricter limitations of what vCPU state can be sync'd during
> guest run-time, so newer QEMU for instance will work both for legacy
> KVM_SEV_ES_INIT interface as well as KVM_SEV_INIT2.
> 
> So when using KVM_SEV_INIT2 it's okay to assume userspace can deal with
> -EINVAL, whereas for legacy KVM_SEV_ES_INIT the kernel might be dealing
> with either an older VMM and so it needs to assume that returning
> -EINVAL might break the VMM.
> 
> Address this by only returning -EINVAL if the guest was started with
> KVM_SEV_INIT2. Otherwise, just silently return.
> 
> Cc: Ravi Bangoria <ravi.bangoria@amd.com>
> Cc: Nikunj A Dadhania <nikunj@amd.com>
> Reported-by: Srikanth Aithal <sraithal@amd.com>
> Closes: https://lore.kernel.org/lkml/37usuu4yu4ok7be2hqexhmcyopluuiqj3k266z4gajc2rcj4yo@eujb23qc3zcm/
> Fixes: 27bd5fdc24c0 ("KVM: SEV-ES: Prevent MSR access post VMSA encryption")
> Signed-off-by: Michael Roth <michael.roth@amd.com>
> ---
>   arch/x86/kvm/svm/svm.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index b252a2732b6f..c58da281f14f 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -2855,7 +2855,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
>   
>   	if (sev_es_prevent_msr_access(vcpu, msr_info)) {
>   		msr_info->data = 0;
> -		return -EINVAL;
> +		return vcpu->kvm->arch.has_protected_state ? -EINVAL : 0;
>   	}
>   
>   	switch (msr_info->index) {
> @@ -3010,7 +3010,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
>   	u64 data = msr->data;
>   
>   	if (sev_es_prevent_msr_access(vcpu, msr))
> -		return -EINVAL;
> +		return vcpu->kvm->arch.has_protected_state ? -EINVAL : 0;
>   
>   	switch (ecx) {
>   	case MSR_AMD64_TSC_RATIO:

Tested this out with older version of VMM, issue reported is resolved 
with the patch.
Tested-by: Srikanth Aithal <sraithal@amd.com>