Skip to content

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 area/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
@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 pchaigno force-pushed the pr/pchaigno/followups-pr-open-maps branch from be5f095 to d2f3fcc Compare March 27, 2020 12:41
@pchaigno
Copy link
Member Author

test-me-please

@borkmann borkmann merged commit 5dbdef6 into master 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
area/loader Impacts the loading of BPF programs into the kernel. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants