Received-SPF: pass (google.com: domain of linux-kernel+bounces-195480-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <562819b0-2c8a-1344-6090-01f8cdca107e@amd.com>
Date: Thu, 30 May 2024 09:03:37 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [PATCH v3 3/3] KVM: SEV-ES: Fix LBRV code
Content-Language: en-US
To: Ravi Bangoria <ravi.bangoria@amd.com>, seanjc@google.com,
 pbonzini@redhat.com, nikunj.dadhania@amd.com
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
 dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
 michael.roth@amd.com, pankaj.gupta@amd.com, kvm@vger.kernel.org,
 linux-kernel@vger.kernel.org, santosh.shukla@amd.com
References: <20240523121828.808-1-ravi.bangoria@amd.com>
 <20240523121828.808-4-ravi.bangoria@amd.com>
From: Tom Lendacky <thomas.lendacky@amd.com>
In-Reply-To: <20240523121828.808-4-ravi.bangoria@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?WEJRVi9PcDg4UWprVG5XRGcrUElIK2xVWlc0UEpCTzh0bzJxUTJIQVZVdW1L?=
 =?utf-8?B?c2pBanhRRzc0R21mNWszemhiTk5KQVFnczdLS3JDSFBHdVBheU9ubHVSc3lz?=
 =?utf-8?B?dHVXNFVMNlQ4MmpEY01xM096d0hEQ2NpQzFMTmFEOForUlpLOG9CdTA5bVdy?=
 =?utf-8?B?aEhsK3hTS0hFbGE4MlU3VXBYNGhNRHlrbEdlTEJoWGtwQzl1aUlRaEdrRmxI?=
 =?utf-8?B?V2dlckxQTWpwMnlsKzB1VkdPc0lNVlYwQXRtVUJOUUpiQXZmc094N0RidWdL?=
 =?utf-8?B?NVVHVFZoNGcwUUJOa25XSG5sOUhlbFJPbGhZSmtqSHFwTzErblY0enZyUThZ?=
 =?utf-8?B?YTI1a3JoNWMzRloyai85NlVCZ0xzT24yU1phdmgvY0NYVkY2WjVSL1BBd1Ja?=
 =?utf-8?B?dXZObEx0N2lxcW1GZ0ErUXNmS1dxWHVpK0xoYUdicldRRVpWU3RRZVh0anlT?=
 =?utf-8?B?L3RkOHZMcll6UFZRUFhhRS9BTGg2bmNnOW9IdFRYVjhtaVBMV3ZRbHMwZzJs?=
 =?utf-8?B?REVjY3pjZ1ZHWEdvQVZxSXlsR1VKQXVMcEZYS01WUUhqTDlwcDdoQVdxTUtQ?=
 =?utf-8?B?c3diYlBQSUpUeDIyOXY2WlpjOGVMdGc0ZjloamgzeGtJVFJQeG00eURZZ1Y2?=
 =?utf-8?B?RnhQMURwWHdORjFqT0tXV0EzTy9FR3RKYmI4YjBoUFdMZ1YwN2l2b0diM3pt?=
 =?utf-8?B?ZThNZjlKTk5kdWRtNWlZTnFEMFRrOXAyODJLWE5qOW5mdkFmQXB1d3UvNGdV?=
 =?utf-8?B?QjRObnByTnk5SUlsRlhxV21qQjFaWWd5cFRPbXYwMDBhV2I5emF5R1N5ckJK?=
 =?utf-8?B?WWZOb1RBb1doeUl2WmtFU003YjRiL2FXV2hPK0toUXJxQysrL0dDQWt4VXBl?=
 =?utf-8?B?NXVCNW5kZEJBZTdPMTBSbit4QTR6VlYwK1JwTk9wZVZHRlZYYzZnUFArZitj?=
 =?utf-8?B?RjlteXl0SGZUbW9nWTNVNjNQdGVvTFVpZmZxZDJhT0hOd29IaDFnZzdHZEJS?=
 =?utf-8?B?UHlUTUJvK3o0aWxNN3cvaTdWREphU1NXK2h5emwwWU9GR2FzNGRxbjkyRlhH?=
 =?utf-8?B?THkwMm5VMExKMDBPQ1piWFB0UkZYTmJkSUpOeitSdkxLYkpHSk0wS1FKQ2Jw?=
 =?utf-8?B?bmlHaitLbnNxd1FKUDcrU3A0REZCY2cyZk5yRTNDSERNTXVHd3RBSWkrcncv?=
 =?utf-8?B?UlhaSW1mVE8wd0pxVEt5MjQ4alJETndzS25XYnVYaEMwL1ZDTG1FSStsRWw4?=
 =?utf-8?B?Q2xwSmdBSzc0Z2Y4V3RWWlBWRnFzV2FpK0s1cUZBZnlXV29zWVhNcmFiMy9H?=
 =?utf-8?B?OEtrb3dTZ0hqNTZxZC9rK296QVJZbmk2YVlQR1k4Q1M1YVdOR25KTmZYSWNG?=
 =?utf-8?B?a0M0VUhCc3MyQk1lemFYaWMvREhlWStQYXUydk9CZ1lNNmg3cHF6VDFycFJ2?=
 =?utf-8?B?YWoycVM0MlhMaWVCQnVNZWprK09aYlJTb2NzdWlDdVZodm0rNFBselFhdWlW?=
 =?utf-8?B?SjhYendRK2RZUkh3eXZ4VTB3WlJuazhkaE5lSzFYbHdKcUx2N1ZGTmxjcThl?=
 =?utf-8?B?Z09pckgxTXpZSHZLN0hISjFUU25tL0daUFZQcUdBTS9FakxJQ0I2cTdTOTZC?=
 =?utf-8?B?eVE5QXZYRG1vT2FqWksyQkxOd1ZiazAyakY4VXRVU3BFUWx3Zzc4UVQrTTFW?=
 =?utf-8?B?b2NMMm1BbnlHQzVpWHJxK0NwRnpsNjhqbVRQOGxHY0pPZHNncDJ3bkVxbGVv?=
 =?utf-8?B?eStjZVYxQXpIR0hUaTNlQ1R2Sk5aNWhSbDNGMmpxanBGWXNOTHdRS1U0VWhN?=
 =?utf-8?B?MkdnZjAvaVYybkwyN1Z5ek9kQ1pxMFBtd0R3ZEQvU2dmeW12dU9wclkvWUd0?=
 =?utf-8?B?ejhrT29GcTRROXJlK1hONnNFejY5QjlZcjRRNXFXbHAxOE83OWp1TjFMMHpq?=
 =?utf-8?B?Q3phZHFaOHBUdkt0ZUNSdWgwWndma2xhUWR2K0pTTzBzMVkwNzA0VWxBNjdQ?=
 =?utf-8?B?bmZsSURDVXR3R3pXSm9mdUxEdUgvdnB0dlpHNFpmZWhQR1NURlZEY3FIek04?=
 =?utf-8?B?b0pjeUFZR01SblhXWlhDdGJFb3pqaUJrSEo2ek55SjFtU0Fycll4dFBYazhw?=
 =?utf-8?Q?g33KCzOsI81HW/VHs38bEM+Fu?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f503711-d415-4798-9418-08dc80b14e82
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 14:03:40.1090
 (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: bNPyu6yva6gcrNxqwl2DwhM3inIIaktTTRFXcjglXPHS508H73850KFpVt85mWZ2915SYlL/p+8Gl26K0o1/yQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9124

On 5/23/24 07:18, Ravi Bangoria wrote:
> As documented in APM[1], LBR Virtualization must be enabled for SEV-ES
> guests. Although KVM currently enforces LBRV for SEV-ES guests, there
> are multiple issues with it:
> 
> o MSR_IA32_DEBUGCTLMSR is still intercepted. Since MSR_IA32_DEBUGCTLMSR
>    interception is used to dynamically toggle LBRV for performance reasons,
>    this can be fatal for SEV-ES guests. For ex SEV-ES guest on Zen3:
> 
>    [guest ~]# wrmsr 0x1d9 0x4
>    KVM: entry failed, hardware error 0xffffffff
>    EAX=00000004 EBX=00000000 ECX=000001d9 EDX=00000000
> 
>    Fix this by never intercepting MSR_IA32_DEBUGCTLMSR for SEV-ES guests.
>    No additional save/restore logic is required since MSR_IA32_DEBUGCTLMSR
>    is of swap type A.
> 
> o KVM will disable LBRV if userspace sets MSR_IA32_DEBUGCTLMSR before the
>    VMSA is encrypted. Fix this by moving LBRV enablement code post VMSA
>    encryption.
> 
> [1]: AMD64 Architecture Programmer's Manual Pub. 40332, Rev. 4.07 - June
>       2023, Vol 2, 15.35.2 Enabling SEV-ES.
>       https://bugzilla.kernel.org/attachment.cgi?id=304653
> 
> Co-developed-by: Nikunj A Dadhania <nikunj@amd.com>
> Signed-off-by: Nikunj A Dadhania <nikunj@amd.com>
> Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com>

Should this have a Fixes: tag, too?

Thanks,
Tom

> ---
>   arch/x86/kvm/svm/sev.c | 13 ++++++++-----
>   arch/x86/kvm/svm/svm.c |  8 +++++++-
>   arch/x86/kvm/svm/svm.h |  3 ++-
>   3 files changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index 1a2bde579727..3f0c3dbce0c5 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -851,6 +851,14 @@ static int __sev_launch_update_vmsa(struct kvm *kvm, struct kvm_vcpu *vcpu,
>   	 */
>   	fpstate_set_confidential(&vcpu->arch.guest_fpu);
>   	vcpu->arch.guest_state_protected = true;
> +
> +	/*
> +	 * SEV-ES guest mandates LBR Virtualization to be _always_ ON. Enable it
> +	 * only after setting guest_state_protected because KVM_SET_MSRS allows
> +	 * dynamic toggling of LBRV (for performance reason) on write access to
> +	 * MSR_IA32_DEBUGCTLMSR when guest_state_protected is not set.
> +	 */
> +	svm_enable_lbrv(vcpu);
>   	return 0;
>   }
>   
> @@ -4279,7 +4287,6 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
>   	struct kvm_vcpu *vcpu = &svm->vcpu;
>   
>   	svm->vmcb->control.nested_ctl |= SVM_NESTED_CTL_SEV_ES_ENABLE;
> -	svm->vmcb->control.virt_ext |= LBR_CTL_ENABLE_MASK;
>   
>   	/*
>   	 * An SEV-ES guest requires a VMSA area that is a separate from the
> @@ -4331,10 +4338,6 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
>   	/* Clear intercepts on selected MSRs */
>   	set_msr_interception(vcpu, svm->msrpm, MSR_EFER, 1, 1);
>   	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_CR_PAT, 1, 1);
> -	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTBRANCHFROMIP, 1, 1);
> -	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTBRANCHTOIP, 1, 1);
> -	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTINTFROMIP, 1, 1);
> -	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTINTTOIP, 1, 1);
>   }
>   
>   void sev_init_vmcb(struct vcpu_svm *svm)
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index dcb5eb00a4f5..011e8e6c5c53 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -99,6 +99,7 @@ static const struct svm_direct_access_msrs {
>   	{ .index = MSR_IA32_SPEC_CTRL,			.always = false },
>   	{ .index = MSR_IA32_PRED_CMD,			.always = false },
>   	{ .index = MSR_IA32_FLUSH_CMD,			.always = false },
> +	{ .index = MSR_IA32_DEBUGCTLMSR,		.always = false },
>   	{ .index = MSR_IA32_LASTBRANCHFROMIP,		.always = false },
>   	{ .index = MSR_IA32_LASTBRANCHTOIP,		.always = false },
>   	{ .index = MSR_IA32_LASTINTFROMIP,		.always = false },
> @@ -990,7 +991,7 @@ void svm_copy_lbrs(struct vmcb *to_vmcb, struct vmcb *from_vmcb)
>   	vmcb_mark_dirty(to_vmcb, VMCB_LBR);
>   }
>   
> -static void svm_enable_lbrv(struct kvm_vcpu *vcpu)
> +void svm_enable_lbrv(struct kvm_vcpu *vcpu)
>   {
>   	struct vcpu_svm *svm = to_svm(vcpu);
>   
> @@ -1000,6 +1001,9 @@ static void svm_enable_lbrv(struct kvm_vcpu *vcpu)
>   	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTINTFROMIP, 1, 1);
>   	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTINTTOIP, 1, 1);
>   
> +	if (sev_es_guest(vcpu->kvm))
> +		set_msr_interception(vcpu, svm->msrpm, MSR_IA32_DEBUGCTLMSR, 1, 1);
> +
>   	/* Move the LBR msrs to the vmcb02 so that the guest can see them. */
>   	if (is_guest_mode(vcpu))
>   		svm_copy_lbrs(svm->vmcb, svm->vmcb01.ptr);
> @@ -1009,6 +1013,8 @@ static void svm_disable_lbrv(struct kvm_vcpu *vcpu)
>   {
>   	struct vcpu_svm *svm = to_svm(vcpu);
>   
> +	KVM_BUG_ON(sev_es_guest(vcpu->kvm), vcpu->kvm);
> +
>   	svm->vmcb->control.virt_ext &= ~LBR_CTL_ENABLE_MASK;
>   	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTBRANCHFROMIP, 0, 0);
>   	set_msr_interception(vcpu, svm->msrpm, MSR_IA32_LASTBRANCHTOIP, 0, 0);
> diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
> index 2d7fd09c08c9..c483d7149420 100644
> --- a/arch/x86/kvm/svm/svm.h
> +++ b/arch/x86/kvm/svm/svm.h
> @@ -30,7 +30,7 @@
>   #define	IOPM_SIZE PAGE_SIZE * 3
>   #define	MSRPM_SIZE PAGE_SIZE * 2
>   
> -#define MAX_DIRECT_ACCESS_MSRS	47
> +#define MAX_DIRECT_ACCESS_MSRS	48
>   #define MSRPM_OFFSETS	32
>   extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly;
>   extern bool npt_enabled;
> @@ -582,6 +582,7 @@ u32 *svm_vcpu_alloc_msrpm(void);
>   void svm_vcpu_init_msrpm(struct kvm_vcpu *vcpu, u32 *msrpm);
>   void svm_vcpu_free_msrpm(u32 *msrpm);
>   void svm_copy_lbrs(struct vmcb *to_vmcb, struct vmcb *from_vmcb);
> +void svm_enable_lbrv(struct kvm_vcpu *vcpu);
>   void svm_update_lbrv(struct kvm_vcpu *vcpu);
>   
>   int svm_set_efer(struct kvm_vcpu *vcpu, u64 efer);