KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter

Some counters are added in Commit 6e0365b78273 ("KVM: PPC: Book3S HV:
Add ICP real mode counters"), to provide some performance statistics to
determine whether further optimizing is needed for real mode functions.

The n_reject counter counts how many times ICP rejects an irq because of
priority in real mode. The redelivery of an lsi that is still asserted
after eoi doesn't fall into this category, so the increasement there is
removed.

Also, it needs to be increased in icp_rm_deliver_irq() if it rejects
another one.

Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c
index 06edc436663916ceacd8a88866342d0b856d7f57..9f6c8fe88db6823f2f724d629519a83cda0d412b 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@ -380,6 +380,7 @@ static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
                 */
                if (reject && reject != XICS_IPI) {
                        arch_spin_unlock(&ics->lock);
+                       icp->n_reject++;
                        new_irq = reject;
                        goto again;
                }
@@ -711,10 +712,8 @@ int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)
        state = &ics->irq_state[src];
 
        /* Still asserted, resend it */
-       if (state->asserted) {
-               icp->n_reject++;
+       if (state->asserted)
                icp_rm_deliver_irq(xics, icp, irq);
-       }
 
        if (!hlist_empty(&vcpu->kvm->irq_ack_notifier_list)) {
                icp->rm_action |= XICS_RM_NOTIFY_EOI;