Skip to content

pktmon: add support for dynamic pktmon registration #1034

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
nigriMSFT merged 12 commits into from
Jun 29, 2026
Merged

pktmon: add support for dynamic pktmon registration #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
de28f27
Register existing XDP bindings with pktmon on late attach
nigriMSFT Jun 15, 2026
4a3822d
minor edits
nigriMSFT Jun 16, 2026
c995abb
lock helper and fast disable check
nigriMSFT Jun 16, 2026
ed189cc
cache aware ref
nigriMSFT Jun 16, 2026
e96c24e
test enhancements
nigriMSFT Jun 16, 2026
843ed98
fix a bug
nigriMSFT Jun 19, 2026
8569804
get rid of pktmon CLI output spew
nigriMSFT Jun 19, 2026
217bc2f
init
nigriMSFT Jun 23, 2026
9ee7590
revert product changes temporarily as a sanity check
nigriMSFT Jun 25, 2026
b7c844d
Revert "revert product changes temporarily as a sanity check"
nigriMSFT Jun 26, 2026
1b7cccf
test to see network adapters in CI
nigriMSFT Jun 26, 2026
7ce9849
restore test case and disable problematic adapter to try to avoid the…
nigriMSFT Jun 26, 2026
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
12 changes: 8 additions & 4 deletions src/xdplwf/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,8 @@ XdpGenericCleanupInterface(
XdpDeregisterInterface(Generic->Registration);
Generic->Registration = NULL;
}

XdpPktMonUntrackInterface(Generic);
}

_IRQL_requires_max_(PASSIVE_LEVEL)
Expand Down Expand Up @@ -665,6 +667,7 @@ XdpGenericAttachInterface(
KeInitializeEvent(&Generic->Tx.Datapath.ReadyEvent, NotificationEvent, FALSE);
KeInitializeEvent(&Generic->Rx.Datapath.ReadyEvent, NotificationEvent, FALSE);
XdpInitializeReferenceCount(&Generic->ReferenceCount);
XdpPktMonInitializeInterface(Generic);
Generic->Filter = Filter;
Generic->NdisFilterHandle = NdisFilterHandle;
Generic->IfIndex = IfIndex;
Expand Down Expand Up @@ -693,6 +696,11 @@ XdpGenericAttachInterface(
goto Exit;
}

Status = XdpPktMonTrackInterface(Generic);
if (!NT_SUCCESS(Status)) {
goto Exit;
}

Status =
XdpInitializeCapabilities(
&Generic->Capabilities, &DriverApiVersion);
Expand All @@ -714,8 +722,6 @@ XdpGenericAttachInterface(
goto Exit;
}

XdpPktMonRegisterInterface(&Generic->PktMonContext, Generic->IfIndex);

RtlZeroMemory(AddIf, sizeof(*AddIf));
AddIf->InterfaceCapabilities = &Generic->InternalCapabilities;
AddIf->RemoveInterfaceComplete = XdpGenericRemoveInterfaceComplete;
Expand Down Expand Up @@ -747,8 +753,6 @@ XdpGenericDetachInterface(
//
XdpIfRemoveInterfaces(&Generic->XdpIfInterfaceHandle, 1);
}

XdpPktMonUnregisterInterface(&Generic->PktMonContext);
}

VOID
Expand Down
8 changes: 7 additions & 1 deletion src/xdplwf/generic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,15 @@ typedef struct _XDP_LWF_GENERIC {
} Tx;

//
// Protected by NDIS driver stack synchronization.
// Pktmon context. Protected by the pktmon rundown reference.
//
XDP_INTERFACE_PKTMON_CONTEXT *PktMonContext;
PEX_RUNDOWN_REF_CACHE_AWARE PktMonRundownRef;

//
// Pktmon generic list entry. Protected by the pktmon generic list lock.
//
LIST_ENTRY PktMonLink;
} XDP_LWF_GENERIC;

typedef enum _XDP_LWF_GENERIC_INJECTION_TYPE {
Expand Down
Loading
Loading