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

fix(driver): fix build of kmod on linux 6.10. #1884

Merged
merged 2 commits into from
Jul 10, 2024
Merged

fix(driver): fix build of kmod on linux 6.10. #1884

merged 2 commits into from
Jul 10, 2024

Conversation

FedeDP
Copy link
Contributor

@FedeDP FedeDP commented May 30, 2024

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area driver-kmod

Does this PR require a change in the driver versions?

What this PR does / why we need it:

torvalds/linux@c4aab26, included in linux 6.10-rc1, moved fd_is_open away from an header we can include.
Therefore the proposed patch is to implement ourself the one-liner.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Keeping it as wip until linux 6.10 is nearly released.
I'll use this PR for tests if more changes are needed.

Does this PR introduce a user-facing change?:

fix(driver): fix build of kmod on linux 6.10.

@FedeDP
Copy link
Contributor Author

FedeDP commented May 30, 2024

/milestone next-driver

@poiana poiana added this to the next-driver milestone May 30, 2024
@poiana poiana added the size/XS label May 30, 2024
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@FedeDP
Copy link
Contributor Author

FedeDP commented May 30, 2024

!fd_is_open(close_fd, fdt)
#else
!test_bit(close_fd, fdt->open_fds)
Copy link
Member

Choose a reason for hiding this comment

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

can you add the commit link also here in the code? Thank you!
just asking myself if under the hood all three 3 methods use !test_bit(close_fd, fdt->open_fds) if yes we could directly remove the ifdefs 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That would be too hard to check on any supported kernel unfortunately :/ I'd avoid relying on any assumption :D

LucaGuerra
LucaGuerra previously approved these changes May 31, 2024
@Andreagit97
Copy link
Member

LGTM! I would just add the kernel commit link also in the code not just in the PR

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@FedeDP
Copy link
Contributor Author

FedeDP commented Jun 3, 2024

Done, anyway, let's wait for at least 6.10-rc6 before unholding :)

Copy link
Member

@Andreagit97 Andreagit97 left a comment

Choose a reason for hiding this comment

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

/approve

@poiana
Copy link
Contributor

poiana commented Jun 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Andreagit97, FedeDP, LucaGuerra

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@FedeDP
Copy link
Contributor Author

FedeDP commented Jun 17, 2024

@leogr
Copy link
Member

leogr commented Jun 25, 2024

Hey @FedeDP

What's missing here? 🤔

@FedeDP
Copy link
Contributor Author

FedeDP commented Jun 26, 2024

RC5 still ok: https://github.com/falcosecurity/libs/actions/runs/9675438479/job/26692952935

@FedeDP FedeDP changed the title wip: fix(driver): fix build of kmod on linux 6.10. fix(driver): fix build of kmod on linux 6.10. Jul 10, 2024
@FedeDP
Copy link
Contributor Author

FedeDP commented Jul 10, 2024

Green against rc7: https://github.com/falcosecurity/libs/actions/runs/9869833752/job/27254326144
Removing wip and merging.

@poiana poiana merged commit fa26daf into master Jul 10, 2024
52 checks passed
@poiana poiana deleted the fix/linux_6.10 branch July 10, 2024 07:19
@FedeDP
Copy link
Contributor Author

FedeDP commented Aug 1, 2024

/milestone 7.2.1+driver

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.

5 participants