* [PATCH v2] KVM: VMX: Add 'else' to split mutually exclusive case
@ 2020-02-17 15:02 linmiaohe
2020-02-17 16:40 ` Vitaly Kuznetsov
2020-02-19 16:19 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: linmiaohe @ 2020-02-17 15:02 UTC (permalink / raw)
To: pbonzini, rkrcmar, sean.j.christopherson, vkuznets, wanpengli,
jmattson, joro, tglx, mingo, bp, hpa
Cc: linmiaohe, kvm, linux-kernel, x86
From: Miaohe Lin <linmiaohe@huawei.com>
Each if branch in handle_external_interrupt_irqoff() is mutually
exclusive. Add 'else' to make it clear and also avoid some unnecessary
check.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
v1->v2:
add braces to all if branches
---
arch/x86/kvm/vmx/vmx.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 9a6664886f2e..a13368b2719c 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6176,15 +6176,13 @@ static void handle_exception_nmi_irqoff(struct vcpu_vmx *vmx)
vmx->exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
/* if exit due to PF check for async PF */
- if (is_page_fault(vmx->exit_intr_info))
+ if (is_page_fault(vmx->exit_intr_info)) {
vmx->vcpu.arch.apf.host_apf_reason = kvm_read_and_reset_pf_reason();
-
/* Handle machine checks before interrupts are enabled */
- if (is_machine_check(vmx->exit_intr_info))
+ } else if (is_machine_check(vmx->exit_intr_info)) {
kvm_machine_check();
-
/* We need to handle NMIs before interrupts are enabled */
- if (is_nmi(vmx->exit_intr_info)) {
+ } else if (is_nmi(vmx->exit_intr_info)) {
kvm_before_interrupt(&vmx->vcpu);
asm("int $2");
kvm_after_interrupt(&vmx->vcpu);
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] KVM: VMX: Add 'else' to split mutually exclusive case
2020-02-17 15:02 [PATCH v2] KVM: VMX: Add 'else' to split mutually exclusive case linmiaohe
@ 2020-02-17 16:40 ` Vitaly Kuznetsov
2020-02-19 16:19 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Vitaly Kuznetsov @ 2020-02-17 16:40 UTC (permalink / raw)
To: linmiaohe
Cc: kvm, linux-kernel, x86, pbonzini, rkrcmar, sean.j.christopherson,
wanpengli, jmattson, joro, tglx, mingo, bp, hpa
linmiaohe <linmiaohe@huawei.com> writes:
> From: Miaohe Lin <linmiaohe@huawei.com>
>
> Each if branch in handle_external_interrupt_irqoff() is mutually
> exclusive. Add 'else' to make it clear and also avoid some unnecessary
> check.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> v1->v2:
> add braces to all if branches
> ---
> arch/x86/kvm/vmx/vmx.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 9a6664886f2e..a13368b2719c 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -6176,15 +6176,13 @@ static void handle_exception_nmi_irqoff(struct vcpu_vmx *vmx)
> vmx->exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
>
> /* if exit due to PF check for async PF */
> - if (is_page_fault(vmx->exit_intr_info))
> + if (is_page_fault(vmx->exit_intr_info)) {
> vmx->vcpu.arch.apf.host_apf_reason = kvm_read_and_reset_pf_reason();
> -
> /* Handle machine checks before interrupts are enabled */
> - if (is_machine_check(vmx->exit_intr_info))
> + } else if (is_machine_check(vmx->exit_intr_info)) {
> kvm_machine_check();
> -
> /* We need to handle NMIs before interrupts are enabled */
> - if (is_nmi(vmx->exit_intr_info)) {
> + } else if (is_nmi(vmx->exit_intr_info)) {
> kvm_before_interrupt(&vmx->vcpu);
> asm("int $2");
> kvm_after_interrupt(&vmx->vcpu);
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
--
Vitaly
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] KVM: VMX: Add 'else' to split mutually exclusive case
2020-02-17 15:02 [PATCH v2] KVM: VMX: Add 'else' to split mutually exclusive case linmiaohe
2020-02-17 16:40 ` Vitaly Kuznetsov
@ 2020-02-19 16:19 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2020-02-19 16:19 UTC (permalink / raw)
To: linmiaohe, rkrcmar, sean.j.christopherson, vkuznets, wanpengli,
jmattson, joro, tglx, mingo, bp, hpa
Cc: kvm, linux-kernel, x86
On 17/02/20 16:02, linmiaohe wrote:
> From: Miaohe Lin <linmiaohe@huawei.com>
>
> Each if branch in handle_external_interrupt_irqoff() is mutually
> exclusive. Add 'else' to make it clear and also avoid some unnecessary
> check.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> v1->v2:
> add braces to all if branches
> ---
> arch/x86/kvm/vmx/vmx.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 9a6664886f2e..a13368b2719c 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -6176,15 +6176,13 @@ static void handle_exception_nmi_irqoff(struct vcpu_vmx *vmx)
> vmx->exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
>
> /* if exit due to PF check for async PF */
> - if (is_page_fault(vmx->exit_intr_info))
> + if (is_page_fault(vmx->exit_intr_info)) {
> vmx->vcpu.arch.apf.host_apf_reason = kvm_read_and_reset_pf_reason();
> -
> /* Handle machine checks before interrupts are enabled */
> - if (is_machine_check(vmx->exit_intr_info))
> + } else if (is_machine_check(vmx->exit_intr_info)) {
> kvm_machine_check();
> -
> /* We need to handle NMIs before interrupts are enabled */
> - if (is_nmi(vmx->exit_intr_info)) {
> + } else if (is_nmi(vmx->exit_intr_info)) {
> kvm_before_interrupt(&vmx->vcpu);
> asm("int $2");
> kvm_after_interrupt(&vmx->vcpu);
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-19 16:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-17 15:02 [PATCH v2] KVM: VMX: Add 'else' to split mutually exclusive case linmiaohe
2020-02-17 16:40 ` Vitaly Kuznetsov
2020-02-19 16:19 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).