[2/3] Add CIBIR, XDP, and XSK maps support to the sample tools by ProjectsByJackHe · Pull Request #5999 · microsoft/msquic

ProjectsByJackHe · 2026-05-15T01:15:55Z

Description

Full E2E demo: DEMO

Adds 2 new sample tools to support changes in PR :

quicxdpsample.exe: quicsample.exe but with additional support for XDP/CIBIR/XSK maps.
quicxskmapcreator.exe: meant to replicate a trusted admin process that can create programs/rules. It gives a map handle to the consumer quicadvanced server.

Testing

Local testing on a VM with XDP

Documentation

No

codecov · 2026-05-15T02:05:10Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.38%. Comparing base (176ec66) to head (981a902).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5999      +/-   ##
==========================================
+ Coverage   84.97%   85.38%   +0.41%     
==========================================
  Files          60       60              
  Lines       18792    18792              
==========================================
+ Hits        15968    16046      +78     
+ Misses       2824     2746      -78

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

guhetier · 2026-05-15T16:06:39Z

It seems like a great idea to add those features in a sample. I have no problem with an incremental implementation.
One concern though: the MsQuic sample can be used as a test tool, but it is mainly documentation to help user getting started. It is already pretty complicated, with features that a basic use case doesn't need.

I'd consider having multiple samples instead, focused on demonstrating one way of using MsQuic, and avoid putting everything in a single one.

A sample focused on XDP / CIBIR / XDP maps could be a nice unit.

The new tools (quicxskmapcreator) require XdpMapCreate and XDP_MAP_TYPE_XSKMAP which are available in the newer XDP SDK. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…ub.com/microsoft/msquic into jackhe/extend-sample-include-xdp-cibir

guhetier · 2026-05-18T17:11:36Z

    add_subdirectory(etw)
    add_subdirectory(recvfuzz)
+    add_subdirectory(quicxskmapcreator)
+    add_subdirectory(quicadvanced)


We can come up with a better name.
This sample is about using XDP with maps, and potentially CIBIR? Let's call it something with XDP in the name.

I'd also consider making a subfolder to contain both quicxskmapcreator and quicadvanced, since they are meant to work together.

guhetier · 2026-05-18T17:12:41Z

+
+    Usage:
+        1. Start the QUIC server:
+           quicsample -server -cert_hash:<hash> -xdp -xdp_map_ifindex:<N>


Please update this doc

guhetier · 2026-05-18T17:15:49Z

+    printf("\n");
+    printf("Press ENTER to detach the program and exit.\n");
+    fflush(stdout);
+    (void)getchar();


Is there a reason to wait? If this process is closed, the map stays open as long as the target process runs?

guhetier · 2026-05-18T17:16:05Z

+
+Abstract:
+
+    Provides a very simple MsQuic API sample server and client application.


Please update this comment

guhetier · 2026-05-18T17:19:07Z

+    // QUIC_PARAM_GLOBAL_XDP_MAP_CONFIG must be set before LazyInitComplete.
+    //
+#ifdef _WIN32
+    if (GetFlag(argc, argv, "server") && GetFlag(argc, argv, "xdp")) {


Make this a helper function.

guhetier · 2026-05-21T21:42:46Z

+}
+
+void
+WriteSslKeyLogFile(


We probably don't need this in the XDP sample

guhetier · 2026-05-21T21:47:03Z

+
+        printf("\n");
+
+        if (MapMode) {


Please extract this in a helper.
This is boilerplate code that is not helpful to a reader to understand what they need to do to implement a connection, let's not have it in the way.

guhetier · 2026-05-21T21:48:02Z

+            MsQuic->ConnectionClose(Connection);
+        }
+        break;
+    case QUIC_CONNECTION_EVENT_RESUMPTION_TICKET_RECEIVED:


We probably don't need this in the xdp sample.

guhetier · 2026-05-21T21:51:15Z

+        const char* CibirIdHex = GetValue(argc, argv, "cibir_id");
+        if (CibirIdHex != NULL) {
+            //
+            // CIBIR requires shared binding (so the connection uses source CIDs).


Are you sure of that? Wouldn't a client connection put the CIBIR id on the destination CID?

guhetier · 2026-05-21T21:51:53Z

+#ifdef QUIC_API_ENABLE_PREVIEW_FEATURES
+
+void
+RunMultiClient(


Let's remove this, there is nothing XDP specific to it.

ProjectsByJackHe added 2 commits May 14, 2026 17:46

add tools

0020948

remove stale tools

6322b35

ProjectsByJackHe requested a review from a team as a code owner May 15, 2026 01:15

ProjectsByJackHe added 10 commits May 15, 2026 15:07

phase 2 looks good so far

9830250

phase 2 improvements

7ba0bf1

better diagnostics

b364f47

phase 3 plumbing...

01df062

phase 3: iter 2

3097b18

bug fixes man

5750131

E2E

bbf64e0

fix comment

c62d7b1

update xdp commit

08ff04e

set cibir correctly

0fa990c

ProjectsByJackHe changed the title ~~Add CIBIR and XDP support to the quicsample tool~~ Add CIBIR, XDP, and XSK maps support to the sample tools May 18, 2026

ProjectsByJackHe added 2 commits May 17, 2026 19:40

just the tools

a1d662e

get rid of xskconsumer/creator

542af1f

ProjectsByJackHe force-pushed the jackhe/extend-sample-include-xdp-cibir branch from 6322b35 to 542af1f Compare May 18, 2026 02:45

ProjectsByJackHe mentioned this pull request May 18, 2026

[2/3] Integrate XSK maps into the core XDP datapath #6003

Open

Update xdp-for-windows submodule for XDP map APIs

c85cd3a

The new tools (quicxskmapcreator) require XdpMapCreate and XDP_MAP_TYPE_XSKMAP which are available in the newer XDP SDK. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

ProjectsByJackHe changed the title ~~Add CIBIR, XDP, and XSK maps support to the sample tools~~ [2/3] Add CIBIR, XDP, and XSK maps support to the sample tools May 19, 2026

ProjectsByJackHe added 2 commits May 20, 2026 11:32

Merge branch 'jackhe/extend-sample-include-xdp-cibir' of https://gith…

84b01aa

…ub.com/microsoft/msquic into jackhe/extend-sample-include-xdp-cibir

Merge branch 'main' into jackhe/extend-sample-include-xdp-cibir

93373cf

mtfriesen reviewed May 20, 2026

View reviewed changes

Comment thread src/tools/quicxdpsample/quicxdpsample.c

ProjectsByJackHe added 2 commits May 21, 2026 12:30

rename to quicxdpsample

addace0

update ALPN

981a902

mtfriesen approved these changes May 21, 2026

View reviewed changes

guhetier reviewed May 21, 2026

View reviewed changes


		Abstract:

		Provides a very simple MsQuic API sample server and client application.

Uh oh!

Conversation

ProjectsByJackHe commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing

Documentation

Uh oh!

codecov Bot commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

guhetier commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ProjectsByJackHe commented May 15, 2026 •

edited

Loading

codecov Bot commented May 15, 2026 •

edited

Loading

guhetier commented May 15, 2026 •

edited

Loading