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 if_xdp.h structs and constants and add SOL_XDP to musl #3453

Merged
merged 2 commits into from
Dec 10, 2023

Conversation

arctic-alpaca
Copy link
Contributor

Hi,

this PR adds constants and structs from if_xdp.h for use with AF_XDP. It also adds SOL_XDP to musl which was missing before.

I'm not sure whether the location I added the code is correct, I just edited the files where the AF_XDP constant was defined.

Some of the structs were changed between their initial release in the kernel and the current version. For those, _v1 structs have been added for backwards compatibility.

@rustbot
Copy link
Collaborator

rustbot commented Nov 27, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2023

📌 Commit 988dbf9 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Nov 30, 2023

⌛ Testing commit 988dbf9 with merge 60def87...

bors added a commit that referenced this pull request Nov 30, 2023
Add `if_xdp.h` structs and constants and add `SOL_XDP` to musl

Hi,

this PR adds constants and structs from `if_xdp.h` for use with [`AF_XDP`](https://www.kernel.org/doc/html/latest/networking/af_xdp.html). It also adds `SOL_XDP` to musl which was missing before.

I'm not sure whether the location I added the code is correct, I just edited the files where the `AF_XDP` constant was defined.

Some of the structs were changed between their initial release in the kernel and the current version. For those, `_v1` structs have been added for backwards compatibility.
@bors
Copy link
Contributor

bors commented Nov 30, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Dec 1, 2023

⌛ Testing commit 988dbf9 with merge f82a11e...

bors added a commit that referenced this pull request Dec 1, 2023
Add `if_xdp.h` structs and constants and add `SOL_XDP` to musl

Hi,

this PR adds constants and structs from `if_xdp.h` for use with [`AF_XDP`](https://www.kernel.org/doc/html/latest/networking/af_xdp.html). It also adds `SOL_XDP` to musl which was missing before.

I'm not sure whether the location I added the code is correct, I just edited the files where the `AF_XDP` constant was defined.

Some of the structs were changed between their initial release in the kernel and the current version. For those, `_v1` structs have been added for backwards compatibility.
@bors
Copy link
Contributor

bors commented Dec 1, 2023

💔 Test failed - checks-actions

@arctic-alpaca
Copy link
Contributor Author

The errors seem to indicate the musl tests are using a kernel version before 5.3 and thus the additions and changes with and after 5.3 lead to issues. Is there a way to work around this?

@arctic-alpaca
Copy link
Contributor Author

I somehow blanked on the skip_*() functions in build.rs for a moment. I added the musl skips now.

@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Dec 9, 2023

📌 Commit 771b179 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 9, 2023

⌛ Testing commit 771b179 with merge c4b12eb...

bors added a commit that referenced this pull request Dec 9, 2023
Add `if_xdp.h` structs and constants and add `SOL_XDP` to musl

Hi,

this PR adds constants and structs from `if_xdp.h` for use with [`AF_XDP`](https://www.kernel.org/doc/html/latest/networking/af_xdp.html). It also adds `SOL_XDP` to musl which was missing before.

I'm not sure whether the location I added the code is correct, I just edited the files where the `AF_XDP` constant was defined.

Some of the structs were changed between their initial release in the kernel and the current version. For those, `_v1` structs have been added for backwards compatibility.
@bors
Copy link
Contributor

bors commented Dec 9, 2023

💔 Test failed - checks-actions

Also adds  _v1 versions for backwards compatibility
@arctic-alpaca
Copy link
Contributor Author

I moved the semver changes to the correct file, I hope this is the last fix needed.

@JohnTitor
Copy link
Member

Let's see if it works fine! @bors r+

@bors
Copy link
Contributor

bors commented Dec 10, 2023

📌 Commit 5901514 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 10, 2023

⌛ Testing commit 5901514 with merge c4e3e91...

@bors
Copy link
Contributor

bors commented Dec 10, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing c4e3e91 to main...

@bors bors merged commit c4e3e91 into rust-lang:main Dec 10, 2023
11 checks passed
@arctic-alpaca
Copy link
Contributor Author

@JohnTitor Thanks for your patience! Is there any timeline for the next planned release?

@JohnTitor
Copy link
Member

I'm going to make a new release, one sec!

@arctic-alpaca
Copy link
Contributor Author

Thank you very much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants