lspci: Add ability to filter by class code

Commit Message

Matthew Wilcox Sept. 30, 2014, 6:02 p.m. UTC

On Tue, Sep 30, 2014 at 01:50:36PM -0400, Matthew Wilcox wrote:

Sorry, forgot to update the documentation in two places.  Try this
patch instead:


From b7aa6b8d6006405e954120e29849a9b34e1432ac Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <[e-mail]>
Date: Tue, 30 Sep 2014 13:41:07 -0400
Subject: [PATCH] lspci: Add ability to filter by class code

Extend the 'filter by device ID' functionality to allow optional
specification of a device ID.  For example, to list all USB controllers
in the system made by Intel, specify:

lspci -d 8086::0c03

Signed-off-by: Matthew Wilcox <[e-mail]>
---
 lib/filter.c | 22 +++++++++++++++++++---
 lib/pci.h    |  2 +-
 lspci.c      |  2 +-
 lspci.man    |  7 ++++---
 4 files changed, 25 insertions(+), 8 deletions(-)

Comments

Martin Mareš Nov. 1, 2014, 4:25 p.m. UTC | #1

Hello!

> From: Matthew Wilcox <[e-mail]>
> Date: Tue, 30 Sep 2014 13:41:07 -0400
> Subject: [PATCH] lspci: Add ability to filter by class code
> 
> Extend the 'filter by device ID' functionality to allow optional
> specification of a device ID.  For example, to list all USB controllers
> in the system made by Intel, specify:
> 
> lspci -d 8086::0c03

I like the idea, but I see a couple of issues with the actual
implementation:

  •  I wonder if it could be useful to filter by prog-if in addition
     to the class, or only on the class without its sub-class?

  •  Extending struct pci_filter breaks ABI (my fault in designing
     the API years ago -- it would have been much better if the struct
     were allocated by the library instead of the caller). Could you
     please add symbol versioning for pci_filter_(init|match|parse_id)?

				Have a nice fortnight

Martin Mareš Nov. 2, 2014, 11:14 a.m. UTC | #2

Hello!

>   •  Extending struct pci_filter breaks ABI (my fault in designing
>      the API years ago -- it would have been much better if the struct
>      were allocated by the library instead of the caller). Could you
>      please add symbol versioning for pci_filter_(init|match|parse_id)?

Done. It was somewhat tricky, but it should work.

					Martin
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/filter.c b/lib/filter.c
index f321b0f..fab0025 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -15,7 +15,7 @@  void
 pci_filter_init(struct pci_access *a UNUSED, struct pci_filter *f)
 {
   f->domain = f->bus = f->slot = f->func = -1;
-  f->vendor = f->device = -1;
+  f->vendor = f->device = f->class = -1;
 }
 
 /* Slot filter syntax: [[[domain]:][bus]:][slot][.[func]] */
@@ -74,12 +74,12 @@  pci_filter_parse_slot(struct pci_filter *f, char *str)
   return NULL;
 }
 
-/* ID filter syntax: [vendor]:[device] */
+/* ID filter syntax: [vendor]:[device][:class] */
 
 char *
 pci_filter_parse_id(struct pci_filter *f, char *str)
 {
-  char *s, *e;
+  char *s, *c, *e;
 
   if (!*str)
     return NULL;
@@ -94,6 +94,9 @@  pci_filter_parse_id(struct pci_filter *f, char *str)
 	return "Invalid vendor ID";
       f->vendor = x;
     }
+  c = strchr(s, ':');
+  if (c)
+    *c++ = 0;
   if (s[0] && strcmp(s, "*"))
     {
       long int x = strtol(s, &e, 16);
@@ -101,6 +104,13 @@  pci_filter_parse_id(struct pci_filter *f, char *str)
 	return "Invalid device ID";
       f->device = x;
     }
+  if (c && c[0] && strcmp(s, "*"))
+    {
+      long int x = strtol(c, &e, 16);
+      if ((e && *e) || (x < 0 || x > 0xffff))
+	return "Invalid class code";
+      f->class = x;
+    }
   return NULL;
 }
 
@@ -119,5 +129,11 @@  pci_filter_match(struct pci_filter *f, struct pci_dev *d)
 	  (f->vendor >= 0 && f->vendor != d->vendor_id))
 	return 0;
     }
+  if (f->class >= 0)
+    {
+      pci_fill_info(d, PCI_FILL_CLASS);
+      if (f->class != d->device_class)
+	return 0;
+    }
   return 1;
 }
diff --git a/lib/pci.h b/lib/pci.h
index 38e2e99..b0bf1aa 100644
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -193,7 +193,7 @@  struct pci_cap *pci_find_cap(struct pci_dev *, unsigned int id, unsigned int typ
 
 struct pci_filter {
   int domain, bus, slot, func;			/* -1 = ANY */
-  int vendor, device;
+  int vendor, device, class;
 };
 
 void pci_filter_init(struct pci_access *, struct pci_filter *) PCI_ABI;
diff --git a/lspci.c b/lspci.c
index dbba678..372e4de 100644
--- a/lspci.c
+++ b/lspci.c
@@ -60,7 +60,7 @@  static char help_msg[] =
 "\n"
 "Selection of devices:\n"
 "-s [[[[<domain>]:]<bus>]:][<slot>][.[<func>]]\tShow only devices in selected slots\n"
-"-d [<vendor>]:[<device>]\t\t\tShow only devices with specified ID's\n"
+"-d [<vendor>]:[<device>][:<class>]\t\tShow only devices with specified ID's\n"
 "\n"
 "Other options:\n"
 "-i <file>\tUse specified ID database instead of %s\n"
diff --git a/lspci.man b/lspci.man
index 601a48a..2303ab8 100644
--- a/lspci.man
+++ b/lspci.man
@@ -136,9 +136,10 @@  hexadecimal.  E.g., "0:" means all devices on bus 0, "0" means all functions of
 on any bus, "0.3" selects third function of device 0 on all buses and ".4" shows only
 the fourth function of each device.
 .TP
-.B -d [<vendor>]:[<device>]
-Show only devices with specified vendor and device ID. Both ID's are given in
-hexadecimal and may be omitted or given as "*", both meaning "any value".
+.B -d [<vendor>]:[<device>][:<class>]
+Show only devices with specified vendor, device and class ID. The ID's are
+given in hexadecimal and may be omitted or given as "*", both meaning
+"any value".
 
 .SS Other options
 .TP