Skip to contentSkip to conversation

usbip: fix vhci_hcd controller counting

PATCH In review Maciej Żenczykowski 3 participants 4 messages Sep 20, 2018 – Oct 1, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usbip: fix vhci_hcd controller counting

From: Maciej Żenczykowski <[email protected]>

Without this usbip fails on a machine with devices that lexicographically come after vhci_hcd.

ie.

  $ ls -l /sys/devices/platform
  ...
  drwxr-xr-x. 4 root root    0 Sep 19 16:21 serial8250
  -rw-r--r--. 1 root root 4096 Sep 19 23:50 uevent
  drwxr-xr-x. 6 root root    0 Sep 20 13:15 vhci_hcd.0
  drwxr-xr-x. 4 root root    0 Sep 19 16:22 w83627hf.656

Because it detects 'w83627hf.656' as another vhci_hcd controller, and then fails to be able to talk to it.

Note: this doesn't actually fix usbip's support for multiple controllers... that's still broken for other reasons ("vhci_hcd.0" is hardcoded in a string macro), but is enough to actually make it work on the above machine.

See also:
https://bugzilla.redhat.com/show_bug.cgi?id=1631148

---
 tools/usb/usbip/libsrc/vhci_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/usb/usbip/libsrc/vhci_driver.c +1 -1
index 4204359c9fee..8159fd98680b 100644
@@ -150,7 +150,7 @@ static int get_nports(struct udev_device *hc_device)
 
 static int vhci_hcd_filter(const struct dirent *dirent)
 {
-	return strcmp(dirent->d_name, "vhci_hcd") >= 0;
+	return !strncmp(dirent->d_name, "vhci_hcd.", 9);
 }
 
 static int get_ncontrollers(void)
#1 lore raw

I'm not entirely sure who I should be CC'ing on this... but it's such an obvious fix...

Thanks,
- Maciej

maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Maciej Żenczykowski
Quoted 39 lines · Maciej Żenczykowski

From: Maciej Żenczykowski <[email protected]>

Without this usbip fails on a machine with devices that lexicographically come after vhci_hcd.

ie.

  $ ls -l /sys/devices/platform
  ...
  drwxr-xr-x. 4 root root    0 Sep 19 16:21 serial8250
  -rw-r--r--. 1 root root 4096 Sep 19 23:50 uevent
  drwxr-xr-x. 6 root root    0 Sep 20 13:15 vhci_hcd.0
  drwxr-xr-x. 4 root root    0 Sep 19 16:22 w83627hf.656

Because it detects 'w83627hf.656' as another vhci_hcd controller, and then fails to be able to talk to it.

Note: this doesn't actually fix usbip's support for multiple controllers... that's still broken for other reasons ("vhci_hcd.0" is hardcoded in a string macro), but is enough to actually make it work on the above machine.

See also:
https://bugzilla.redhat.com/show_bug.cgi?id=1631148

---
 tools/usb/usbip/libsrc/vhci_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/usb/usbip/libsrc/vhci_driver.c +0 -0
index 4204359c9fee..8159fd98680b 100644

tools/usb/usbip/libsrc/vhci_driver.c static int get_nports(struct udev_device *hc_device) · line 156

Quoted 8 lines
tools/usb/usbip/libsrc/vhci_driver.c +1 -1
@@ -150,7 +150,7 @@ static int get_nports(struct udev_device *hc_device)
 
 static int vhci_hcd_filter(const struct dirent *dirent)
 {
-	return strcmp(dirent->d_name, "vhci_hcd") >= 0;
+	return !strncmp(dirent->d_name, "vhci_hcd.", 9);
 }
 
 static int get_ncontrollers(void)

Thanks for the patch. Looks good to me.

Greg! Can you please pick this up.

thanks,
-- Shuah

thanks,
-- Shuah