x86/hvm: add more callback/upcall info to 'I' debug key
PATCH 1/1 x86/hvm: add more callback/upcall info to 'I' debug key
Include the type of the callback via and the per-VCPU upcall vector.
--- xen/arch/x86/hvm/irq.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
xen/arch/x86/hvm/irq.c +27 -4
@@ -598,7 +598,9 @@ int hvm_local_events_need_delivery(struct vcpu *v)static void irq_dump (struct domain *d) {struct hvm_irq *hvm_irq =hvm_domain_irq (d); -int i; +int i; +struct vcpu *v; +printk ("Domain %d:\n" , d->domain_id); printk("PCI 0x%16.16"PRIx64"%16.16"PRIx64 " ISA 0x%8.8"PRIx32" ROUTE %u %u %u %u\n",
@@ -630,9 +632,30 @@ static void irq_dump(struct domain *d) hvm_irq->pci_link_assert_count[1 ], hvm_irq->pci_link_assert_count[2 ], hvm_irq->pci_link_assert_count[3]); -printk ("Callback via %i:%#" PRIx32",%s asserted\n" , - hvm_irq->callback_via_type, hvm_irq->callback_via.gsi, - hvm_irq->callback_via_asserted ?"" :" not" ); +for_each_vcpu ( d, v ) + { +if ( v->arch.hvm.evtchn_upcall_vector ) +printk ("%pv: upcall vector: %u\n" , + v, v->arch.hvm.evtchn_upcall_vector); + } +switch ( hvm_irq->callback_via_type ) + { +case HVMIRQ_callback_none: +printk ("Callback via none\n" ); +break ; +case HVMIRQ_callback_gsi: +printk ("Callback via GSI %u\n" , hvm_irq->callback_via.gsi); +break ; +case HVMIRQ_callback_pci_intx: +printk ("Callback via PCI dev %u INTx %u\n" , + hvm_irq->callback_via.pci.dev, + hvm_irq->callback_via.pci.intx); +break ; +case HVMIRQ_callback_vector: +printk ("Callback via vector %u\n" , hvm_irq->callback_via.vector); +break ; + } +printk (" %s asserted\n" , hvm_irq->callback_via_asserted ?"" :" not" ); }static void dump_irq_info (unsigned char key)
Signature · 1 line
2.30.2
Quoted 3 lines · David Vrabel
Include the type of the callback via and the per-VCPU upcall vector.
Signed-off-by David Vrabel <[email protected]>
Welcome back!
A couple of stylistic / cosmetic remarks:
xen/arch/x86/hvm/irq.c int hvm_local_events_need_delivery(struct vcpu *v) · line 601
Quoted 8 lines
xen/arch/x86/hvm/irq.c +1
-1@@ -598,7 +598,9 @@ int hvm_local_events_need_delivery(struct vcpu *v)static void irq_dump (struct domain *d) {struct hvm_irq *hvm_irq =hvm_domain_irq (d); -int i; +int i;
Since you touch this line anyway, would you mind switching to "unsigned int"?
xen/arch/x86/hvm/irq.c int hvm_local_events_need_delivery(struct vcpu *v) · line 602
Quoted 1 line
xen/arch/x86/hvm/irq.c +1
-0+struct vcpu *v;
const?
xen/arch/x86/hvm/irq.c static void irq_dump(struct domain *d) · line 635
Quoted 8 lines
xen/arch/x86/hvm/irq.c +1
-3@@ -630,9 +632,30 @@ static void irq_dump(struct domain *d) hvm_irq->pci_link_assert_count[1 ], hvm_irq->pci_link_assert_count[2 ], hvm_irq->pci_link_assert_count[3]); -printk ("Callback via %i:%#" PRIx32",%s asserted\n" , - hvm_irq->callback_via_type, hvm_irq->callback_via.gsi, - hvm_irq->callback_via_asserted ?"" :" not" ); +for_each_vcpu ( d, v )
Depending on whether you consider for_each_vcpu a pseudo-keyword, there's a blank missing here (like for "switch" below), or there are two excess ones.
xen/arch/x86/hvm/irq.c static void irq_dump(struct domain *d) · line 639
Quoted 4 lines
xen/arch/x86/hvm/irq.c +4
-0+ { +if ( v->arch.hvm.evtchn_upcall_vector ) +printk ("%pv: upcall vector: %u\n" , + v, v->arch.hvm.evtchn_upcall_vector);
I'm not convinced of (but also not outright opposed to) the resulting redundancy here from using %pv: The domain already got printed once at the top of the function.
xen/arch/x86/hvm/irq.c static void irq_dump(struct domain *d) · line 641
Quoted 2 lines
xen/arch/x86/hvm/irq.c +2
-0+ } + switch( hvm_irq->callback_via_type )
Missing blank ahead of opening parenthesis.
Quoted 6 lines
xen/arch/x86/hvm/irq.c +6
-0+ { +case HVMIRQ_callback_none: +printk ("Callback via none\n" ); +break ; +case HVMIRQ_callback_gsi: +printk ("Callback via GSI %u\n" , hvm_irq->callback_via.gsi);
xen/arch/x86/hvm/irq.c static void irq_dump(struct domain *d) · line 657
Quoted 10 lines
xen/arch/x86/hvm/irq.c +10
-0+break ; +case HVMIRQ_callback_pci_intx: +printk ("Callback via PCI dev %u INTx %u\n" , + hvm_irq->callback_via.pci.dev, + hvm_irq->callback_via.pci.intx); +break ; +case HVMIRQ_callback_vector: +printk ("Callback via vector %u\n" , hvm_irq->callback_via.vector); +break ; + }
We try to put blank lines between non-fall-through case blocks within a switch().
xen/arch/x86/hvm/irq.c static void irq_dump(struct domain *d) · line 658
Quoted 1 line
xen/arch/x86/hvm/irq.c +1
-0+printk (" %s asserted\n" , hvm_irq->callback_via_asserted ?"" :" not" );
I'm a little puzzled by the blank preceding "not"; how about
printk(" %sasserted\n", hvm_irq->callback_via_asserted ? "" : "not ");?
Jan