Skip to content

loader: Move direct routing config. to node_config.h#11594

Merged
tklauser merged 1 commit intomasterfrom
pr/pchaigno/direct-routing-to-node_config
May 22, 2020
Merged

loader: Move direct routing config. to node_config.h#11594
tklauser merged 1 commit intomasterfrom
pr/pchaigno/direct-routing-to-node_config

Conversation

@pchaigno
Copy link
Copy Markdown
Member

@pchaigno pchaigno commented May 19, 2020

DIRECT_ROUTING_DEV_IFINDEX, IPV4_DIRECT_ROUTING, and IPV6_DIRECT_ROUTING
are common across all devices, so there's no need to use static data or BPF_V6() for them.

@pchaigno pchaigno added area/loader Impacts the loading of BPF programs into the kernel. area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. labels May 19, 2020
@pchaigno
loader: Move direct routing config. to node_config.h
874225a 
DIRECT_ROUTING_DEV_IFINDEX, IPV4_DIRECT_ROUTING, and IPV6_DIRECT_ROUTING
are common across all devices, so there's no need to use static data or
BPF_V6() for them.

Fixes: 275856b ("bpf: Macros to load IPV6_{NODEPORT,DIRECT_ROUTING}")
Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno pchaigno force-pushed the pr/pchaigno/direct-routing-to-node_config branch from 49d6ef2 to 874225a Compare May 20, 2020 08:03
@pchaigno
Copy link
Copy Markdown
Member Author

pchaigno commented May 20, 2020

test-me-please

@pchaigno
Copy link
Copy Markdown
Member Author

pchaigno commented May 20, 2020

Runtime-4.9 hit flake #11512. Other required builds are passing.

@pchaigno pchaigno marked this pull request as ready for review May 20, 2020 15:51
@pchaigno pchaigno requested review from a team and brb May 20, 2020 15:51
brb
brb approved these changes May 21, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

Cool, thanks for working on this! One nit, which can be ignored if all CI builds have passed (we can change the name in unrelated PR).

Comment thread bpf/lib/nodeport.h
@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 21, 2020
tklauser
tklauser approved these changes May 22, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Nice!

@tklauser tklauser merged commit 056fec2 into master May 22, 2020
@tklauser tklauser deleted the pr/pchaigno/direct-routing-to-node_config branch May 22, 2020 08:48
This was referenced May 28, 2020
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brb brb brb approved these changes

@tklauser tklauser tklauser approved these changes

Assignees

No one assigned

Labels

area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. area/loader Impacts the loading of BPF programs into the kernel. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@pchaigno @brb @tklauser