Page MenuHomeFreeBSD
Differential D51478

bhyve: populate device version from backend
ClosedPublic
Actions

Authored by aokblast on Jul 23 2025, 4:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Sep 16, 2:25 PM
Unknown Object (File)
Sat, Sep 12, 8:43 PM
Unknown Object (File)
Sat, Sep 12, 4:24 PM
Unknown Object (File)
Fri, Sep 11, 9:07 AM
Unknown Object (File)
Wed, Sep 9, 2:12 PM
Unknown Object (File)
Wed, Sep 9, 2:14 AM
Unknown Object (File)
Tue, Sep 8, 9:10 PM
Unknown Object (File)
Mon, Sep 7, 7:50 PM
View All Files
Subscribers
bcran
imp
rgrimes

Details

Reviewers
markj
lwhsu
khng
Group Reviewers
bhyve
Commits
rGec99803ad70a: bhyve: Populate the device version from the backend
Summary

The pci_xhci driver requires the USB device version to be known before allocating a hub port. To support this, we split the original xHCI initialization into two phases:

  1. Probe: Parse the nvlist and determine the device version.
  2. Init: Complete initialization and set up the softc details.

This change ensures proper hub port allocation based on accurate device
version.

Sponsored by: The FreeBSD Foundation

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 65636
Build 62519: arc lint + arc unit

Event Timeline

aokblast created this revision.Jul 23 2025, 4:26 PM
Herald added a reviewer: bhyve. · View Herald TranscriptJul 23 2025, 4:26 PM
Herald added subscribers: bcran, rgrimes, imp. · View Herald Transcript
aokblast requested review of this revision.Jul 23 2025, 4:26 PM
Harbormaster completed remote builds in B65636: Diff 158952.Jul 23 2025, 4:26 PM
aokblast retitled this revision from The pci_xhci driver requires the USB device version to be known before allocating a hub port. To support this, we split the original xHCI initialization into two phases: to bhyve: populate the device version from the backend.Jul 23 2025, 4:27 PM
aokblast edited the summary of this revision. (Show Details)
aokblast added reviewers: markj, lwhsu, khng.Jul 23 2025, 4:41 PM
aokblast retitled this revision from bhyve: populate the device version from the backend to bhyve: populate device version from backend.Jul 23 2025, 5:30 PM
lwhsu added a comment.Jul 24 2025, 2:40 AM

I think this is fine, but I'd like one more reviewer to confirm.

markj added inline comments.Jul 24 2025, 1:38 PM
usr.sbin/bhyve/pci_xhci.c
2852

Now we need to clean up the devsc in these error paths.

aokblast updated this revision to Diff 159739.Aug 5 2025, 3:48 AM

Free when bad init

Harbormaster completed remote builds in B65961: Diff 159739.Aug 5 2025, 3:48 AM
markj added inline comments.Aug 5 2025, 1:40 PM
usr.sbin/bhyve/pci_xhci.c
2894

I think we probably also need to free dev->dev_sc here? Taking care to avoid a double free after the assignment XHCI_DEVINST_PTR(sc, dev->hci.hci_port) = dev above.

aokblast updated this revision to Diff 159780.Aug 5 2025, 2:07 PM

Fix memory leak

Harbormaster completed remote builds in B65975: Diff 159780.Aug 5 2025, 2:07 PM
aokblast added inline comments.Aug 5 2025, 2:09 PM
usr.sbin/bhyve/pci_xhci.c
2894

Emm, I think we have a memory leak problem before this patch. When control flow goto bad in

if (usb2_port == sc->usb2_port_start +
			    XHCI_MAX_DEVS / 2)

or

if (usb3_port == sc->usb3_port_start +
			    XHCI_MAX_DEVS / 2)

The last dev never freed. I think it should be fixed properly now.

markj accepted this revision as: markj.Aug 5 2025, 2:15 PM

Approved with the inline comments resolved.

usr.sbin/bhyve/pci_xhci.c
2841

Still need to free dev here.

2894

Yes, I agree.

2894
This revision is now accepted and ready to land.Aug 5 2025, 2:15 PM
aokblast updated this revision to Diff 159781.Aug 5 2025, 2:25 PM

Minor update

This revision now requires review to proceed.Aug 5 2025, 2:25 PM
Harbormaster completed remote builds in B65976: Diff 159781.Aug 5 2025, 2:26 PM
markj accepted this revision as: markj.Aug 6 2025, 1:13 PM
This revision is now accepted and ready to land.Aug 6 2025, 1:13 PM
aokblast added inline comments.Aug 7 2025, 3:37 PM
usr.sbin/bhyve/pci_xhci.c
2789

I think this line is unnecessary now since we decide to close manually for any error before

XHCI_DEVINST_PTR(sc, dev->hci.hci_port) = dev;

. I will delete it before merging back.

Closed by commit rGec99803ad70a: bhyve: Populate the device version from the backend (authored by aokblast). · Explain WhyAug 10 2025, 3:16 AM
This revision was automatically updated to reflect the committed changes.
aokblast added a commit: rGec99803ad70a: bhyve: Populate the device version from the backend.
aokblast added a child revision: D52166: bhyve: implement single USB device passthrough support.Aug 26 2025, 4:32 PM

Revision Contents
Changeset List

PathSize
usr.sbin/
bhyve/
23 lines
4 lines
13 lines

Diff 158952

View Options

usr.sbin/bhyve/pci_xhci.c

Loading...
View Options

usr.sbin/bhyve/usb_emul.h

Loading...
View Options

usr.sbin/bhyve/usb_mouse.c

Loading...