From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: IO-APIC: tweak debug key info formatting v2 Date: Fri, 3 Feb 2012 16:36:33 +0000 Message-ID: <4F2C0D11.2020405@citrix.com> References: <4F2BE17D.2010207@citrix.com> <4F2BF2C80200007800070EDD@nat28.tlf.novell.com> <4F2BE5DE.6060908@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000908090503070204070902" Return-path: In-Reply-To: <4F2BE5DE.6060908@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Jan Beulich Cc: Keir Fraser , "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --------------000908090503070204070902 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Respun to reduce the verbosity of names written out for each line. Contractions are: vector -> vec delivery_mode -> delivery dest_mode -> dest delivery_status -> status trigger -> trig In addition: vector is printed in hex dest and trig mode binary choices are represented with single characters rather than full names delivery mode is converted from a number to a short string. Output on one of my text boxes is as follows: idol login: (XEN) *** Serial input -> Xen (type 'CTRL-a' three times to switch input to DOM0) (XEN) Guest interrupt information: <... snip ...> (XEN) IRQ: 22 affinity:1 vec:b0 type=IO-APIC-level status=00000010 in-flight=0 domain-list=0: 22(----), (XEN) IRQ: 23 affinity:1 vec:c0 type=IO-APIC-level status=00000010 in-flight=0 domain-list=0: 23(----), (XEN) IRQ: 24 affinity:1 vec:41 type=PCI-MSI status=00000010 in-flight=0 domain-list=0:279(----), (XEN) IRQ: 25 affinity:1 vec:31 type=PCI-MSI status=00000010 in-flight=0 domain-list=0:278(----), (XEN) IO-APIC interrupt information: (XEN) IRQ 0 Vec240: (XEN) Apic 0x00, Pin 2: vec=f0 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 1 Vec 40: (XEN) Apic 0x00, Pin 1: vec=28 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 3 Vec 48: (XEN) Apic 0x00, Pin 3: vec=30 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 4 Vec241: (XEN) Apic 0x00, Pin 4: vec=f1 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 5 Vec 56: (XEN) Apic 0x00, Pin 5: vec=38 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 6 Vec 64: (XEN) Apic 0x00, Pin 6: vec=40 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 7 Vec 72: (XEN) Apic 0x00, Pin 7: vec=48 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 8 Vec 80: (XEN) Apic 0x00, Pin 8: vec=50 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=E mask=0 dest_id:1 (XEN) IRQ 9 Vec 88: (XEN) Apic 0x00, Pin 9: vec=58 delivery=LoPri dest=L status=0 polarity=0 irr=0 trig=L mask=0 dest_id:1 <... snip ...> -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com --------------000908090503070204070902 Content-Type: text/x-patch; name="dump_ioapic_irq_info_format.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dump_ioapic_irq_info_format.patch" # HG changeset patch # Parent e2722b24dc0962de37215320b05d1bb7c4c42864 IO-APIC: Reformat IO-APIC RTE debug info (v2) Having the columns aligned makes for much easier reading. Also remove the commas which only add to visual clutter in combination with spaces. Furthermore, printing fewer characters makes it less likely that the serial buffer will overflow resulting in loss of critical debugging information. Changes since v1: * Format vector as hex rather than dec * Contract some names * destination mode uses 'L' or 'P' instead of full words * trigger mode uses 'L' or 'E' instead of full words * delivery mode uses short string instead of a number Signed-off-by: Andrew Cooper diff -r e2722b24dc09 xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2374,6 +2374,23 @@ int ioapic_guest_write(unsigned long phy return 0; } +static const char * delivery_mode_2_str( + const enum ioapic_irq_destination_types mode) +{ + switch ( mode ) + { + case dest_Fixed: return "Fixed"; + case dest_LowestPrio: return "LoPri"; + case dest_SMI: return "SMI"; + case dest_NMI: return "NMI"; + case dest_INIT: return "INIT"; + case dest_ExtINT: return "ExINT"; + case dest__reserved_1: + case dest__reserved_2: return "Resvd"; + default: return "INVAL"; + } +} + void dump_ioapic_irq_info(void) { struct irq_pin_list *entry; @@ -2406,13 +2423,12 @@ void dump_ioapic_irq_info(void) *(((int *)&rte) + 1) = io_apic_read(entry->apic, 0x11 + 2 * pin); spin_unlock_irqrestore(&ioapic_lock, flags); - printk("vector=%u, delivery_mode=%u, dest_mode=%s, " - "delivery_status=%d, polarity=%d, irr=%d, " - "trigger=%s, mask=%d, dest_id:%d\n", - rte.vector, rte.delivery_mode, - rte.dest_mode ? "logical" : "physical", + printk("vec=%02x delivery=%-5s dest=%c status=%d " + "polarity=%d irr=%d trig=%c mask=%d dest_id:%d\n", + rte.vector, delivery_mode_2_str(rte.delivery_mode), + rte.dest_mode ? 'L' : 'P', rte.delivery_status, rte.polarity, rte.irr, - rte.trigger ? "level" : "edge", rte.mask, + rte.trigger ? 'L' : 'E', rte.mask, rte.dest.logical.logical_dest); if ( entry->next == 0 ) --------------000908090503070204070902 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------000908090503070204070902--