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

loader: Fixes for map creation from daemon #10728

Merged
merged 3 commits into from Mar 27, 2020

Conversation

pchaigno
Copy link
Member

This pull request introduces a few follow-up fixes for #10626. Please see commit messages.

@pchaigno pchaigno added pending-review sig/loader Impacts the loading of BPF programs into the kernel. release-note/misc This PR makes changes that have no direct user impact. labels Mar 26, 2020
@pchaigno pchaigno requested a review from a team March 26, 2020 21:48
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Mar 26, 2020
@pchaigno pchaigno force-pushed the pr/pchaigno/followups-pr-open-maps branch from df47761 to be5f095 Compare March 26, 2020 21:48
Copy link
Member

@borkmann borkmann left a comment

Choose a reason for hiding this comment

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

LGTM, thanks Paul!

@coveralls
Copy link

coveralls commented Mar 26, 2020

Coverage Status

Coverage increased (+0.03%) to 45.528% when pulling d2f3fcc on pr/pchaigno/followups-pr-open-maps into 3da4cfe on master.

The policy call map was renamed, but the list of symbols to skip in the
ELF wasn't updated, resulting in the following warning:

    2020-03-25T23:08:21.073661843Z level=warning msg="Skipping symbol substitution" subsys=elf symbol=cilium_call_policy

Fixes: 5d6b669 ("maps/policymap: Rename policy call map to clarify intent")
Signed-off-by: Paul Chaignon <paul@cilium.io>
Commit 8fd7415 introduces a Go definition of the NodePort neighbor maps,
to enable their creation during the daemon's initialization. The value
structure is however missing some padding to match its C counterpart,
resulting in the following warnings:

    2020-03-25T23:07:55.245972761Z level=warning msg="Value-size mismatch for BPF map" file-path=/sys/fs/bpf/tc/globals/cilium_nodeport_neigh4 new=6 old=8 subsys=bpf
    2020-03-25T23:07:55.245975572Z level=warning msg="Removing map to allow for property upgrade (expect map data loss)" file-path=/sys/fs/bpf/tc/globals/cilium_nodeport_neigh4 subsys=bpf
    2020-03-25T23:07:55.256431723Z level=debug msg="Registered BPF map" path=/sys/fs/bpf/tc/globals/cilium_nodeport_neigh4 subsys=bpf
    2020-03-25T23:07:55.256461108Z level=debug msg="Unregistered BPF map" path=/sys/fs/bpf/tc/globals/cilium_nodeport_neigh4 subsys=bpf

Fixes: 8fd7415 ("maps/neighborsmap, daemon: Create map from daemon")
Signed-off-by: Paul Chaignon <paul@cilium.io>
Three new maps were added to pkg/maps/ in #10626. The corresponding
checks in alignchecker are however missing. This commit adds them.

Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno
Copy link
Member Author

test-me-please

@borkmann borkmann merged commit 5dbdef6 into master Mar 27, 2020
1.8.0 automation moved this from In progress to Merged Mar 27, 2020
@borkmann borkmann deleted the pr/pchaigno/followups-pr-open-maps branch March 27, 2020 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact. sig/loader Impacts the loading of BPF programs into the kernel.
Projects
No open projects
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

None yet

4 participants