Dragonfly fixes by chitao1234 · Pull Request #5116 · rust-lang/libc

chitao1234 · 2026-05-26T17:18:02Z

Description

Improve DragonFly BSD support by fixing existing ABI definitions, fix typo'd constant names, fix constant values, moving BSD constants that are not actually generic down into target modules, and adding missing DragonFly constants and libc declarations.

This also expands libc-test coverage for DragonFly and makes the tests handle older DragonFly headers with test-only version skips. The public libc API remains version-independent for DragonFly.

Sources

Primary API references are DragonFly BSD 6.4 release headers, using tag v6.4.0 (commit af5fb9a9e56f90cf51e48514d1874be61e9364e6). The same definitions and test behavior were cross-checked against DragonFly 6.2, 6.0, and 5.8 where older headers differ or omit newer symbols.

ABI/type definitions:

pthread barrier types: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/_pthreadtypes.h
segsz_t: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/types.h
if_msghdr and interface flags: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/net/if.h
ifaddrs.ifa_addrflags: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/ifaddrs.h
kinfo_cputime: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/kinfo.h
mcontext_t: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/cpu/x86_64/include/ucontext.h
regex constants and regoff_t: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/lib/libc/tre-regex/regex.h

Constants and functions:

file and posix_fadvise constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/fcntl.h
sysctl constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/sysctl.h
CPUCTL constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/cpuctl.h
kqueue constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/event.h
socket families: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/socket.h
utmpx constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/utmpx.h
extended attributes: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/extattr.h
getrandom constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/random.h
getnameinfo constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/netdb.h
baud-rate constants: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/termios.h
BPF timeout ioctls: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/net/bpf.h
fdatasync and dup3: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/unistd.h
dlvsym: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/dlfcn.h
reallocarray and qsort_r: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/stdlib.h
pthread affinity APIs: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/include/pthread_np.h
ftok: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/af5fb9a9e56f90cf51e48514d1874be61e9364e6/sys/sys/ipc.h

Checklist

Relevant tests in libc-test/semver have been updated
No placeholder or unstable values like *LAST or *MAX are
included (see #3131)
Tested locally (cd libc-test && cargo test --target mytarget);
especially relevant for platforms that may not be checked in CI

Tested on DragonFly 5.8.3, 6.0.1, 6.2.2, 6.4.2 with self-built Rust/Cargo 1.95.0, Rust 1.95.0 on DragonFly 5.8.3 needs patches.

There is actually a KERN_MAXID, but the same constant is also present and non-deprecated on both nto and apple.

@rustbot label +stable-nominated

rustbot · 2026-05-26T17:18:06Z

Some changes occurred in a NetBSD-like module

cc @semarie

JohnTitor · 2026-06-07T10:54:24Z

Could you extract ctest changes as another PR? It's independent with dragonflyBSD changes.

JohnTitor · 2026-06-07T10:54:41Z

@rustbot author

rustbot · 2026-06-07T10:54:44Z

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

Fix DragonFly type aliases and struct layouts to match current headers, including regex offsets, ifaddrs, pthread barriers, process sizing fields, and mcontext alignment.

chitao1234 · 2026-06-07T16:12:41Z

@rustbot ready

tgross35 · 2026-06-18T02:23:19Z

+            // Kernel-only symbols in DragonFly headers.
+            "DTYPE_VNODE" | "DTYPE_SOCKET" | "DTYPE_PIPE" | "DTYPE_FIFO" | "DTYPE_KQUEUE"
+            | "DTYPE_CRYPTO" | "DTYPE_MQUEUE" | "DTYPE_DMABUF" => true,
+
+            // Not exposed by current DragonFly userland headers.
+            "REG_DUMP"
+            | "REG_ASSERT"
+            | "REG_ATOI"
+            | "REG_ITOA"
+            | "REG_TRACE"
+            | "REG_LARGE"
+            | "IP_ADD_SOURCE_MEMBERSHIP"
+            | "IP_DROP_SOURCE_MEMBERSHIP"
+            | "IP_BLOCK_SOURCE"
+            | "IP_UNBLOCK_SOURCE"
+            | "MAP_RENAME"
+            | "MAP_NORESERVE"
+            | "CTL_UNSPEC"
+            | "KERN_PROF"
+            | "CTL_P1003_1B_UNUSED1"
+            | "CTL_P1003_1B_SEM_VALUE_MAX"
+            | "DOWNTIME"
+            | "SF_CACHE" => true,
+
+            // libc exposes the 6.0-compatible value for this version-dependent mask.
+            "KERN_PROC_FLAGMASK" => true,
+
+            // Renamed in current DragonFly headers.
+            "CPUCTL_RSMSR" | "UTX_DB_LASTLOG" => true,


Since dragonfly is tier 3, you can make the relevant updates in the library (change or delete as needed) rather than adding test skips.

View changes since the review

tgross35 · 2026-06-18T02:36:04Z

+    cfg.skip_roundtrip(move |ty| {
+        matches!(
+            ty,
+            "kvm_t"
+                | "posix_spawnattr_t"
+                | "posix_spawn_file_actions_t"
+                | "umtx_t"
+                | "pmap"
+                | "ip_mreq_source"
+        )
+    });


Could you add a note for why these are skipped?

The match ty { ... } syntax is preferable over matches! since it's easier to add things like version-specific cases if needed.

View changes since the review

tgross35 · 2026-06-18T02:37:29Z

+                if dragonfly_version < 600_000 =>
+            {
+                true
+            }


Is 5.x still in active enough use that this is worth worrying about? Per https://www.dragonflybsd.org/releases/ 5.8 is from 2020 and 6.0 was in 2021.

View changes since the review

tgross35 · 2026-06-18T02:40:35Z

It looks like Dragonfly doesn't have a target maintainer, do you have any interest in being added as one? It's pretty much no commitment, just means that people can ping you in the rare occasion that we stumble across Dragonfly-specific questions.

If so, all you need to do is PR rust-lang/rust adding a dragonfly page in https://github.com/rust-lang/rust/tree/f7da3c0d4b3a4cc291f8c800cc61549d27d14c49/src/doc/rustc/src/platform-support based on the template, and link it from the table at https://github.com/rust-lang/rust/blob/f7da3c0d4b3a4cc291f8c800cc61549d27d14c49/src/doc/rustc/src/platform-support.md.

We're trying to make sure every platform has 1-2 documented maintainers so this would be an awesome help if you are interested!

tgross35 · 2026-06-18T03:42:16Z

For the above,
@rustbot author

rustbot added ctest Issues relating to the ctest crate S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels May 26, 2026

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Jun 7, 2026

chitao1234 added 8 commits June 7, 2026 23:01

dragonfly: correct existing ABI definitions

45f88a1

Fix DragonFly type aliases and struct layouts to match current headers, including regex offsets, ifaddrs, pthread barriers, process sizing fields, and mcontext alignment.

bsd: move target-specific regex and getrandom constants

a420bef

dragonfly: add compatibility aliases for renamed constants

8a526da

dragonfly: correct existing constant values

b687440

dragonfly: add missing constants

27f68a0

dragonfly: add missing libc functions

dacc884

libc-test: expand DragonFly coverage

a315423

style: fix DragonFly CI checks

84ff852

chitao1234 force-pushed the dragonfly-fixes branch from ef2e8b4 to 84ff852 Compare June 7, 2026 15:51

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Jun 7, 2026

JohnTitor removed the ctest Issues relating to the ctest crate label Jun 15, 2026

tgross35 reviewed Jun 18, 2026

View reviewed changes

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Jun 18, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dragonfly fixes#5116

Dragonfly fixes#5116
chitao1234 wants to merge 8 commits into
rust-lang:mainfrom
chitao1234:dragonfly-fixes

chitao1234 commented May 26, 2026

Uh oh!

rustbot commented May 26, 2026

Uh oh!

JohnTitor commented Jun 7, 2026

Uh oh!

JohnTitor commented Jun 7, 2026

Uh oh!

rustbot commented Jun 7, 2026

Uh oh!

chitao1234 commented Jun 7, 2026

Uh oh!

tgross35 Jun 18, 2026 •

edited by rustbot

Loading

Uh oh!

tgross35 Jun 18, 2026 •

edited by rustbot

Loading

Uh oh!

tgross35 Jun 18, 2026 •

edited by rustbot

Loading

Uh oh!

tgross35 commented Jun 18, 2026

Uh oh!

tgross35 commented Jun 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

chitao1234 commented May 26, 2026

Description

Sources

Checklist

Uh oh!

rustbot commented May 26, 2026

Uh oh!

JohnTitor commented Jun 7, 2026

Uh oh!

JohnTitor commented Jun 7, 2026

Uh oh!

rustbot commented Jun 7, 2026

Uh oh!

chitao1234 commented Jun 7, 2026

Uh oh!

tgross35 Jun 18, 2026 • 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!

tgross35 Jun 18, 2026 • 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!

tgross35 Jun 18, 2026 • 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!

tgross35 commented Jun 18, 2026

Uh oh!

tgross35 commented Jun 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

tgross35 Jun 18, 2026 •

edited by rustbot

Loading

tgross35 Jun 18, 2026 •

edited by rustbot

Loading

tgross35 Jun 18, 2026 •

edited by rustbot

Loading