Virtualization - Jan 2015 - [pciutils patch v2] add virtio vendor capability support

virtio uses vendor-specific capabilities to specify the location of
the virtio register ranges.  The specification can be found here:

http://docs.oasis-open.org/virtio/virtio/v1.0/cs01/virtio-v1.0-cs01.html#x1-690004

This patch adds support for decoding these capabilities to lspci.

Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
 Makefile         |  2 +-
 ls-caps-vendor.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ls-caps.c        |  2 +-
 lspci.h          |  4 +++
 4 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 ls-caps-vendor.c

diff --git a/Makefile b/Makefile
index 8d49afa..39a07d1 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ force:
 lib/config.h lib/config.mk:
 	cd lib && ./configure
 
-lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o
common.o lib/$(PCILIB)
+lspci: lspci.o ls-vpd.o ls-caps.o ls-caps-vendor.o ls-ecaps.o ls-kernel.o
ls-tree.o ls-map.o common.o lib/$(PCILIB)
 setpci: setpci.o common.o lib/$(PCILIB)
 
 LSPCIINC=lspci.h pciutils.h $(PCIINC)
diff --git a/ls-caps-vendor.c b/ls-caps-vendor.c
new file mode 100644
index 0000000..4cdfe22
--- /dev/null
+++ b/ls-caps-vendor.c
@@ -0,0 +1,76 @@
+/*
+ *	The PCI Utilities -- Show Vendor-specific Capabilities
+ *
+ *	Copyright (c) 2014 Gerd Hoffmann <kraxel at redhat.com>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "lspci.h"
+
+static void
+show_vendor_caps_virtio(struct device *d, int where, int cap)
+{
+  int length = BITS(cap, 0, 8);
+  int type = BITS(cap, 8, 8);
+  char *tname;
+
+  if (length < 16)
+    return;
+  if (!config_fetch(d, where, length))
+    return;
+
+  switch (type)
+    {
+    case 1:
+      tname = "CommonCfg";
+      break;
+    case 2:
+      tname = "Notify";
+      break;
+    case 3:
+      tname = "ISR";
+      break;
+    case 4:
+      tname = "DeviceCfg";
+      break;
+    default:
+      tname = "<unknown>";
+      break;
+    }
+
+  printf("VirtIO: %s\n", tname);
+
+  if (verbose < 2)
+    return;
+
+  printf("\t\tBAR=%d offset=%08x size=%08x\n",
+	 get_conf_byte(d, where +  4),
+	 get_conf_long(d, where +  8),
+	 get_conf_long(d, where + 12));
+
+  if (type != 2 || length < 20)
+    return;
+
+  printf("\t\tmultiplier=%08x\n",
+	 get_conf_long(d, where+16));
+}
+
+void
+show_vendor_caps(struct device *d, int where, int cap)
+{
+  switch (get_conf_word(d, PCI_VENDOR_ID))
+    {
+    case 0x1af4: /* Red Hat */
+      if (get_conf_word(d, PCI_DEVICE_ID) >= 0x1000 &&
+	  get_conf_word(d, PCI_DEVICE_ID) <= 0x107f)
+	show_vendor_caps_virtio(d, where, cap);
+      break;
+    default:
+      printf("Vendor Specific Information: Len=%02x <?>\n",
BITS(cap, 0, 8));
+      break;
+    }
+}
diff --git a/ls-caps.c b/ls-caps.c
index 7de55ef..c145ed6 100644
--- a/ls-caps.c
+++ b/ls-caps.c
@@ -1315,7 +1315,7 @@ show_caps(struct device *d, int where)
 	      cap_ht(d, where, cap);
 	      break;
 	    case PCI_CAP_ID_VNDR:
-	      printf("Vendor Specific Information: Len=%02x <?>\n",
BITS(cap, 0, 8));
+	      show_vendor_caps(d, where, cap);
 	      break;
 	    case PCI_CAP_ID_DBG:
 	      cap_debug_port(cap);
diff --git a/lspci.h b/lspci.h
index 86429b2..a3fc9d0 100644
--- a/lspci.h
+++ b/lspci.h
@@ -70,6 +70,10 @@ void show_caps(struct device *d, int where);
 
 void show_ext_caps(struct device *d);
 
+/* ls-caps-vendor.c */
+
+void show_vendor_caps(struct device *d, int where, int cap);
+
 /* ls-kernel.c */
 
 void show_kernel_machine(struct device *d UNUSED);
-- 
1.8.3.1

Hi!
> virtio uses vendor-specific capabilities to specify the location of
> the virtio register ranges.  The specification can be found here:
> 
>
http://docs.oasis-open.org/virtio/virtio/v1.0/cs01/virtio-v1.0-cs01.html#x1-690004
> 
> This patch adds support for decoding these capabilities to lspci.
Thanks, applied.

One more request: could you please provide a hexdump (lspci -vxxx) of
a virtio device as a test case?

				Martin

On Do, 2015-01-22 at 10:10 +0100, Martin Mares wrote:
> lspci -vxxx
Attached is a dump of a virtio-net device (both verbose=2 and hex).

cheers,
  Gerd

-------------- next part --------------
00:09.0 Ethernet controller: Red Hat, Inc Virtio network device
	Subsystem: Red Hat, Inc Virtio network device
	Physical Slot: 9
	Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping-
SERR+ FastB2B- DisINTx+
	Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort-
<MAbort- >SERR- <PERR- INTx-
	Latency: 0
	Interrupt: pin A routed to IRQ 10
	Region 0: I/O ports at c060 [size=32]
	Region 1: Memory at febd6000 (32-bit, non-prefetchable) [size=4K]
	Region 2: Memory at fea00000 (32-bit, non-prefetchable) [size=512K]
	Expansion ROM at feb80000 [disabled] [size=256K]
	Capabilities: [84] MSI-X: Enable+ Count=3 Masked-
		Vector table: BAR=1 offset=00000000
		PBA: BAR=1 offset=00000800
	Capabilities: [70] VirtIO: Notify
		BAR=2 offset=00003000 size=00040000
		multiplier=00001000
	Capabilities: [60] VirtIO: DeviceCfg
		BAR=2 offset=00002000 size=00001000
	Capabilities: [50] VirtIO: ISR
		BAR=2 offset=00001000 size=00001000
	Capabilities: [40] VirtIO: CommonCfg
		BAR=2 offset=00000000 size=00001000
	Kernel driver in use: virtio-pci
00: f4 1a 00 10 07 05 10 00 00 00 00 02 00 00 00 00
10: 61 c0 00 00 00 60 bd fe 00 00 a0 fe 00 00 00 00
20: 00 00 00 00 00 00 00 00 00 00 00 00 f4 1a 01 00
30: 00 00 b8 fe 84 00 00 00 00 00 00 00 0a 01 00 00
40: 09 00 10 01 02 00 00 00 00 00 00 00 00 10 00 00
50: 09 40 10 03 02 00 00 00 00 10 00 00 00 10 00 00
60: 09 50 10 04 02 00 00 00 00 20 00 00 00 10 00 00
70: 09 60 14 02 02 00 00 00 00 30 00 00 00 00 04 00
80: 00 10 00 00 11 70 02 80 01 00 00 00 01 08 00 00
90: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00