Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Message-ID: <80303130-e9bb-4b38-bb9a-7e611336946d@amd.com>
Date:   Wed, 6 Dec 2023 09:33:14 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] KVM: SEV: Fix handling of EFER_LMA bit when SEV-ES is
 enabled
Content-Language: en-US
To:     Michael Roth <michael.roth@amd.com>, kvm@vger.kernel.org
Cc:     Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        linux-kernel@vger.kernel.org
References: <20231205234956.1156210-1-michael.roth@amd.com>
From:   Tom Lendacky <thomas.lendacky@amd.com>
Autocrypt: addr=thomas.lendacky@amd.com; keydata=
 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
 1NhFSLKvfA==
In-Reply-To: <20231205234956.1156210-1-michael.roth@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NHRwd3d5M29vZi96eWtJQ2ozeUp2bkpWa01oR21yNTFJNk1uNXd5eElxSXhL?=
 =?utf-8?B?T2kxaXFtT2w3ckxPamt0Skh1eGFNRjNweU84V29jT005OWlIeFFvd2ZYV2tK?=
 =?utf-8?B?M1lqa1RrVGMwWG9KdjF0dE1YU25iOWl6VURyak94VXliNWpvbTh1YVVGVDcw?=
 =?utf-8?B?UE41MHlkSkJPendDNGhWdWhmQWIyVHpLYWJBeWxmSzhIczVRK1dxQ1NKT0d2?=
 =?utf-8?B?ZnZLQ0l0SHZ1dVJmcG96OHcwSkNlUllSVk0rbnVkVGFpVXBXb3BCVTFvd09y?=
 =?utf-8?B?eFN2bnpobFRJaXlicmpJTEs4a0krRXNPYjgrcDAwRGRVaTZaRm5nY1RtMGkz?=
 =?utf-8?B?NllDVUdUamFmSEUyNVIwQ09lcGtKZjJ6Q3h1SUlCbkoybTFucGd4aXJweUlD?=
 =?utf-8?B?WnpLTWRxOXNOb2gxQUZndndjTFpXaVVvT1Zka1pLVjNnR2pucDR0N25XMGs1?=
 =?utf-8?B?OWlHbDNnUU40YXhkTlBmWG5uMW1SaEFwTnhldGtOTWdXNzMwOVRhUVRNN2NT?=
 =?utf-8?B?bkltWm9aR1Y5TDFXUG85ZlRKbXJwVFp5Ukx6c0VCdWVVTkZlRFdaNU5nZUVN?=
 =?utf-8?B?WXhQT0YwbmhwUkQ0WUZXdnNCaDBzMG1pd3c2ZklDS0MrY01XUWVkZytXU01C?=
 =?utf-8?B?TDVSNDRFOCtjWXllTG9DUXVoTkdtOU5keXEwV0FybCtkY0N3NHRpeE5oQ3ZJ?=
 =?utf-8?B?Z3N1eUFxeGl2clduY0s5SW43TitPWHM1MitXUXczSjlsczM3M3ZualVyZGda?=
 =?utf-8?B?VmFTb1pCYXY3M0NTU0l3ZFYyRVNnUGd6UXBYeENrTnNEWllrOTFaS1Vpbjdx?=
 =?utf-8?B?MXR6N1cwVG1EVG9mcXFmS29ZbFVVZVkvYktWamVkNzZhOWx6MEczQitlWXVE?=
 =?utf-8?B?VmhkajNySU9wT1N1eUl1ZmFnalNza0hYMEt0amt2OEs0YUUvSXIzbUZHeTBq?=
 =?utf-8?B?cW0yS3Z4NmtBM3U1RkJReUdHbXNrWkZsWGo1VjZ5RXFVVE1ybWFDb0tpd1JD?=
 =?utf-8?B?YlBsNm1zTGxDK1h1SGwxb1ZxMjNvL3dnMzBtVHd6dCtaT3J2Z1o5V2NtVHZ3?=
 =?utf-8?B?QUxvV3d4cXRIV210TnV5SEc1QkxrRkxYT1A5NFhVRFRFUmIzUG5HaFlWSDZR?=
 =?utf-8?B?Z2Z2NU5hSkdFTlcrTXVpamo3dlhZQXQ2V08wYS9IU1liK294OGZaQzdrYVA0?=
 =?utf-8?B?ZHo5WUFlRmw5SG8yclllbzlvV3AzUHh6L3NpM0RtYTZ6NERSczFLaS8zRFUz?=
 =?utf-8?B?VlRHMXNvb1k4VjU4R1cxd0JaeGZqZ0QvVmxMdW9Kd1VYUHIwQS9WYzJRRWJr?=
 =?utf-8?B?eGZhMWsvNUM0d2MyeUZWbjU5TjlRWVZPcjA0cmo0UkRQaWpzZVpJcEdMdWJp?=
 =?utf-8?B?aWdHdWM4cHdBRkFING9vQ0hXclFiQm1Eb3ZtQlk3cGo4aS9xY01kQ2pRWUY5?=
 =?utf-8?B?Yktlc0hhUldyb3FQV05qNTNab00vK0xZcm5tS2tKaXpBU2JZMXdkM0FtOHF5?=
 =?utf-8?B?VmdUSWtkOGI1WUlvaXBOSGRDVVBicEV0dkQ0TWVlcjVab2UxRlV2RG56VnNK?=
 =?utf-8?B?eFNSNjZZalFWRWhXYmFWUUVFMlJGdFFENjVtc2tTWnhMbzFPM3J2aHFkS3NP?=
 =?utf-8?B?dVNNM3kzRld6eFhvODVsbnRLQzM5MHQzQ2hUM3pYOElWTS9SSmR3YXh2dXB3?=
 =?utf-8?B?TU5oc1U0c2JHNkh4NkF2U3FSRGFEU254R3FjQnBUTGFRSGtyaDhmUTBCeVhl?=
 =?utf-8?B?MDBIMjF4Q24ybVkzV0JPbjJBM0NILy9Pa1NmRHpFSGxKbitwMi9oUGdkVktE?=
 =?utf-8?B?NGFkWXFZN2JCaEJ3SkhlUWVUbG4zV2ZEdHE5NmVsSHg3dGJScjNrUFl6V29B?=
 =?utf-8?B?amxETXV5OVRwRm8vM01PTnVBVjdHRUlVNVMvaU1acUh1alFKTGpKNC85dFNU?=
 =?utf-8?B?VXI5TUxKaDFpZjN4bmxEbXVpZkZxMHJDOGtiNnVDdGg1d3k0a1lNeXRqRkM1?=
 =?utf-8?B?elh4QlFUbDNJaVBFdlkyTitrRUhwaTdMNjdMbG5HUFRHaXV5bHl2N3ovbTlv?=
 =?utf-8?B?ajcwb3RlcFVtOTBJUjlJWFFhc2RkbDlvQlZWQ3ljbE5DL0hNMkNLbE8wVjk3?=
 =?utf-8?Q?wFCFB1VQ2op4f5u+TOybDfrFn?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f17c42b-be00-4991-d0c9-08dbf670aa8b
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 15:33:16.3361
 (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: g5wxLVM87w6DYkJLTzJwUUWlEj0lTZJdaci6LyYbZx7oHuKVuS41PiFC+Lv1/dbxyCUyGElK4RjPTvGkvnz5dA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9201
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 06 Dec 2023 07:33:31 -0800 (PST)


On 12/5/23 17:49, Michael Roth wrote:
> In general, activating long mode involves setting the EFER_LME bit in
> the EFER register and then enabling the X86_CR0_PG bit in the CR0
> register. At this point, the EFER_LMA bit will be set automatically by
> hardware.
> 
> In the case of SVM/SEV guests where writes to CR0 are intercepted, it's
> necessary for the host to set EFER_LMA on behalf of the guest since
> hardware does not see the actual CR0 write.
> 
> In the case of SEV-ES guests where writes to CR0 are trapped instead of
> intercepted, the hardware *does* see/record the write to CR0 before
> exiting and passing the value on to the host, so as part of enabling
> SEV-ES support commit f1c6366e3043 ("KVM: SVM: Add required changes to
> support intercepts under SEV-ES") dropped special handling of the
> EFER_LMA bit with the understanding that it would be set automatically.

Maybe add here that it was thought that the change to EFER would generate 
a trap. However, a trap isn't generated for hardware changes to EFER and 
only explicit writes to EFER generate the trap.

Then the "However" can be dropped from the start of the next sentence.

> 
> However, since the guest never explicitly sets the EFER_LMA bit, the
> host never becomes aware that it has been set. This becomes problematic
> when userspace tries to get/set the EFER values via
> KVM_GET_SREGS/KVM_SET_SREGS, since the EFER contents tracked by the host
> will be missing the EFER_LMA bit, and when userspace attempts to pass
> the EFER value back via KVM_SET_SREGS it will fail a sanity check that
> asserts that EFER_LMA should always be set when X86_CR0_PG and EFER_LME
> are set.
> 
> Fix this by always inferring the value of EFER_LMA based on X86_CR0_PG
> and EFER_LME, regardless of whether or not SEV-ES is enabled.
> 
> Fixes: f1c6366e3043 ("KVM: SVM: Add required changes to support intercepts under SEV-ES")
> Suggested-by: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Sean Christopherson <seanjc@google.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: x86@kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Michael Roth <michael.roth@amd.com>

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
>   arch/x86/kvm/svm/svm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index 5d75a1732da4..b31d4f2deb66 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -1869,7 +1869,7 @@ void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
>   	bool old_paging = is_paging(vcpu);
>   
>   #ifdef CONFIG_X86_64
> -	if (vcpu->arch.efer & EFER_LME && !vcpu->arch.guest_state_protected) {
> +	if (vcpu->arch.efer & EFER_LME) {
>   		if (!is_paging(vcpu) && (cr0 & X86_CR0_PG)) {
>   			vcpu->arch.efer |= EFER_LMA;
>   			svm->vmcb->save.efer |= EFER_LMA | EFER_LME;