Received-SPF: pass (google.com: domain of linux-kernel+bounces-99739-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <b464d076-e146-4bb0-8cf2-3159b9928da3@intel.com>
Date: Tue, 12 Mar 2024 14:43:07 +1300
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 09/21] KVM: VMX: Modify NMI and INTR handlers to take
 intr_info as function argument
Content-Language: en-US
To: Paolo Bonzini <pbonzini@redhat.com>, <linux-kernel@vger.kernel.org>,
	<kvm@vger.kernel.org>
CC: <seanjc@google.com>, <michael.roth@amd.com>, <isaku.yamahata@intel.com>,
	<thomas.lendacky@amd.com>
References: <20240227232100.478238-1-pbonzini@redhat.com>
 <20240227232100.478238-10-pbonzini@redhat.com>
From: "Huang, Kai" <kai.huang@intel.com>
In-Reply-To: <20240227232100.478238-10-pbonzini@redhat.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?V3dGSWI0MjBTcS9IMURUdFlBTXZNYXh0ckFwdGhCM1ZjMk5OMmdyeUF1QUEz?=
 =?utf-8?B?WFc4Sm8reitGNHVDMFVrQmgwemlDZ2syUDkybkwvZXdkdzkzMmNDNWpnT3hZ?=
 =?utf-8?B?N0JPcTBQNHl6T2wzQlRJK2pSbUdVNVNmdTJWYWpHMWVDelVjZkk1TGxValo2?=
 =?utf-8?B?QlFQaUxsS3lXOUNrVWpiZDgvRmU3VUtUL1ErVXFRVXl4dXRWL1JZUGoxQVdu?=
 =?utf-8?B?bDBvVHRpbkZxYVdhT3lkUnFlWDB4cHo0WmlkdVpqWTdFb3FqR2NZV3JWR094?=
 =?utf-8?B?d0ZkbnBsWTkyYzR0bVlkZnh0dGVGZzNsWHE5b1p1VEVwK1AxMi9ZZGNIaURK?=
 =?utf-8?B?T0k0bmtLUHo2aXpQeEplaTFFMG56VU1jZ2NrYXlZdWQrUEwzMnpqTUppYWdQ?=
 =?utf-8?B?eVNmeGxuUWhkUlRhL3BHZFFBcHNROGNWbDQyc3FVUjFaM2J1bVdDTVpxN01U?=
 =?utf-8?B?SG1xZjFkNFZHMDhnQ3lwTk44Rkp1MVNUdnpoQ1BZTXNvNUM0VTFkYnVEbnU5?=
 =?utf-8?B?UzhsTFJNRDh5dmV3bGNLMmR2MlpvOUY2RjNEL0owMHBZQVV3T2Mxc3lqZEJK?=
 =?utf-8?B?aEJmK1dLQ2cwZ01WYVJzdU14MVhnVTNvdHAzQ09zMjJvWktEVXVkM0xyNkha?=
 =?utf-8?B?aFg0eUdsUk5mUld2ZXFWWm82TnpJS3RtU3I3QVZEcnBDQzRmOFp6cmJGWUpU?=
 =?utf-8?B?MW1uTEtTM1dBK1NmbTNRNkdScVl6ZXNQaEMwb1pvdEwreHcrdC9nRVFZS1hF?=
 =?utf-8?B?enFkNHdZZHpJWWVIODk3d1FYOEcwNHFVeVZjanBveWwrM3FPLzlkYzFVbG1y?=
 =?utf-8?B?L0FxSUtUN2hZUjZKck1Ic1dYTEhwbGF2WjY5dHlEZlN3a3AwdEFQTWlHZWE4?=
 =?utf-8?B?ZlhRZ3VNTi9iYXZyT3Vqd3dGTG9Hak9lZWFybm9vYVh1REYreGI4dDhVeldX?=
 =?utf-8?B?ZExrRi93Z0FKcXVQYnhLN0ZuTTJ6ektZSW1DODg5WmN5Q04xRDZ1MUZSRlgx?=
 =?utf-8?B?VzRwMDV4U09aelY4b0JkbGxRc3pVS1Q0Y1A5akptN1o2bVFiYkJQbi9OMTdm?=
 =?utf-8?B?RTgxa2YzS00xR2o4MGpXcjZoUkhmM0RKVG04R2JYYmVIM1VSM1BIVXc5cHVw?=
 =?utf-8?B?RlZiRGxsZDRRbFc5ZU1rNWhucUd4WnhwZ2NHdTE3RUJkbDlDUG1hOUhsYjlm?=
 =?utf-8?B?UEFSaWpYUXNyK01DRlRFR1kzTGdmSUJaaEptUUhxZ0ZLQ21hVFM5UU5uNGJq?=
 =?utf-8?B?RkwzUmc0cW9YSWtIdGk0cDJjTEI3bXZmekVvZE9MYThSaksyZXNXMElOTGtV?=
 =?utf-8?B?WlY3UUNPd0x5Tk1LZGhVQkQyTXFWUWVnSmQxdGQ5dUdWWjFOY1NFZDNsbWpO?=
 =?utf-8?B?bUdZK0dHbmdOaEphK3hjS3VPMnFnNXovM0Z6RlQ5WkFJK2RRSGRGcFlENjh1?=
 =?utf-8?B?V3d6Z3BUYkI4eHpIOVlqeE9vc25vQjdiYlJxOWE0cE95WlhrRTJiZlFKV09S?=
 =?utf-8?B?azZ2Y2Zrb2YvcVUzZFA0bUg3T2I1Z2pSdXJaZWJMUEgwek1yNUNFMmdIME9I?=
 =?utf-8?B?OTVRN2s5blBjaENMUi9yajY1bDM5UGZxUXprb3RzRS9nZ0hnZjVOZDFuV3NR?=
 =?utf-8?B?WnFYVWQ0K3JZN2dOd25TM1MyQmhFbW5taXRrb2VoSG1SMG5EYWlxQVlHUHF6?=
 =?utf-8?B?RUFnS1pkTm9xb0U3dnlCMlJHbTgyZEYvdzZRWUZoMFh6TXlmRDdpZUpDMTdp?=
 =?utf-8?B?MlpWMkRuVVM4ek11Zm1oVXF1ZnZmcnJFLzFUb3NnZmdRbWJpWXgwWWhKcjZt?=
 =?utf-8?B?UXcrY2h6RXVQR3NMN2I3a0NFSzk2ZTRuQUVzbTNjMWRhN01yWldpdFhpMCta?=
 =?utf-8?B?MkZNQUNVS0h6alI4M2VoNGtQSUxFai9DRGhPNnpDMXV2bmVpcFlMbGZlUEN6?=
 =?utf-8?B?cU0xdGdCQnZ1UURQL2Iwb2o5OXVOQlFDL2lCaHFOTUdsNEhPME9QdkR5Mzhj?=
 =?utf-8?B?eFkwUzRGbVhoU2V4TlpZVU1ETjRFcXlEZWp2TGVId2R1dDV4UFFXK3FJMmds?=
 =?utf-8?B?MjdvY0pvTVpxWDNrNG55cFd3SitxNFJpcElFUjd2dFR4UTlmVWxna2U3RENl?=
 =?utf-8?Q?Yi/MlXGGTrM8Q5tNNO1dIhLN/?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d6fb719b-b4de-49e4-e982-08dc4235c9a6
X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5978.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 01:43:16.5635
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: KLnVhFDyGji+Ln8XCiGxe13/tM5AGth8nyKG2vmn/QoBxZITvx0A7oS9f5jY2Sgkhu8Ge967xFnGRG5U8i8/4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4950
X-OriginatorOrg: intel.com


On 28/02/2024 12:20 pm, Paolo Bonzini wrote:
> From: Sean Christopherson <seanjc@google.com>
> 
> TDX uses different ABI to get information about VM exit.  Pass intr_info to
> the NMI and INTR handlers instead of pulling it from vcpu_vmx in
> preparation for sharing the bulk of the handlers with TDX.
> 
> When the guest TD exits to VMM, RAX holds status and exit reason, RCX holds
> exit qualification etc rather than the VMCS fields because VMM doesn't have
> access to the VMCS.  

IMHO this can be simpler:

TDX conveys VM exit information via GPRs while normal VMX does via VMCS 
fields.

The eventual code will be
> 
> VMX:
>    - get exit reason, intr_info, exit_qualification, and etc from VMCS
>    - call NMI/INTR handlers (common code)
> 
> TDX:
>    - get exit reason, intr_info, exit_qualification, and etc from guest
>      registers
>    - call NMI/INTR handlers (common code)

It's kinda nicer to mention why to change handle_exception_irqoff()'s 
first argument from @vmx to @vcpu.

Anyway, doesn't matter ...

> 
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Message-Id: <0396a9ae70d293c9d0b060349dae385a8a4fbcec.1705965635.git.isaku.yamahata@intel.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

.. Acked-by: Kai Huang <kai.huang@intel.com>

> ---
>   arch/x86/kvm/vmx/vmx.c | 16 +++++++---------
>   1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 3d8a7e4c8e37..8aedfe0fd78c 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -7000,24 +7000,22 @@ static void handle_nm_fault_irqoff(struct kvm_vcpu *vcpu)
>   		rdmsrl(MSR_IA32_XFD_ERR, vcpu->arch.guest_fpu.xfd_err);
>   }
>   
> -static void handle_exception_irqoff(struct vcpu_vmx *vmx)
> +static void handle_exception_irqoff(struct kvm_vcpu *vcpu, u32 intr_info)
>   {
> -	u32 intr_info = vmx_get_intr_info(&vmx->vcpu);
> -
>   	/* if exit due to PF check for async PF */
>   	if (is_page_fault(intr_info))
> -		vmx->vcpu.arch.apf.host_apf_flags = kvm_read_and_reset_apf_flags();
> +		vcpu->arch.apf.host_apf_flags = kvm_read_and_reset_apf_flags();
>   	/* if exit due to NM, handle before interrupts are enabled */
>   	else if (is_nm_fault(intr_info))
> -		handle_nm_fault_irqoff(&vmx->vcpu);
> +		handle_nm_fault_irqoff(vcpu);
>   	/* Handle machine checks before interrupts are enabled */
>   	else if (is_machine_check(intr_info))
>   		kvm_machine_check();
>   }
>   
> -static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu)
> +static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu,
> +					     u32 intr_info)
>   {
> -	u32 intr_info = vmx_get_intr_info(vcpu);
>   	unsigned int vector = intr_info & INTR_INFO_VECTOR_MASK;
>   	gate_desc *desc = (gate_desc *)host_idt_base + vector;
>   
> @@ -7040,9 +7038,9 @@ void vmx_handle_exit_irqoff(struct kvm_vcpu *vcpu)
>   		return;
>   
>   	if (vmx->exit_reason.basic == EXIT_REASON_EXTERNAL_INTERRUPT)
> -		handle_external_interrupt_irqoff(vcpu);
> +		handle_external_interrupt_irqoff(vcpu, vmx_get_intr_info(vcpu));
>   	else if (vmx->exit_reason.basic == EXIT_REASON_EXCEPTION_NMI)
> -		handle_exception_irqoff(vmx);
> +		handle_exception_irqoff(vcpu, vmx_get_intr_info(vcpu));
>   }
>   
>   /*