netvsp: vtl0 vf operations safe when vtl2 absent by erfrimod · Pull Request #3891 · microsoft/openvmm

erfrimod · 2026-07-08T18:14:34Z

When EQE 135 resets the VTL 2 VF and the NIC has set revoke_vtl0_vf to false then the VTL0 VF will still be offered to the Guest. This causes problems in functions like update_vtl0_vf and hide_vtl0_vf which have assumptions about the VTL2 device being Present when VTL0 VF is offered. But now it is valid for the VTL2 device to be in Reconfiguring and Missing.

try_notify_guest_and_revoke_vtl0_vf - can be called from ManaDeviceRemoved. Modified so that when VTL2 device is not Present the HWC call to change MAC filter to synthetic path is skipped. Also modified bus-selection to skip calling revoke_vtl0_vf when VTL0 bus no present, in response to a hide_vtl0_vf.
update_vtl0_vf - Removed panicking asserts that VTL0 VF could not be offered to guest when VTL2 was not Present. Nested match logic replaced with a match(vtl2_device_state, vtl0_bus_control).
add_vtl0_vf - Early skip if VTL2 device is not Present. When VTL2 device returns, starup_vtl2_device will re-announce the VF arrival to Guest.
remove_vtl0_vf - Unchanged.
hide_vtl0_vf - When hiding, calls try_notify_guest_and_revoke_vtl0_vf regardless of VTL2 state.

…configuyre

Copilot

Pull request overview

This PR tightens the netvsp VF manager’s state transitions so that a VTL0 VF is not left offered to the guest when VTL2 MANA device reconfiguration fails, preserving invariants relied on by subsequent state transitions (e.g., Hidden / Missing).

Changes:

Extend hide_vtl0_vf to revoke the VTL0 VF if it is still offered, even when VTL2 isn’t Present.
Refactor update_vtl0_vf into a match and add explicit handling for Vtl2DeviceState::Reconfiguring to revoke any still-offered VF.
Update reconfigure_vf_restart to revoke any still-offered VTL0 VF before marking the VTL2 device Missing when retries are exhausted.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

github-actions · 2026-07-09T00:33:19Z

1 Petri tests failed (1 unstable)

…nger asserts not offered

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

github-actions · 2026-07-15T22:29:12Z

2 Petri tests failed (0 unstable)

sunilmut · 2026-07-17T00:00:45Z

-                        if matches!(vtl2_device_state, Vtl2DeviceState::Present) {
+                        let vtl0_vf_offered = self.guest_state.is_offered_to_guest().await;
+                        if vtl0_vf_offered {
+                            // Reconfigure may have left the VTL0 VF offered to the guest.


Lets remove this line from the comment Reconfigure may have left the VTL0 VF offered to the guest.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 4 comments.

github-actions · 2026-07-18T01:58:19Z

3 Petri tests failed (2 unstable)

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (1)

openhcl/underhill_core/src/emuplat/netvsp.rs:823

update_vtl0_vf currently panics if it receives a redundant/duplicate update (e.g. Present→Present or NotPresent→NotPresent) due to assert!(is_present != bus_control.is_some()). This RPC is ultimately driven by modify_network_settings/update_vtl0_instance_id, which can plausibly be invoked multiple times with the same subordinate instance id (or None) and should be handled idempotently rather than crashing the worker.

            let is_present = matches!(
                self.vtl0_bus_control,
                Vtl0Bus::Present(_) | Vtl0Bus::HiddenPresent(_)
            );
            assert!(is_present != bus_control.is_some());
            let is_offered_to_guest = self.guest_state.is_offered_to_guest().await;

github-actions · 2026-07-20T21:59:14Z

2 Petri tests failed (1 unstable)

Brian-Perkins · 2026-07-20T23:18:18Z

+        // VTL0 VF revoke will no-op when VTL2 is absent. Once the VTL2 device
+        // returns `startup_vtl2_device` will notify the netvsp cooridnator of
+        // the arrival, which will send a fresh `RemoveVtl0VF`.
+        self.try_notify_guest_and_revoke_vtl0_vf(&Vtl0Bus::NotPresent, vtl2_device_state)


these functions do different things

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

Comments suppressed due to low confidence (1)

openhcl/underhill_core/src/emuplat/netvsp.rs:897

In update_vtl0_vf, when vtl2_device_state is not Present the code updates self.vtl0_bus_control but leaves guest_state.vtl0_vfid untouched. That can leave VirtualFunction::id() returning a stale VF id after a removal (or other bus transition) while VTL2 is missing/reconfiguring. If the intention is for guest_state to remain a projection of the current bus visibility, it should be updated here too.

                (
                    Vtl2DeviceState::Reconfiguring
                    | Vtl2DeviceState::Missing
                    | Vtl2DeviceState::DeviceEnumerated,
                    _,
                ) => {
                    self.vtl0_bus_control = bus_control
                        .map(Vtl0Bus::Present)
                        .unwrap_or(Vtl0Bus::NotPresent);
                }

github-actions · 2026-07-21T02:05:30Z

1 Petri tests failed (0 unstable)

…evoke reguardless of Present.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

Comments suppressed due to low confidence (1)

openhcl/underhill_core/src/emuplat/netvsp.rs:609

On revoke failure, vtl0_bus is logged as the worker's current self.vtl0_bus_control, but the revoke is issued against vpci_bus_control (which may come from the caller-provided bus_control, e.g. during hide). Logging the actual revoke target avoids confusing traces.

                tracing::error!(
                    vtl2_vfid,
                    vtl0_bus = %self.vtl0_bus_control,
                    revoke_vtl0_vfid = vfid_from_guid(&vpci_bus_control.instance_id()),
                    err = err.as_ref() as &dyn std::error::Error,

github-actions · 2026-07-21T19:57:33Z

2 Petri tests failed (2 unstable)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (1)

openhcl/underhill_core/src/emuplat/netvsp.rs:609

The revoke failure log uses vtl0_bus = %self.vtl0_bus_control, but the revoke may be issued against the caller-supplied vpci_bus_control (e.g. after self.vtl0_bus_control has been replaced during hide/reconfig flows). Logging the bus control actually being revoked (and optionally the worker’s current bus state) will make these errors much easier to diagnose.

                tracing::error!(
                    vtl2_vfid,
                    vtl0_bus = %self.vtl0_bus_control,
                    revoke_vtl0_vfid = vfid_from_guid(&vpci_bus_control.instance_id()),
                    err = err.as_ref() as &dyn std::error::Error,

                Vtl0Bus::Present(_) | Vtl0Bus::HiddenPresent(_)
            );
            assert!(is_present != bus_control.is_some());


erfrimod added 3 commits July 7, 2026 13:53

fixing update_vtl0_vf when revoking, revoking vtl0 vf when failing re…

37ff10e

…configuyre

fix comment and replace vtl0 bus ctrl

ec353a7

hide_vtl0_vf now revokes vtl0 vf if present

ba142d4

erfrimod requested a review from a team as a code owner July 8, 2026 18:14

Copilot AI review requested due to automatic review settings July 8, 2026 18:14

Copilot started reviewing on behalf of erfrimod July 8, 2026 18:15 View session

Copilot AI reviewed Jul 8, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

copilot feedback logging fix

0864585

Copilot AI review requested due to automatic review settings July 8, 2026 18:32

Copilot started reviewing on behalf of erfrimod July 8, 2026 18:32 View session

Copilot AI reviewed Jul 8, 2026

View reviewed changes

try revoke vtl0 vf will skip if bus not present, update vtl0 vf no lo…

39c08ce

…nger asserts not offered

Copilot AI review requested due to automatic review settings July 15, 2026 19:50

Copilot started reviewing on behalf of erfrimod July 15, 2026 19:51 View session

Copilot AI reviewed Jul 15, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

adding vtl0 vfid to error trace

ecaa69a

Copilot AI review requested due to automatic review settings July 15, 2026 21:02

Copilot started reviewing on behalf of erfrimod July 15, 2026 21:03 View session

Copilot AI reviewed Jul 15, 2026

View reviewed changes

sunilmut changed the title ~~netvsp: revoke VTL0 VF when VTL2 device reconfigure fails~~ netvsp: revoke VTL0 VF when VTL2 device reset fails Jul 16, 2026

sunilmut reviewed Jul 17, 2026

View reviewed changes

erfrimod added 2 commits July 17, 2026 15:16

PR feedback

15e31ee

last bits

2f6b604

Copilot AI review requested due to automatic review settings July 18, 2026 00:41

Copilot started reviewing on behalf of erfrimod July 18, 2026 00:42 View session

Copilot AI reviewed Jul 18, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs

try revoke vtl0 vf handles missing vtl2

6a0d48b

spelling

e594a6f

erfrimod changed the title ~~netvsp: revoke VTL0 VF when VTL2 device reset fails~~ netvsp: vtl0 vf operations safe when vtl2 absent Jul 20, 2026

Copilot AI review requested due to automatic review settings July 20, 2026 20:31

Copilot started reviewing on behalf of erfrimod July 20, 2026 20:32 View session

Copilot AI reviewed Jul 20, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

vtl0 vfid cleared on any update when vtl2 device is not present

8c8c433

Copilot AI review requested due to automatic review settings July 20, 2026 20:50

Copilot started reviewing on behalf of erfrimod July 20, 2026 20:51 View session

Copilot AI reviewed Jul 20, 2026

View reviewed changes

Brian-Perkins reviewed Jul 20, 2026

View reviewed changes

make vtl0 vf functions check for VTL2 device state

afc51b5

Copilot AI review requested due to automatic review settings July 21, 2026 00:26

Copilot started reviewing on behalf of erfrimod July 21, 2026 00:27 View session

Copilot AI reviewed Jul 21, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

removing skip in remove_vtl0_vf

94b7e5c

Copilot AI review requested due to automatic review settings July 21, 2026 00:43

Copilot started reviewing on behalf of erfrimod July 21, 2026 00:43 View session

Copilot AI reviewed Jul 21, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

try notify revoke vtl0 now checks HiddenPresent. hide_vtl0_vf calls r…

9f56330

…evoke reguardless of Present.

Copilot AI review requested due to automatic review settings July 21, 2026 18:35

Copilot started reviewing on behalf of erfrimod July 21, 2026 18:36 View session

Copilot AI reviewed Jul 21, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs Outdated

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs

Apply suggestions from code review

18efadc

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings July 22, 2026 17:47

Copilot started reviewing on behalf of erfrimod July 22, 2026 17:48 View session

Copilot AI reviewed Jul 22, 2026

View reviewed changes

Comment thread openhcl/underhill_core/src/emuplat/netvsp.rs

Comment on lines 844 to 846

Vtl0Bus::Present(_) | Vtl0Bus::HiddenPresent(_)

);

assert!(is_present != bus_control.is_some());

Uh oh!

Conversation

erfrimod commented Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions Bot commented Jul 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions Bot commented Jul 15, 2026

Uh oh!

sunilmut Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Jul 18, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions Bot commented Jul 20, 2026

Uh oh!

Brian-Perkins Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

erfrimod Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Jul 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Jul 21, 2026

erfrimod commented Jul 8, 2026 •

edited

Loading