Skip to content

fix(dra): skip usbip devices in discovery when vhci_hcd has not fully released them #2122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaroslavborbat merged 1 commit into from
Mar 20, 2026
Merged

fix(dra): skip usbip devices in discovery when vhci_hcd has not fully released them #2122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions images/virtualization-dra/internal/usb/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ package usb

import (
"context"
"fmt"
"log/slog"
"path/filepath"
"strings"

"github.com/deckhouse/virtualization-dra/internal/featuregates"
)
Expand All @@ -44,6 +47,16 @@ func (s *AllocationStore) discoveryPluggedUSBDevices(ctx context.Context) (map[s
if _, ok := busIDSet[device.BusID]; ok {
usbipDeviceSet.Insert(toDevice(&device))
} else {
// usb device can be not exists in attach info because usbip detached it
// while it is still present in sysfs because vhci_hcd has not fully released it yet.
isUSBIPDevice, err := isUSBIPDevice(device.Path)
if err != nil {
return nil, nil, fmt.Errorf("failed to check if usb device is usbip device: %w", err)
}
if isUSBIPDevice {
continue
}

dev := toDevice(&device)
usbDeviceMap[dev.GetName(s.nodeName)] = dev
}
Expand All @@ -56,3 +69,14 @@ func (s *AllocationStore) discoveryPluggedUSBDevices(ctx context.Context) (map[s

return usbDeviceMap, usbipDeviceSet, nil
}

func isUSBIPDevice(devPath string) (bool, error) {
realPath, err := filepath.EvalSymlinks(devPath)
if err != nil {
return false, err
}

realPath = filepath.Clean(realPath)

return strings.Contains(realPath, "vhci_hcd"), nil
}
Loading