Commit 98983675 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Michael Ellerman
Browse files

KVM: PPC: Book3S HV: XIVE: Show detailed configuration in debug output 



This is useful to track allocation of the HW resources on per guest
basis. Making sure IPIs are local to the chip of the vCPUs reduces
rerouting between interrupt controllers and gives better performance
in case of pinning. Checking the distribution of VP structures on the
chips also helps in reducing PowerBUS traffic.

[ clg: resurrected show_sources and reworked ouput ]

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201210171450.1933725-2-clg@kaod.org
parent 0be47634

arch/powerpc/kvm/book3s_xive.c

+63 −13
Original line number Diff line number Diff line
@@ -2128,9 +2128,8 @@ int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcpu) 
		if (!q->qpage && !xc->esc_virq[i])

			continue;



		seq_printf(m, " [q%d]: ", i);



		if (q->qpage) {

			seq_printf(m, "    q[%d]: ", i);

			idx = q->idx;

			i0 = be32_to_cpup(q->qpage + idx);

			idx = (idx + 1) & q->msk;
@@ -2144,16 +2143,54 @@ int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcpu) 
				irq_data_get_irq_handler_data(d);

			u64 pq = xive_vm_esb_load(xd, XIVE_ESB_GET);



			seq_printf(m, "E:%c%c I(%d:%llx:%llx)",

				   (pq & XIVE_ESB_VAL_P) ? 'P' : 'p',

				   (pq & XIVE_ESB_VAL_Q) ? 'Q' : 'q',

				   xc->esc_virq[i], pq, xd->eoi_page);

			seq_printf(m, "    ESC %d %c%c EOI @%llx",

				   xc->esc_virq[i],

				   (pq & XIVE_ESB_VAL_P) ? 'P' : '-',

				   (pq & XIVE_ESB_VAL_Q) ? 'Q' : '-',

				   xd->eoi_page);

			seq_puts(m, "\n");

		}

	}

	return 0;

}



void kvmppc_xive_debug_show_sources(struct seq_file *m,

				    struct kvmppc_xive_src_block *sb)

{

	int i;



	seq_puts(m, "    LISN      HW/CHIP   TYPE    PQ      EISN    CPU/PRIO\n");

	for (i = 0; i < KVMPPC_XICS_IRQ_PER_ICS; i++) {

		struct kvmppc_xive_irq_state *state = &sb->irq_state[i];

		struct xive_irq_data *xd;

		u64 pq;

		u32 hw_num;



		if (!state->valid)

			continue;



		kvmppc_xive_select_irq(state, &hw_num, &xd);



		pq = xive_vm_esb_load(xd, XIVE_ESB_GET);



		seq_printf(m, "%08x  %08x/%02x", state->number, hw_num,

			   xd->src_chip);

		if (state->lsi)

			seq_printf(m, " %cLSI", state->asserted ? '^' : ' ');

		else

			seq_puts(m, "  MSI");



		seq_printf(m, " %s  %c%c  %08x   % 4d/%d",

			   state->ipi_number == hw_num ? "IPI" : " PT",

			   pq & XIVE_ESB_VAL_P ? 'P' : '-',

			   pq & XIVE_ESB_VAL_Q ? 'Q' : '-',

			   state->eisn, state->act_server,

			   state->act_priority);



		seq_puts(m, "\n");

	}

}



static int xive_debug_show(struct seq_file *m, void *private)

{

	struct kvmppc_xive *xive = m->private;
@@ -2174,7 +2211,7 @@ static int xive_debug_show(struct seq_file *m, void *private) 
	if (!kvm)

		return 0;



	seq_printf(m, "=========\nVCPU state\n=========\n");

	seq_puts(m, "=========\nVCPU state\n=========\n");



	kvm_for_each_vcpu(i, vcpu, kvm) {

		struct kvmppc_xive_vcpu *xc = vcpu->arch.xive_vcpu;
@@ -2182,9 +2219,10 @@ static int xive_debug_show(struct seq_file *m, void *private) 
		if (!xc)

			continue;



		seq_printf(m, "cpu server %#x VP:%#x CPPR:%#x HWCPPR:%#x"

			   " MFRR:%#x PEND:%#x h_xirr: R=%lld V=%lld\n",

			   xc->server_num, xc->vp_id, xc->cppr, xc->hw_cppr,

		seq_printf(m, "VCPU %d: VP:%#x/%02x\n"

			 "    CPPR:%#x HWCPPR:%#x MFRR:%#x PEND:%#x h_xirr: R=%lld V=%lld\n",

			 xc->server_num, xc->vp_id, xc->vp_chip_id,

			 xc->cppr, xc->hw_cppr,

			 xc->mfrr, xc->pending,

			 xc->stat_rm_h_xirr, xc->stat_vm_h_xirr);
@@ -2202,13 +2240,25 @@ static int xive_debug_show(struct seq_file *m, void *private) 
		t_vm_h_ipi += xc->stat_vm_h_ipi;

	}



	seq_printf(m, "Hcalls totals\n");

	seq_puts(m, "Hcalls totals\n");

	seq_printf(m, " H_XIRR  R=%10lld V=%10lld\n", t_rm_h_xirr, t_vm_h_xirr);

	seq_printf(m, " H_IPOLL R=%10lld V=%10lld\n", t_rm_h_ipoll, t_vm_h_ipoll);

	seq_printf(m, " H_CPPR  R=%10lld V=%10lld\n", t_rm_h_cppr, t_vm_h_cppr);

	seq_printf(m, " H_EOI   R=%10lld V=%10lld\n", t_rm_h_eoi, t_vm_h_eoi);

	seq_printf(m, " H_IPI   R=%10lld V=%10lld\n", t_rm_h_ipi, t_vm_h_ipi);



	seq_puts(m, "=========\nSources\n=========\n");



	for (i = 0; i <= xive->max_sbid; i++) {

		struct kvmppc_xive_src_block *sb = xive->src_blocks[i];



		if (sb) {

			arch_spin_lock(&sb->lock);

			kvmppc_xive_debug_show_sources(m, sb);

			arch_spin_unlock(&sb->lock);

		}

	}



	return 0;

}

arch/powerpc/kvm/book3s_xive.h

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ extern int (*__xive_vm_h_eoi)(struct kvm_vcpu *vcpu, unsigned long xirr); 
 */

void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu);

int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcpu);

void kvmppc_xive_debug_show_sources(struct seq_file *m,

				    struct kvmppc_xive_src_block *sb);

struct kvmppc_xive_src_block *kvmppc_xive_create_src_block(

	struct kvmppc_xive *xive, int irq);

void kvmppc_xive_free_sources(struct kvmppc_xive_src_block *sb);

arch/powerpc/kvm/book3s_xive_native.c

+17 −4
Original line number Diff line number Diff line
@@ -1219,18 +1219,31 @@ static int xive_native_debug_show(struct seq_file *m, void *private) 
		if (!xc)

			continue;



		seq_printf(m, "cpu server %#x VP=%#x NSR=%02x CPPR=%02x IBP=%02x PIPR=%02x w01=%016llx w2=%08x\n",

			   xc->server_num, xc->vp_id,

		seq_printf(m, "VCPU %d: VP=%#x/%02x\n"

			   "    NSR=%02x CPPR=%02x IBP=%02x PIPR=%02x w01=%016llx w2=%08x\n",

			   xc->server_num, xc->vp_id, xc->vp_chip_id,

			   vcpu->arch.xive_saved_state.nsr,

			   vcpu->arch.xive_saved_state.cppr,

			   vcpu->arch.xive_saved_state.ipb,

			   vcpu->arch.xive_saved_state.pipr,

			   vcpu->arch.xive_saved_state.w01,

			   (u32) vcpu->arch.xive_cam_word);

			   be64_to_cpu(vcpu->arch.xive_saved_state.w01),

			   be32_to_cpu(vcpu->arch.xive_cam_word));



		kvmppc_xive_debug_show_queues(m, vcpu);

	}



	seq_puts(m, "=========\nSources\n=========\n");



	for (i = 0; i <= xive->max_sbid; i++) {

		struct kvmppc_xive_src_block *sb = xive->src_blocks[i];



		if (sb) {

			arch_spin_lock(&sb->lock);

			kvmppc_xive_debug_show_sources(m, sb);

			arch_spin_unlock(&sb->lock);

		}

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE