Skip to content
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.

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

Add SO_PREFER_BUSY_POLL and SO_BUSY_POLL_BUDGET #3917

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

tammela
Copy link
Contributor

@tammela tammela commented Sep 11, 2024

Remove the comment of these socket options.
Reference: https://elixir.bootlin.com/linux/latest/source/include/uapi/asm-generic/socket.h

@rustbot
Copy link
Collaborator

rustbot commented Sep 11, 2024

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@tammela
Copy link
Contributor Author

tammela commented Sep 11, 2024

From the CI results (i686-unknown-linux-musl) it seems like the machine does not have a uapi header with the constant.
They were added in 5.11 and the sanitized headers are in 4.19: https://github.com/rust-lang/libc/blob/main/ci/install-musl.sh#L68

@devnexen
Copy link
Contributor

devnexen commented Sep 11, 2024

for the time being, need to add those constants as exception (for CI), as if musl then ignore those two.

@tammela
Copy link
Contributor Author

tammela commented Sep 12, 2024

@devnexen Got it. I was wondering if someone tried to update the kernel headers for the musl CI.
Alpine uses musl as well and they don't seem to use sabotage-linux headers but rather roll their own (currently targeting 6.6 soon to be 6.10):
https://git.alpinelinux.org/aports/tree/main/linux-headers?h=master

@tammela
Copy link
Contributor Author

tammela commented Sep 12, 2024

I updated the CI to use the alpine headers here: tammela@17af7ba

Seems to be passing the CI scripts, let me know if it's worth the shot and I can open up a PR

@devnexen
Copy link
Contributor

nice, it might be best to create a PR for this musl update alone tough. cc @tgross35

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, no clue why those were commented out but looks like it has been that way since #2135. Anyway lgtm, thanks for including the link.

@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Sep 30, 2024
@tammela
Copy link
Contributor Author

tammela commented Sep 30, 2024

Needs this one to pass CI: #3921

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked stable-nominated This PR should be considered for cherry-pick to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants