freebsd(13.2): add `netlink/netlink.h` support by dybucc · Pull Request #5326 · rust-lang/libc

dybucc · 2026-07-24T14:42:05Z

Description

This PR updates #3201 with merge conflicts resolved and follows the new plan at
¹.

The patch adds support for netlink.h interfaces in OpenBSD, where there's an
item resolution conflict if we expose the Rust bindings alongside those of
if_mib.h. This set of APIs is "scoped" in C because they live on separate
headers. In rust-lang/libc, we reexport all items at the root crate level, which
makes item resolution fail.

Note this depends on #5325. It won't pass tests but it will build. This is
because the test templates will gather all items in a single file, so item
resolution fails. We can't really skip these items altogether from the tests, so
it may just be necessary to extend ctest to allow skipping module-specific
Rust items.

Closes: #3201
Closes: #3194

Checklist

Relevant tests in libc-test/semver have been updated
Commit messages permalink to headers for added or changed API
Placeholder or unstable values like *LAST or *MAX have the standard
doc comment
Tested locally (cargo test -p libc-test --target mytarget); especially
relevant for platforms that may not be checked in CI

@rustbot label +stable-nominated

https://github.com/rust-lang/libc/pull/3201#issuecomment-4736374182 ↩

tgross35 · 2026-07-31T08:12:35Z

The API looks fine from a quick skim, but since there is no hurry, I think it may be worth trying to add support to ctest first so the tricky test setup isn't needed. (It's useful otherwise too.)

Sketched some of that up at #5344

dybucc · 2026-07-31T08:54:38Z

Noted. Since you already pinged some contributor on that issue, I'll wait and
see whether they want to implement it. Otherwise, I'll do it.

tgross35 · 2026-08-04T05:16:21Z

Could you try adding a separate TestGenerator instance like @mbyx recommended in that issue? Since it's split off, that should avoid the need to reexport libc::netlink at test root too.

tgross35 · 2026-08-04T05:16:43Z

Either author or blocked, depending on whether that works.

@rustbot author

rustbot · 2026-08-04T05:16:47Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

dybucc · 2026-08-10T09:15:04Z

It seems having separate invocations gets the job done just fine. Still, that
was the same thing I tried in the initial patch. The added complexity comes when
we need to get the SemVer tests to pass.

Those seem to me like they're going to need extending (though it's notably less
work than with ctest as it's all in libc-test's build script.)

dybucc · 2026-08-15T15:19:58Z

@rustbot ready

tgross35

Cc @asomers, could you take a look when you get the chance?

View changes since this review

dybucc · 2026-08-21T07:05:48Z

@rustbot ready

tgross35

Also it looks like CI isn't yet passing, currently stuck on style but make sure the FreeBSD tests pass too.

View changes since this review

tgross35 · 2026-08-25T03:43:55Z

+
+            pub use freebsd::netlink::netlink::*;
+            pub use freebsd::netlink::netlink_generic::*;
+        }


Maybe just rename src/new/freebsd/netlink/netlink.rs to netlink_.rs or something, so we can keep the glob export? Think this might be done elsewhere as well.

Just add a comment by the mod netlink_ explaining why it has that name.

I don't think this is a good idea. The new module's directory layout
is meant to provide a fairly accurate mapping between upstream and our
Rust module tree. Starting to allow this type of "exceptions" seems to
me like we're just muddying things up (to eventually be back at having
something as hard to grok as we have now outside new.)

I don't know of prior precedent to this, so we could very well be
already allowing this. Still, considering this is simply to replace an
inline module with the containing reexports, it doesn't seem worth it.

We do have a few exceptions when things don't work well, e.g. if.h is a common header that needs to be named if_.rs because of the keyword. To me it's worth a minor exception to avoid duplicate the API list in new/mod.rs, those should be pretty few and far between. But I won't block on it.

I am guessing you mean to rename the top-level freebsd::netlink
module, as that is the one that is reexported in new's root module. If
so, done.

tgross35 · 2026-08-25T04:27:11Z

+        .skip_union(|_| true)
+        .skip_alias(|_| true)
+        .skip_static(|_| true)
+        .skip_fn(|_| true)
+        .skip_c_enum(|_| true);


These shouldn't be needed anymore right?

I don't think so. IIUC, TestGenerator will parse the Rust files, which
we presently can't restrict to a subset of the codebase. If these are
removed, we'd be setting up test for all the types that are not part of
the netlink module, even if we've only provided the #include for the
netlink interfaces (a few lines above this comment.)

Ah, right, that's inconvenient. Mind adding a comment?

Would be nice if we had a way to restrict to certain modules, feel free to open an issue if you're up to it.

Flawless nerd sniping.

dybucc · 2026-08-28T09:21:07Z

CI fails now because of a recent unused-group lint that was added in
rust-lang/rust#157036. We happen to have macros that add this by
default, but that don't merge them when munching the repr attributes.
Maybe that is the solution, but I have other PR reviews to go through
first, so I can't work on that just yet.

Edit: The CI failures are already being addressed at #5446.

@rustbot ready

tgross35 · 2026-08-31T06:16:23Z

Overall looks pretty good to me, @asomers or original PR author @ydirson would you mind taking a look?

This is an early subset of the Netlink interface, but it proves sufficient for monitoring changes in IP addresses. Coverage can be extended later as needed. See [^1] and [^2]. [^1]: <https://github.com/freebsd/freebsd-src/blob/df9d6403caa6426e92f5e100602f4d2be474bbae/sys/netlink/netlink.h> [^2]: <https://github.com/freebsd/freebsd-src/blob/df9d6403caa6426e92f5e100602f4d2be474bbae/sys/netlink/netlink_generic.h> A small workaround has been necessary in the SemVer tests to ensure we get the right paths to the public submodules for the `netlink/netlink.h` and `netlink/netling_generic.h` interfaces. Those symbols now are prepended a `netlink` super module path. Signed-off-by: Yann Dirson <yann.dirson@vates.fr> Co-authored-by: Yann Dirson <yann.dirson@vates.fr>

Add specific test for `netlink/netlink.h` bindings. This is necessary to avoid conflicts with the bindings for `net/if_mib.h`. libc-test now builds two different `TestGenerator` instances. One of the instances builds tests for the same set of bindings as before this patchset, while the other builds tests only for the `netlink/netlink.h` bindings.

rustbot · 2026-08-31T14:33:04Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

rustbot added O-bsd O-freebsd S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jul 24, 2026

dybucc mentioned this pull request Jul 24, 2026

Netlink support for FreeBSD 13.2 #3201

Closed

2 tasks

dybucc force-pushed the freebsd-netlink branch from f53fbf1 to c7886ff Compare July 27, 2026 06:28

rustbot added the A-CI Area: CI-related items label Jul 27, 2026

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch 3 times, most recently from 653f197 to 0b6bb29 Compare July 29, 2026 07:34

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch from 0b6bb29 to 8e32ec4 Compare July 29, 2026 07:57

tgross35 mentioned this pull request Jul 31, 2026

ctest support for conflicting headers #5344

Open

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Aug 4, 2026

mbyx mentioned this pull request Aug 4, 2026

ctest: Check public API in modules #5365

Open

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch from 8e32ec4 to 8a14b9b Compare August 8, 2026 11:57

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch from a6a6a8d to 266acdf Compare August 10, 2026 06:10

This comment has been minimized.

Sign in to view

tgross35 reviewed Aug 10, 2026

View reviewed changes

Comment thread libc-test/build/main.rs Outdated

Comment thread libc-test/build/main.rs Outdated

Comment thread src/new/freebsd/netlink/mod.rs Outdated

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch 2 times, most recently from 745bf15 to be6cc74 Compare August 12, 2026 07:14

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Aug 15, 2026

tgross35 requested changes Aug 20, 2026

View reviewed changes

Comment thread libc-test/build/main.rs Outdated

Comment thread libc-test/build/main.rs Outdated

Comment thread src/new/freebsd/netlink/mod.rs Outdated

Comment thread src/new/freebsd/netlink/netlink_generic.rs Outdated

Comment thread src/new/mod.rs Outdated

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Aug 20, 2026

dybucc force-pushed the freebsd-netlink branch from be6cc74 to 09bbab3 Compare August 20, 2026 16:05

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch from 09bbab3 to d22b942 Compare August 21, 2026 07:05

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Aug 21, 2026

tgross35 requested changes Aug 25, 2026

View reviewed changes

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Aug 25, 2026

dybucc force-pushed the freebsd-netlink branch from d22b942 to fe70cbd Compare August 28, 2026 08:56

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Aug 28, 2026

dybucc force-pushed the freebsd-netlink branch from fe70cbd to 422946e Compare August 30, 2026 13:39

This comment has been minimized.

Sign in to view

dybucc force-pushed the freebsd-netlink branch from 422946e to 6c80d96 Compare August 30, 2026 13:52

dybucc and others added 2 commits August 31, 2026 16:29

dybucc force-pushed the freebsd-netlink branch from 6c80d96 to a030f33 Compare August 31, 2026 14:33

tgross35 added the S-waiting-on-maintainer label Aug 31, 2026

Uh oh!

Conversation

dybucc commented Jul 24, 2026 • edited by tgross35 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Footnotes

Uh oh!

This comment has been minimized.

This comment has been minimized.

tgross35 commented Jul 31, 2026

Uh oh!

dybucc commented Jul 31, 2026

Uh oh!

tgross35 commented Aug 4, 2026

Uh oh!

tgross35 commented Aug 4, 2026

Uh oh!

rustbot commented Aug 4, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

dybucc commented Aug 10, 2026

Uh oh!

This comment has been minimized.

dybucc commented Aug 15, 2026

Uh oh!

tgross35 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

dybucc commented Aug 21, 2026

Uh oh!

tgross35 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tgross35 Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

dybucc Aug 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgross35 Aug 31, 2026

Choose a reason for hiding this comment

Uh oh!

dybucc Aug 31, 2026

Choose a reason for hiding this comment

Uh oh!

tgross35 Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

dybucc Aug 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgross35 Aug 31, 2026

Choose a reason for hiding this comment

Uh oh!

dybucc Aug 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dybucc commented Aug 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

dybucc commented Jul 24, 2026 •

edited by tgross35

Loading

tgross35 left a comment •

edited by rustbot

Loading

tgross35 left a comment •

edited by rustbot

Loading

dybucc Aug 28, 2026 •

edited

Loading

dybucc Aug 28, 2026 •

edited

Loading

dybucc commented Aug 28, 2026 •

edited

Loading