usbip: fix vhci_hcd controller counting
Subsystems (2)
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
@@ -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 )
I'm not entirely sure who I should be CC'ing on this... but it's such an obvious fix...
Thanks,
- Maciej
For whatever it's worth, I've tested this on 4.18.9 and can verify that there are no regressions there.
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.656Because it detects 'w83627hf.656' as another
vhci_hcdcontroller, 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=1631148Cc Jonathan Dieter <[email protected]>Cc Valentina Manea <[email protected]>Cc Shuah Khan <[email protected]>Signed-off-by Maciej Żenczykowski <[email protected]>--- tools/usb/usbip/libsrc/vhci_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/usb/usbip/libsrc/vhci_driver.c +0
-0
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