* [PATCH] KVM: apic: short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted
@ 2020-01-18 2:50 linmiaohe
2020-01-20 10:33 ` Vitaly Kuznetsov
0 siblings, 1 reply; 2+ messages in thread
From: linmiaohe @ 2020-01-18 2:50 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>
Short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted, there
is no need to proceed further. Also remove unnecessary var r.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
arch/x86/kvm/lapic.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 679692b55f6d..502c7b0d8fdb 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -2370,14 +2370,13 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu)
int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu)
{
u32 lvt0 = kvm_lapic_get_reg(vcpu->arch.apic, APIC_LVT0);
- int r = 0;
if (!kvm_apic_hw_enabled(vcpu->arch.apic))
- r = 1;
+ return 1;
if ((lvt0 & APIC_LVT_MASKED) == 0 &&
GET_APIC_DELIVERY_MODE(lvt0) == APIC_MODE_EXTINT)
- r = 1;
- return r;
+ return 1;
+ return 0;
}
void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu)
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: apic: short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted
2020-01-18 2:50 [PATCH] KVM: apic: short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted linmiaohe
@ 2020-01-20 10:33 ` Vitaly Kuznetsov
0 siblings, 0 replies; 2+ messages in thread
From: Vitaly Kuznetsov @ 2020-01-20 10:33 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>
>
> Short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted, there
> is no need to proceed further. Also remove unnecessary var r.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> arch/x86/kvm/lapic.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 679692b55f6d..502c7b0d8fdb 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2370,14 +2370,13 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu)
> int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu)
> {
> u32 lvt0 = kvm_lapic_get_reg(vcpu->arch.apic, APIC_LVT0);
> - int r = 0;
>
> if (!kvm_apic_hw_enabled(vcpu->arch.apic))
> - r = 1;
> + return 1;
> if ((lvt0 & APIC_LVT_MASKED) == 0 &&
> GET_APIC_DELIVERY_MODE(lvt0) == APIC_MODE_EXTINT)
> - r = 1;
> - return r;
> + return 1;
> + return 0;
> }
>
> void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu)
My eyes would've appreciated a blank line after each "return 1;" but you
patch makes the code a bit nicer anyway, thanks.
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
--
Vitaly
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-20 10:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-18 2:50 [PATCH] KVM: apic: short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted linmiaohe
2020-01-20 10:33 ` Vitaly Kuznetsov
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).