Unified all Linux sockopts definitions by arch #2135

zonyitoo · 2021-03-31T02:10:38Z

ref Missing SO_INCOMING_CPU compiling with armv7-unknown-linux-musleabi socket2#213

rust-highfive · 2021-03-31T02:10:40Z

(rust-highfive has picked a reviewer for you, use r? to override)

JohnTitor

I think we can declare SO_INCOMING_CPU as 49 on musl and uclibc regardless of the arch, cannot we? I'd like to declare this on linux/mod.rs with a cfg for the sparc targets.

src/unix/linux_like/linux/gnu/b32/sparc/mod.rs

zonyitoo · 2021-03-31T09:35:53Z

I think we can declare SO_INCOMING_CPU as 49 on musl and uclibc regardless of the arch, cannot we? I'd like to declare this on linux/mod.rs with a cfg for the sparc targets.

I wouldn't suggest that. Because there still have other targets, like parisc, have different values of SO_INCOMING_CPU.

JohnTitor · 2021-03-31T09:43:43Z

What the target depends on parisc? AFAIK sparc and parisc have a different value but other arch/env has 49 as a value so it shouldn't be difficult to gate with cfg.

zonyitoo · 2021-03-31T09:52:02Z

I have no idea. I don't know if there are other arch/env has different values right now or in the future.

Anyway, I am not familiar with uClibc. I just downloaded its latest release and couldn't find any related definition about SO_INCOMING_CPU. Could we make an accumption that this value is only defined in Linux Kernal headers?

JohnTitor · 2021-03-31T10:53:55Z

Creating PRs one by one to fix builds is not reasonable, and not gating it with a cfg or defining it for all linux_like/linux targets at once increases review/maintenance costs. And I'm not sure why you put it to each uclibc file instead of mod.rs as it should be the same value for all the uclibc from what I see https://doc.rust-lang.org/nightly/rustc/platform-support.html.

zonyitoo · 2021-03-31T11:02:34Z

cfg_if! {
    if #[cfg(target_arch = "parisc")] {
        // arch/parisc/include/uapi/asm/socket.h
        pub const SO_INCOMING_CPU = 0x402A;
    } else if #[cfg(target_arch = "sparc")] {
        // arch/sparc/include/uapi/asm/socket.h
        pub const SO_INCOMING_CPU = 0x0033;
    } else {
        // include/uapi/asm-generic/socket.h
        // arch/alpha/include/uapi/asm/socket.h
        // tools/include/uapi/asm-generic/socket.h
        // arch/mips/include/uapi/asm/socket.h
        pub const SO_INCOMING_CPU = 49;
    }
}

Should I put this block in linux/mod.rs and delete all SO_INCOMING_CPU in subdirectories?

JohnTitor · 2021-03-31T11:19:31Z

AFAIK we don't have any parisc arch targets so the first cfg is meaningless, right? And the second cfg doesn't catch sparc64 but it should, I think. Once it's done, yeah, we can clean-up it from subdirs. If something is wrong, CI will catch it (if the target is tested) so let's give it a try.

zonyitoo · 2021-04-01T05:28:04Z

This commit:

Moved all SO_* and SOL_SOCKET from folders separated by env to arch
Copy all latest definitions from socket.h on Linux's master branch

JohnTitor · 2021-04-01T11:38:30Z

Oh, I just mean we clean-up SO_INCOMING_CPU only, but it's now great clean-up. I really need #2109 to get merged first, to ensure all the things aren't broken...
Meanwhile, let's @bors try to see if the build is fine.

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213

bors · 2021-04-01T11:38:39Z

⌛ Trying commit 9733ded with merge 2ccc2f4...

bors · 2021-04-01T11:40:22Z

💔 Test failed - checks-actions

zonyitoo · 2021-04-01T14:19:16Z

Ah... Ok. Well, you can just merge #2109 and I will rebase my branch.

This is quite a big change. I have checked several times with my eyes but ... you should double check again.

zonyitoo · 2021-04-01T14:20:08Z

What does this build fail mean?

JohnTitor · 2021-04-01T14:46:58Z

What does this build fail mean?

That's because Cirrus CI re-scheduled the jobs, @bors try

bors · 2021-04-01T14:47:07Z

⌛ Trying commit 9733ded with merge 214ce87...

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213

bors · 2021-04-01T16:21:37Z

💔 Test failed - checks-actions

JohnTitor · 2021-04-02T15:35:57Z

The failure is:

error: use of deprecated type alias `unix::linux_like::linux::musl::time_t`: This type is changed to 64-bit in musl 1.2.0, we'll follow that change in the future release. See #1848 for more info.
  --> src/unix/linux_like/linux/arch/mips/b32.rs:5:18
   |
5  |     if size_of::<::time_t>() == size_of::<::c_long>() {
   |                  ^^^^^^^^
   |
note: the lint level is defined here
  --> src/lib.rs:18:38
   |
18 | #![cfg_attr(libc_deny_warnings, deny(warnings))]
   |                                      ^^^^^^^^
   = note: `#[deny(deprecated)]` implied by `#[deny(warnings)]`

error: use of deprecated type alias `unix::linux_like::linux::musl::time_t`: This type is changed to 64-bit in musl 1.2.0, we'll follow that change in the future release. See #1848 for more info.
  --> src/unix/linux_like/linux/arch/mips/b32.rs:11:18
   |
11 |     if size_of::<::time_t>() == size_of::<::c_long>() {
   |                  ^^^^^^^^

error: use of deprecated type alias `unix::linux_like::linux::musl::time_t`: This type is changed to 64-bit in musl 1.2.0, we'll follow that change in the future release. See #1848 for more info.
  --> src/unix/linux_like/linux/arch/mips/b32.rs:17:18
   |
17 |     if size_of::<::time_t>() == size_of::<::c_long>() {
   |                  ^^^^^^^^

error: use of deprecated type alias `unix::linux_like::linux::musl::time_t`: This type is changed to 64-bit in musl 1.2.0, we'll follow that change in the future release. See #1848 for more info.
  --> src/unix/linux_like/linux/arch/mips/b32.rs:24:18
   |
24 |     if size_of::<::time_t>() == size_of::<::c_long>() {
   |                  ^^^^^^^^

error: use of deprecated type alias `unix::linux_like::linux::musl::time_t`: This type is changed to 64-bit in musl 1.2.0, we'll follow that change in the future release. See #1848 for more info.
  --> src/unix/linux_like/linux/arch/mips/b32.rs:30:18
   |
30 |     if size_of::<::time_t>() == size_of::<::c_long>() {
   |                  ^^^^^^^^

error: aborting due to 5 previous errors

error: could not compile `libc`

We should allow it.

zonyitoo · 2021-04-02T15:48:24Z

Oh, you have merged that regression-test PR. Shoudl I rebase it?

JohnTitor · 2021-04-02T15:49:34Z

It's unnecessary; bors automatically rebases to master.

zonyitoo · 2021-04-02T15:50:44Z

I tried to rebase locally without any conflicts.

JohnTitor · 2021-04-02T15:59:56Z

It shouldn't have any conflicts, I mean, there's no need to rebase but you can if you like (or if you want to run it on your local).

JohnTitor · 2021-04-02T16:01:17Z

@bors try -- let's check it anyway.

zonyitoo · 2021-04-02T19:43:04Z

@bors try

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213

bors · 2021-04-02T19:43:11Z

⌛ Trying commit 7ed1544 with merge e786d3a...

bors · 2021-04-02T20:52:09Z

☀️ Try build successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Build commit: e786d3a (e786d3ae11117f04ee013060a8af48bfc5180393)

zonyitoo · 2021-04-05T08:53:38Z

@JohnTitor I think it is ready to be merged.

src/unix/linux_like/linux/arch/generic/b32.rs

- fixed other missing SO_INCOMING_CPU definition in rust-lang/socket2#213

zonyitoo · 2021-04-05T14:46:40Z

@bors try

bors · 2021-04-05T14:46:46Z

⌛ Trying commit 682eba6 with merge bf574cf...

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213 Fixes #2133

bors · 2021-04-05T17:16:47Z

💥 Test timed out

JohnTitor · 2021-04-05T17:23:30Z

Seems GHA won't start their jobs.
Related Zulip topic: https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Homu.20Stuck.3F
I'm holding off this until it's resolved.

JohnTitor · 2021-04-05T21:26:19Z

@bors try

bors · 2021-04-05T21:26:26Z

⌛ Trying commit 682eba6 with merge 5f8c790...

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213 Fixes #2133

bors · 2021-04-05T22:26:34Z

☀️ Try build successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Build commit: 5f8c790 (5f8c790892a77fe623b78f128840a23cd7d78a0a)

JohnTitor · 2021-04-05T23:56:33Z

Awesome, thanks for the clean-up!
@bors r+

bors · 2021-04-05T23:56:34Z

📌 Commit 682eba6 has been approved by JohnTitor

bors · 2021-04-05T23:56:40Z

⌛ Testing commit 682eba6 with merge ac494b1...

bors · 2021-04-06T00:55:46Z

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing ac494b1 to master...

Thomasdezeeuw · 2021-04-06T09:56:40Z

Thanks for doing this @zonyitoo.

rust-highfive assigned JohnTitor Mar 31, 2021

rust-highfive added the S-waiting-on-review label Mar 31, 2021

JohnTitor requested changes Mar 31, 2021

View reviewed changes

src/unix/linux_like/linux/gnu/b32/sparc/mod.rs Outdated Show resolved Hide resolved

zonyitoo changed the title ~~Add define SO_INCOMING_CPU for linux-like gnu & musl~~ Add define SO_INCOMING_CPU for linux-like gnu & musl & uclibc Mar 31, 2021

zonyitoo changed the title ~~Add define SO_INCOMING_CPU for linux-like gnu & musl & uclibc~~ Unified all Linux sockopts definitions by arch Apr 1, 2021

bors added a commit that referenced this pull request Apr 1, 2021

Auto merge of #2135 - zonyitoo:master, r=<try>

2ccc2f4

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213

bors added a commit that referenced this pull request Apr 1, 2021

Auto merge of #2135 - zonyitoo:master, r=<try>

214ce87

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213

Thomasdezeeuw mentioned this pull request Apr 2, 2021

Missing SO_INCOMING_CPU compiling with armv7-unknown-linux-musleabi rust-lang/socket2#213

Closed

bors added a commit that referenced this pull request Apr 2, 2021

Auto merge of #2135 - zonyitoo:master, r=<try>

e786d3a

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213

JohnTitor reviewed Apr 5, 2021

View reviewed changes

src/unix/linux_like/linux/arch/generic/b32.rs Outdated Show resolved Hide resolved

Unified all Linux sockopts definitions by arch

682eba6

- fixed other missing SO_INCOMING_CPU definition in rust-lang/socket2#213

bors added a commit that referenced this pull request Apr 5, 2021

Auto merge of #2135 - zonyitoo:master, r=<try>

bf574cf

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213 Fixes #2133

JohnTitor closed this Apr 5, 2021

JohnTitor reopened this Apr 5, 2021

bors added a commit that referenced this pull request Apr 5, 2021

Auto merge of #2135 - zonyitoo:master, r=<try>

5f8c790

Unified all Linux sockopts definitions by arch - ref rust-lang/socket2#213 Fixes #2133

JohnTitor approved these changes Apr 5, 2021

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Apr 5, 2021

bors merged commit ac494b1 into rust-lang:master Apr 6, 2021

messense mentioned this pull request Jun 27, 2021

cannot find value SO_INCOMING_CPU in crate libc rust-cross/rust-musl-cross#38

Closed

tammela mentioned this pull request Sep 5, 2024

Uncommenting SO_PREFER_BUSY_POLL and SO_BUSY_POLL_BUDGET #3896

Closed

tgross35 mentioned this pull request Sep 30, 2024

Add SO_PREFER_BUSY_POLL and SO_BUSY_POLL_BUDGET #3917

Open

Unified all Linux sockopts definitions by arch #2135

Unified all Linux sockopts definitions by arch #2135

Conversation

zonyitoo commented Mar 31, 2021 • edited by JohnTitor Loading

rust-highfive commented Mar 31, 2021

JohnTitor left a comment

Choose a reason for hiding this comment

zonyitoo commented Mar 31, 2021 • edited Loading

JohnTitor commented Mar 31, 2021

zonyitoo commented Mar 31, 2021

JohnTitor commented Mar 31, 2021

zonyitoo commented Mar 31, 2021 • edited Loading

JohnTitor commented Mar 31, 2021

zonyitoo commented Apr 1, 2021

JohnTitor commented Apr 1, 2021

bors commented Apr 1, 2021

bors commented Apr 1, 2021

zonyitoo commented Apr 1, 2021

zonyitoo commented Apr 1, 2021

JohnTitor commented Apr 1, 2021

bors commented Apr 1, 2021

bors commented Apr 1, 2021

JohnTitor commented Apr 2, 2021 • edited Loading

zonyitoo commented Apr 2, 2021

JohnTitor commented Apr 2, 2021

zonyitoo commented Apr 2, 2021

JohnTitor commented Apr 2, 2021

JohnTitor commented Apr 2, 2021

zonyitoo commented Apr 2, 2021

bors commented Apr 2, 2021

bors commented Apr 2, 2021

zonyitoo commented Apr 5, 2021

zonyitoo commented Apr 5, 2021

bors commented Apr 5, 2021

bors commented Apr 5, 2021

JohnTitor commented Apr 5, 2021 • edited Loading

JohnTitor commented Apr 5, 2021

bors commented Apr 5, 2021

bors commented Apr 5, 2021

JohnTitor commented Apr 5, 2021

bors commented Apr 5, 2021

bors commented Apr 5, 2021

bors commented Apr 6, 2021

Thomasdezeeuw commented Apr 6, 2021

zonyitoo commented Mar 31, 2021 •

edited by JohnTitor

Loading

zonyitoo commented Mar 31, 2021 •

edited

Loading

zonyitoo commented Mar 31, 2021 •

edited

Loading

JohnTitor commented Apr 2, 2021 •

edited

Loading

JohnTitor commented Apr 5, 2021 •

edited

Loading