Skip to content

FreeBSD ktls fixes #4552

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

Jump to bottom
Merged
merged 5 commits into from
Aug 10, 2025
Merged

FreeBSD ktls fixes #4552

merged 5 commits into from
Aug 10, 2025

Conversation

neuschaefer
Copy link
Contributor

Description

This PR fixes two minor incompatibilities that I found by running libc-test on FreeBSD 15-CURRENT on ppc64 (big endian).

Sources

freebsd/freebsd-src@c9e9a0f

Checklist

  • Relevant tests in libc-test/semver have been updated (no symbols changed)
  • 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

@neuschaefer neuschaefer mentioned this pull request Jul 16, 2025
Merged
3 tasks
@tgross35
Copy link
Contributor

This lgtm, @asomers could you also review?

@asomers
Copy link
Contributor

asomers commented Jul 24, 2025

Check with @kostikbel . I think he may have chosen "gennum" instead of "gen" for a good reason.

@neuschaefer
Copy link
Contributor Author

Check with @kostikbel . I think he may have chosen "gennum" instead of "gen" for a good reason.

I'd be interested in hearing the reason (and preferably having it documented in freebsd/mod.rs) for deviating from the upstream field name.

@kostikbel
Copy link
Contributor

Check with @kostikbel . I think he may have chosen "gennum" instead of "gen" for a good reason.

I'd be interested in hearing the reason (and preferably having it documented in freebsd/mod.rs) for deviating from the upstream field name.

Because gen is the reserved keyword in rust since 2024 edition?

@tgross35 tgross35 added this pull request to the merge queue Aug 10, 2025
Merged via the queue into rust-lang:main with commit e2404b4 Aug 10, 2025
48 of 52 checks passed
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Aug 11, 2025
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd: Fix type of struct xktls_session_onedir, field ifnet
304c12b 
For the upstream definition, see:

freebsd/freebsd-src@c9e9a0f

(backport <rust-lang#4552>)
(cherry picked from commit 985d95b)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd: Document avoidance of reserved name gen
ad88dda 
(backport <rust-lang#4552>)
(cherry picked from commit 99e3373)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
libc-test: Account for xktls_session_onedir::gen (freebsd)
e834c60 
(backport <rust-lang#4552>)
(cherry picked from commit 56a04ab)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
libc-test: include sys/ktls.h on freebsd
de81546 
<sys/ktls.h> is necessary in order to find the xktls_* structs.

See also:

freebsd/freebsd-src@c9e9a0f

(backport <rust-lang#4552>)
(cherry picked from commit 4147a8b)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd15: Add ki_uerrmsg to struct kinfo_proc
99e868d 
Upstream commit:

freebsd/freebsd-src@7212b37

(backport <rust-lang#4552>)
(cherry picked from commit e2404b4)
@tgross35 tgross35 mentioned this pull request Aug 11, 2025
Merged
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd: Fix type of struct xktls_session_onedir, field ifnet
20476f2 
For the upstream definition, see:

freebsd/freebsd-src@c9e9a0f

(backport <rust-lang#4552>)
(cherry picked from commit 985d95b)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd: Document avoidance of reserved name gen
9f3d6cf 
(backport <rust-lang#4552>)
(cherry picked from commit 99e3373)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
libc-test: Account for xktls_session_onedir::gen (freebsd)
57adc47 
(backport <rust-lang#4552>)
(cherry picked from commit 56a04ab)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
libc-test: include sys/ktls.h on freebsd
2a1f8fb 
<sys/ktls.h> is necessary in order to find the xktls_* structs.

See also:

freebsd/freebsd-src@c9e9a0f

(backport <rust-lang#4552>)
(cherry picked from commit 4147a8b)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd15: Add ki_uerrmsg to struct kinfo_proc
0b2b433 
Upstream commit:

freebsd/freebsd-src@7212b37

(backport <rust-lang#4552>)
(cherry picked from commit e2404b4)
github-merge-queue bot pushed a commit that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd: Fix type of struct xktls_session_onedir, field ifnet
7cdcaa6 
For the upstream definition, see:

freebsd/freebsd-src@c9e9a0f

(backport <#4552>)
(cherry picked from commit 985d95b)
github-merge-queue bot pushed a commit that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd: Document avoidance of reserved name gen
4cc1bf4 
(backport <#4552>)
(cherry picked from commit 99e3373)
github-merge-queue bot pushed a commit that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
libc-test: Account for xktls_session_onedir::gen (freebsd)
adfe283 
(backport <#4552>)
(cherry picked from commit 56a04ab)
github-merge-queue bot pushed a commit that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
libc-test: include sys/ktls.h on freebsd
2816bc2 
<sys/ktls.h> is necessary in order to find the xktls_* structs.

See also:

freebsd/freebsd-src@c9e9a0f

(backport <#4552>)
(cherry picked from commit 4147a8b)
github-merge-queue bot pushed a commit that referenced this pull request Aug 11, 2025
@neuschaefer @tgross35
freebsd15: Add ki_uerrmsg to struct kinfo_proc
9606a29 
Upstream commit:

freebsd/freebsd-src@7212b37

(backport <#4552>)
(cherry picked from commit e2404b4)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Aug 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgross35 tgross35 tgross35 approved these changes

+1 more reviewer

@kostikbel kostikbel kostikbel approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
O-unix stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@neuschaefer @tgross35 @asomers @kostikbel @rustbot