FreeBSD: Support kernel-offloaded TLS TCP by kostikbel · Pull Request #4482 · rust-lang/libc

kostikbel · 2025-06-10T01:05:51Z

Description

The PR adds definitions for kernel-offloaded TLS TCP session information sysctls. It is used by the utility to list kTLS connections https://github.com/kostikbel/ktcplist

Sources

https://github.com/freebsd/freebsd-src/blob/4078e0d1d6f8189bff44fcad04df256220035f76/sys/sys/ktls.h
freebsd/freebsd-src@c9e9a0f

@rustbot label +stable-nominated

kostikbel · 2025-06-10T09:06:08Z

For nightly freebsd-15 ci task to success, you would need to update the ci freebsd env with the new headers.

I have no idea why freebsd-13 is failing.

tgross35 · 2025-06-16T06:38:48Z

@asomers would you mind reviewing this since it's FreeBSD?

For nightly freebsd-15 ci task to success, you would need to update the ci freebsd env with the new headers.

If there is a version bump available, feel freeto submit a PR updating it.

I'm not sure about freebsd-13 either, ctest seems extremely flaky on that target.

kostikbel · 2025-06-16T08:58:03Z

For nightly freebsd-15 ci task to success, you would need to update the ci freebsd env with the new headers.

If there is a version bump available, feel freeto submit a PR updating it.

Is there an existing example of the PR with such update?

tgross35 · 2025-06-16T09:01:12Z

You just want to update a minor freebsd version? I don't know one off the top of my head but it shouldn't be too hard, the FreeBSD CI config is in https://github.com/rust-lang/libc/blob/9c8cd59b2367ce9cd5acd6247c3764cdf670a9f8/.cirrus.yml

asomers · 2025-06-16T12:24:38Z

If there is a version bump available, feel freeto submit a PR updating it.

Our CI config uses the latest FreeBSD 15 snapshot on GCE. So we don't need to do anything. If we just wait, GCE will have the latest release soon enough.

asomers

Cool project, kib! I look forward to trying it.

asomers · 2025-06-16T12:30:24Z

src/unix/bsd/freebsdlike/freebsd/mod.rs

+        pub _xig_spare32: u32,
+        pub xig_gen: inp_gen_t,
+        pub xig_sogen: so_gen_t,
+        pub _xig_spare64: [u64; 4],


The convention used elsewhere in libc is to make spare and padding fields private. The forces consumers to initialize with mem::zeroed, but it also makes it easier for future versions of libc to replace those spare fields with no backwards-compatibility problems.

Suggested change

pub _xig_spare32: u32,

pub xig_gen: inp_gen_t,

pub xig_sogen: so_gen_t,

pub _xig_spare64: [u64; 4],

_xig_spare32: u32,

pub xig_gen: inp_gen_t,

pub xig_sogen: so_gen_t,

_xig_spare64: [u64; 4],

asomers · 2025-06-16T12:30:38Z

src/unix/bsd/freebsdlike/freebsd/mod.rs

+    }
+
+    pub struct in_addr_4in6 {
+        pub ia46_pad32: [u32; 3],


Suggested change

pub ia46_pad32: [u32; 3],

ia46_pad32: [u32; 3],

asomers · 2025-06-16T12:37:44Z

src/unix/bsd/freebsdlike/freebsd/mod.rs

+        pub inp_gencnt: u64,
+        pub so_pcb: kvaddr_t,
+        pub coninf: crate::in_conninfo,
+        pub rx_vlan_id: c_short,


Suggested change

pub rx_vlan_id: c_short,

pub rx_vlan_id: c_ushort,

kostikbel · 2025-06-23T17:35:23Z

Could you please push this?

tgross35 · 2025-06-25T21:43:41Z

I rebased this to pick up a new set of CI runs since one thing was fixed. The FreeBSD-15 and FreeBSD-13 x86-64 jobs are spurious, but the FreeBSD-13 i686 "bad xinpgen align: rust: 4 (0x4) != c 8 (0x8)" message looks legit. Is one of these fields actually a different size on 32-bit?

asomers · 2025-06-25T22:07:53Z

src/unix/bsd/freebsdlike/freebsd/mod.rs

        __spare__: [c_int; 4],
    }
+
+    pub struct xinpgen {


I think this will fix the latest test failure on i386.

Suggested change

pub struct xinpgen {

#[repr(align(8)]

pub struct xinpgen {

Right, can I still update the branch, or should the change be a fixup?

kostikbel · 2025-06-25T22:19:12Z

I rebased this to pick up a new set of CI runs since one thing was fixed. The FreeBSD-15 and FreeBSD-13 x86-64 jobs are spurious, but the FreeBSD-13 i686 "bad xinpgen align: rust: 4 (0x4) != c 8 (0x8)" message looks legit. Is one of these fields actually a different size on 32-bit?

Hm, no. The reason for the message is the attribute of the C structure, declaring 8-bytes alignment.
See https://github.com/freebsd/freebsd-src/blob/cd0169c9379c400ec75b77e87ca770e37f964276/sys/netinet/in_pcb.h#L296

Would it be enough to add
#[repr(C, align(8))]
before the structure?

tgross35 · 2025-06-25T22:21:57Z

You don't need to include C since that's added by default for everything in the macro, but #[repr(align(8))] should work!

kostikbel · 2025-06-25T22:43:12Z

You don't need to include C since that's added by default for everything in the macro, but #[repr(align(8))] should work!

So I added a commit with the align. If you want me to squash, please say so.

tgross35

Thanks! No need to squash everything to one but if you combine the align fix with whatever added the struct, that would make a bit more clean cherry pick.

…older

kostikbel · 2025-06-26T02:39:16Z

Thanks! No need to squash everything to one but if you combine the align fix with whatever added the struct, that would make a bit more clean cherry pick.

Squashed just the fix.

tgross35 · 2025-06-26T02:49:31Z

Thanks!

(backport <rust-lang#4482>) (cherry picked from commit 8443057)

(backport <rust-lang#4482>) (cherry picked from commit 7d2a695)

(backport <rust-lang#4482>) (cherry picked from commit 34e3b14)

(backport <rust-lang#4482>) (cherry picked from commit 9220aac)

…older (backport <rust-lang#4482>) (cherry picked from commit db4dba7)

(backport <#4482>) (cherry picked from commit 8443057)

(backport <#4482>) (cherry picked from commit 7d2a695)

(backport <#4482>) (cherry picked from commit 34e3b14)

(backport <#4482>) (cherry picked from commit 9220aac)

…older (backport <#4482>) (cherry picked from commit db4dba7)

rustbot added O-unix S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jun 10, 2025

kostikbel force-pushed the ktls branch 5 times, most recently from b60cffa to 7e42c78 Compare June 10, 2025 08:10

asomers suggested changes Jun 16, 2025

View reviewed changes

kostikbel force-pushed the ktls branch from 7e42c78 to 087c5de Compare June 16, 2025 15:27

asomers approved these changes Jun 16, 2025

View reviewed changes

tgross35 force-pushed the ktls branch from 087c5de to 462c853 Compare June 25, 2025 19:15

libc-test/build.rs: add netinet/in_pcb.h to the list of FreeBSD headers

8443057

asomers reviewed Jun 25, 2025

View reviewed changes

kostikbel force-pushed the ktls branch from 462c853 to b31a5d0 Compare June 25, 2025 22:25

tgross35 approved these changes Jun 25, 2025

View reviewed changes

kostikbel added 4 commits June 26, 2025 04:38

FreeBSD: add xinpgen and related types definitions

7d2a695

FreeBSD: add in_conninfo definition

34e3b14

FreeBSD: add xktls_session definition

9220aac

FreeBSD: skip checking of xktls_session* structs on FreeBSD 14.x and …

db4dba7

…older

kostikbel force-pushed the ktls branch from b31a5d0 to db4dba7 Compare June 26, 2025 01:38

tgross35 changed the title ~~Ktls~~ FreeBSD: Support kernel-offloaded TLS TCP Jun 26, 2025

tgross35 added this pull request to the merge queue Jun 26, 2025

Merged via the queue into rust-lang:main with commit ec44bd2 Jun 26, 2025
50 of 51 checks passed

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025

libc-test/build.rs: add netinet/in_pcb.h to the list of FreeBSD headers

7b81c94

(backport <rust-lang#4482>) (cherry picked from commit 8443057)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025

FreeBSD: add xinpgen and related types definitions

f5f24e1

(backport <rust-lang#4482>) (cherry picked from commit 7d2a695)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025

FreeBSD: add in_conninfo definition

6854a17

(backport <rust-lang#4482>) (cherry picked from commit 34e3b14)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025

FreeBSD: add xktls_session definition

2c739e2

(backport <rust-lang#4482>) (cherry picked from commit 9220aac)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025

FreeBSD: skip checking of xktls_session* structs on FreeBSD 14.x and …

f66ac71

…older (backport <rust-lang#4482>) (cherry picked from commit db4dba7)

tgross35 mentioned this pull request Jul 29, 2025

[0.2] Backports #4592

Merged

github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025

libc-test/build.rs: add netinet/in_pcb.h to the list of FreeBSD headers

0b79744

(backport <#4482>) (cherry picked from commit 8443057)

github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025

FreeBSD: add xinpgen and related types definitions

f24bd91

(backport <#4482>) (cherry picked from commit 7d2a695)

github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025

FreeBSD: add in_conninfo definition

aa40d69

(backport <#4482>) (cherry picked from commit 34e3b14)

github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025

FreeBSD: add xktls_session definition

f424fb2

(backport <#4482>) (cherry picked from commit 9220aac)

github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025

FreeBSD: skip checking of xktls_session* structs on FreeBSD 14.x and …

1eed8a2

…older (backport <#4482>) (cherry picked from commit db4dba7)

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 Jul 29, 2025

Conversation

kostikbel commented Jun 10, 2025

Description

Sources

Uh oh!

kostikbel commented Jun 10, 2025

Uh oh!

tgross35 commented Jun 16, 2025

Uh oh!

kostikbel commented Jun 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tgross35 commented Jun 16, 2025

Uh oh!

asomers commented Jun 16, 2025

Uh oh!

asomers left a comment

Choose a reason for hiding this comment

Uh oh!

asomers Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

asomers Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

asomers Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

kostikbel commented Jun 23, 2025

Uh oh!

tgross35 commented Jun 25, 2025

Uh oh!

asomers Jun 25, 2025

Choose a reason for hiding this comment

Uh oh!

kostikbel Jun 25, 2025

Choose a reason for hiding this comment

Uh oh!

kostikbel commented Jun 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tgross35 commented Jun 25, 2025

Uh oh!

kostikbel commented Jun 25, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

kostikbel commented Jun 26, 2025

Uh oh!

tgross35 commented Jun 26, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kostikbel commented Jun 16, 2025 •

edited

Loading

kostikbel commented Jun 25, 2025 •

edited

Loading