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.

Sign up for GitHub

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

Jump to bottom

ipsec: minor cleanups #31390

Merged
merged 2 commits into from
May 31, 2024
Merged

ipsec: minor cleanups #31390

merged 2 commits into from
May 31, 2024

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Mar 14, 2024 •
edited
Loading

Tiny bit of IPsec cleanup, to clarify the usage of the ENCRYPT_MAP and improve the CODEOWNERS scope.

@julianwiedmann julianwiedmann added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. kind/cleanup This includes no functional changes. area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. release-note/misc This PR makes changes that have no direct user impact. feature/ipsec Relates to Cilium's IPsec feature labels Mar 14, 2024
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
Copy link
Member Author

/test

@github-actions GitHub Actions
Copy link

This pull request has been automatically marked as stale because it
has not had recent activity. It will be closed if no further activity
occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. label Apr 15, 2024
@github-actions GitHub Actions
Copy link

This pull request has not seen any activity since it was marked stale.
Closing.

@github-actions github-actions bot closed this Apr 30, 2024
@julianwiedmann julianwiedmann removed the stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. label May 30, 2024
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
bpf: move some ipsec-specific code into encrypt.h
85239c4 
The ENCRYPT_MAP and MAX_KEY_INDEX are only needed by ipsec code.
Maintain them in a single place.

Signed-off-by: Julian Wiedmann <[email protected]>
@julianwiedmann
encrypt: constrain ENCRYPT_MAP to ENABLE_IPSEC
d07e4e0 
The map isn't needed otherwise.

Signed-off-by: Julian Wiedmann <[email protected]>
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann julianwiedmann changed the title bpf: shuffle some IPsec code around ipsec: minor cleanups May 30, 2024
@julianwiedmann julianwiedmann marked this pull request as ready for review May 30, 2024 12:45
@julianwiedmann julianwiedmann requested review from a team as code owners May 30, 2024 12:45
@julianwiedmann julianwiedmann requested review from rgo3 and aditighag May 30, 2024 12:45
rgo3
rgo3 approved these changes May 30, 2024
View reviewed changes
Copy link
Contributor

@rgo3 rgo3 left a comment

Choose a reason for hiding this comment

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

Was wondering if there is already an alternative to ifdevs as part of the clang free work but I'm not aware of anything and in this instance it's probably easy to detect and change through scripting. So LGTM.

jschwinger233
jschwinger233 approved these changes May 31, 2024
View reviewed changes
Copy link
Member

@jschwinger233 jschwinger233 left a comment

Choose a reason for hiding this comment

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

The retrieving device lxc_health: Link not found is just another case of #32689 ?

I did have a second being concerned about downgrade: the new version no more pins ENCRYPT_MAP while the old cilium wants it. Since CI didn't complain...

@julianwiedmann
Copy link
Member Author

julianwiedmann commented May 31, 2024 •
edited
Loading

The retrieving device lxc_health: Link not found is just another case of #32689 ?

Yeah I don't see how it would be related, in particular as that config isn't using IPsec.

@julianwiedmann julianwiedmann added this pull request to the merge queue May 31, 2024
Merged via the queue into cilium:main with commit 389bef9 May 31, 2024
63 of 64 checks passed
@julianwiedmann julianwiedmann deleted the 1.16-bpf-ipsec-map branch May 31, 2024 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jschwinger233 jschwinger233 jschwinger233 approved these changes

@rgo3 rgo3 rgo3 approved these changes

@aditighag aditighag Awaiting requested review from aditighag aditighag is a code owner automatically assigned from cilium/sig-datapath

Assignees
No one assigned
Labels
area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. feature/ipsec Relates to Cilium's IPsec feature kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@julianwiedmann @jschwinger233 @rgo3