linux: add missing netfilter definitions #2876
Conversation
|
r? @Amanieu (rust-highfive has picked a reviewer for you, use r? to override) |
|
The “Docker Linux Tier1” CI run fails like so: So the caveat about musl relying on pre-historic kernel headers Let’s see about those other changes. |
|
You can add exceptions to the tests in |
|
2022-08-16 (Tuesday), ***@***.*** (Amanieu):
You can add exceptions to the tests in `libc-test/build.rs`.
You will see many other cases where exceptions are added due to
old kernel headers in CI. Make sure to mark the kernel version
the constants were introduced in so we can remove the exceptions
when upgrading the CI images.
Thanks for the pointer, I’ll give it a shot and resubmit!
|
phi-gamma
force-pushed
the
netfilter
branch
5 times, most recently
from
1784a2f
to
78a76f8
Compare
src/unix/linux_like/linux/mod.rs
Outdated
| pub const NFNL_SUBSYS_HOOK: ::c_int = 12; | ||
| pub const NFNL_SUBSYS_COUNT: ::c_int = 13; | ||
| } | ||
| } |
There was a problem hiding this comment.
The exception in build.rs should apply to both glibc and musl, so you shouldn't need to add this cfg_if.
There was a problem hiding this comment.
True. I could swear I submitted that in an earlier revision and it resulted in a CI failure,
prompting me to add that cfg_if. Anyways, CI seems to be happy now without it.
|
@bors r+ |
linux: add missing netfilter definitions Bring ``libc`` up to parity with Linux v5.18 headers wrt. to Netfilter. ``libc-test`` fails due to unrelated issues on my Fedora box but the changes should be inocuous enough IMO. Note there’s a warning in the code indicating potential trouble due to [this issue](#1628). I’ll sort this out if the CI run fails.
|
💔 Test failed - checks-actions |
Fill in missing constants available as of Linux v5.18. The relevant UAPI headers are - nfnetlink.h - nfnetlink_log.h - nfnetlink_queue.h
|
2022-08-20 (Saturday), ***@***.*** (bors):
💔 Test failed - [checks-actions](https://github.com/rust-lang/libc/runs/7931592633?check_suite_focus=true)
<!-- homu: {"type":"BuildFailed","builder_url":"https://github.com/rust-lang/libc/runs/7931592633?check_suite_focus=true","builder_name":"checks-actions"} -->
Sigh. Those were introduced with v5.4. Confusingly only
``mips-unknown-linux-gnu`` seems to be affected by this but not
other platforms with older kernels.
Exceptions for those ``NFULA_*`` constants added.
|
@JohnTitor could you clarify what you’re waiting for? I updated the pr to address |
|
Oh, missed you pushed a commit after the failure, @bors r+ |
|
☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14 |
|
Oh, missed you pushed a commit after the failure, @bors r+
No worries, thank you!
|
|
> @@ -2101,15 +2102,31 @@ pub const NFNL_SUBSYS_CTNETLINK_TIMEOUT: ::c_int = 8;
pub const NFNL_SUBSYS_CTHELPER: ::c_int = 9;
pub const NFNL_SUBSYS_NFTABLES: ::c_int = 10;
pub const NFNL_SUBSYS_NFT_COMPAT: ::c_int = 11;
-pub const NFNL_SUBSYS_COUNT: ::c_int = 12;
+cfg_if! {
+ if #[cfg(target_env = "musl")] {
+ // FIXME: CI kernel headers lag bit behind;
+ // NFNL_SUBSYS_HOOK was added with v5.14.
+ pub const NFNL_SUBSYS_COUNT: ::c_int = 12;
+ } else {
+ pub const NFNL_SUBSYS_HOOK: ::c_int = 12;
+ pub const NFNL_SUBSYS_COUNT: ::c_int = 13;
+ }
+}
The exception in build.rs should apply to both glibc and musl, so you shouldn't need to add this cfg_if.
I tried that initially but without the ``cfg_if`` the
*x86_64-unknown-linux-gnu* run fails because of the value
mismatch for ``NFNL_SUBSYS_COUNT``.
|
Bring
libcup to parity with Linux v5.18 headers wrt. to Netfilter.libc-testfails due to unrelated issues on my Fedora box but thechanges should be inocuous enough IMO.
Note there’s a warning in the code indicating potential trouble due to this
issue. I’ll sort this out if
the CI run fails.