Skip to content

Commit

Permalink
Remove usbip patch that breaks mass storage devices with Linux 6.6.50+
Browse files Browse the repository at this point in the history
Linux 6.6.50+ got 73ec94aac593ef4bac3a864365f0433b8266225b ("usbip:
Don't submit special requests twice") which together with
0001-usbip-tweak-clear-halt-with-simple-reset.patch breaks attaching
mass storage devices (and possibly some other devices too). The exact
behavior is that frontend gets messages like this:

    usb 2-1: SetAddress Request (2) to port 0
    usb 2-1: reset SuperSpeed USB device number 2 using vhci_hcd
    usb 2-1: SetAddress Request (2) to port 0
    usb 2-1: reset SuperSpeed USB device number 2 using vhci_hcd
    usb 2-1: SetAddress Request (2) to port 0
    usb 2-1: reset SuperSpeed USB device number 2 using vhci_hcd
    usb 2-1: SetAddress Request (2) to port 0
    usb 2-1: reset SuperSpeed USB device number 2 using vhci_hcd

And the backend gets messages like this:

    usbip-host 3-1: urb completion with non-zero status -121
    usbip-host 3-1: endpoint 1 is stalled
    usbip-host 3-1: usb_reset_endpoint done: devnum 2 endp 129
    usbip-host 3-1: urb completion with non-zero status -71
    usbip-host 3-1: urb completion with non-zero status -121
    usbip-host 3-1: endpoint 1 is stalled
    usbip-host 3-1: usb_reset_endpoint done: devnum 2 endp 129
    usbip-host 3-1: urb completion with non-zero status -71
    usbip-host 3-1: urb completion with non-zero status -121
    usbip-host 3-1: endpoint 1 is stalled

The disk eventually shows up, but with a long delay, enough to hit
qvm-usb timeout most of the times.

Since the Linux change may fix a similar issue that the patch originally
tried to, simply drop the local patch. If the original problem
re-appears, we'll need a different fix.

Fixes QubesOS/qubes-issues#9546

(cherry picked from commit cf97c01)
  • Loading branch information
marmarek committed Nov 7, 2024
1 parent fadbf65 commit eeb082e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 62 deletions.
61 changes: 0 additions & 61 deletions 0001-usbip-tweak-clear-halt-with-simple-reset.patch

This file was deleted.

1 change: 0 additions & 1 deletion kernel.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ Patch2: 0003-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
Patch3: 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch
Patch5: 0006-block-add-no_part_scan-module-parameter.patch
Patch12: 0013-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
Patch16: 0001-usbip-tweak-clear-halt-with-simple-reset.patch
Patch25: 0001-Re-enable-interrupts-before-loading-PNVM.patch
Patch26: 0001-sound-Disable-SG-buffer.patch
Patch27: 0001-amdgpu-timeout.patch
Expand Down

0 comments on commit eeb082e

Please sign in to comment.