Skip to content

bpf: clear getpeername{4,6} progs#12443

Merged
borkmann merged 1 commit intomasterfrom
pr/tklauser/bpf-clear-getpeername
Jul 7, 2020
Merged

bpf: clear getpeername{4,6} progs#12443
borkmann merged 1 commit intomasterfrom
pr/tklauser/bpf-clear-getpeername

Conversation

@tklauser
Copy link
Copy Markdown
Member

@tklauser tklauser commented Jul 7, 2020

Attempt to clear previously loaded getpeername progs in bpf/init.sh in
case $HOSTLB/$HOSTLB_PEER are disabled.

@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label Jul 7, 2020
@tklauser tklauser requested review from a team and borkmann July 7, 2020 13:07
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Jul 7, 2020

test-me-please

pchaigno
pchaigno approved these changes Jul 7, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

This PR fixes #11617, which was included in 1.8.0, so we need to backport the fix too.

@pchaigno pchaigno added needs-backport/1.8 area/loader Impacts the loading of BPF programs into the kernel. labels Jul 7, 2020
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Jul 7, 2020

This PR fixes #11617, which was included in 1.8.0, so we need to backport the fix too.

Thanks for pointing that out. I also amended the commit message with the proper Fixes: tag.

@tklauser tklauser force-pushed the pr/tklauser/bpf-clear-getpeername branch from 6a14c82 to 642b865 Compare July 7, 2020 13:33
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Jul 7, 2020

test-me-please

@coveralls
Copy link
Copy Markdown

coveralls commented Jul 7, 2020 •
edited
Loading

Coverage Status

Coverage decreased (-0.008%) to 36.928% when pulling 6f64aa5 on pr/tklauser/bpf-clear-getpeername into 7afc2a9 on master.

borkmann
borkmann reviewed Jul 7, 2020
View reviewed changes
Comment thread bpf/init.sh Outdated
@maintainer-s-little-helper maintainer-s-little-helper Bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 7, 2020
borkmann
borkmann reviewed Jul 7, 2020
View reviewed changes
Comment thread bpf/init.sh Outdated
borkmann
borkmann reviewed Jul 7, 2020
View reviewed changes
Comment thread bpf/init.sh Outdated
borkmann
borkmann reviewed Jul 7, 2020
View reviewed changes
Copy link
Copy Markdown
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.

See comments, other than that looks good.

@tklauser
bpf: clear getpeername{4,6} progs
6f64aa5 
Attempt to clear previously loaded getpeername progs in bpf/init.sh in
case $HOSTLB is disabled.

Fixes: f9c2d70 ("bpf: implement getpeername for sock lb programs")
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser force-pushed the pr/tklauser/bpf-clear-getpeername branch from 642b865 to 6f64aa5 Compare July 7, 2020 16:19
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Jul 7, 2020

test-me-please

borkmann
borkmann approved these changes Jul 7, 2020
View reviewed changes
Copy link
Copy Markdown
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, thx!

@borkmann borkmann merged commit c8ae6ed into master Jul 7, 2020
@borkmann borkmann deleted the pr/tklauser/bpf-clear-getpeername branch July 7, 2020 20:16
@brb brb mentioned this pull request Jul 15, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@borkmann borkmann borkmann approved these changes

@pchaigno pchaigno pchaigno approved these changes

Assignees

No one assigned

Labels

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.

6 participants

@tklauser @coveralls @borkmann @pchaigno @brb @christarazi