Fix race while updating L7 proxy redirect in L4PolicyMap #2607
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joestringer
added
pending-review
area/proxy
Previously, the L7 redirects were allocated deep in the L4 BPF code
generation; this commit shifts that functionality up to the
regenerateBPF() layer, and wraps some proper locking around its access
to Consumable, as it modifies the Consumable's L4PolicyMap.
This should fix the following data race:
WARNING: DATA RACE
Read at 0x00c420ed3650 by goroutine 42:
runtime.mapiterinit()
/home/scanf/opt/go/src/runtime/hashmap.go:709 +0x0
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).writeL4Map()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:55 +0xab
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).writeL4Policy()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:113 +0x2b5
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).writeHeaderfile()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:256 +0x1fa8
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).regenerateBPF()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:433 +0x218
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).regenerate()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/policy.go:693 +0x4ca
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).Regenerate.func1()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/policy.go:759 +0x2a1
Previous write at 0x00c420ed3650 by goroutine 109:
runtime.mapassign_faststr()
/home/scanf/opt/go/src/runtime/hashmap_fast.go:598 +0x0
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).writeL4Map()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:71 +0x5e5
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).writeL4Policy()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:113 +0x2b5
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).writeHeaderfile()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:256 +0x1fa8
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).regenerateBPF()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/bpf.go:433 +0x218
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).regenerate()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/policy.go:693 +0x4ca
github.com/cilium/cilium/pkg/endpoint.(*Endpoint).Regenerate.func1()
/home/scanf/opt/og/src/github.com/cilium/cilium/pkg/endpoint/policy.go:759 +0x2a1
Fixes: cilium#2409
Reported-by: Alexander Alemayhu <alexander@alemayhu.com>
Signed-off-by: Joe Stringer <joe@covalent.io>
joestringer
force-pushed
the
submit/fix-l4map-race
branch
from
7b2a991
to
44eb052
Compare
|
test-me-please |
aanm
requested changes
Jan 23, 2018
| @@ -62,15 +62,6 @@ func (e *Endpoint) writeL4Map(fw *bufio.Writer, owner Owner, m policy.L4PolicyMa | |||
| dport := byteorder.HostToNetwork(uint16(l4.Port)) | |||
|
|
|||
| redirect := uint16(l4.L7RedirectPort) | |||
| if l4.IsRedirect() && redirect == 0 { | |||
| redirect, err = e.addRedirect(owner, &l4) | |||
There was a problem hiding this comment.
You can't remove the addRedirect from here because this is the function that allocate the redirect port. The redirect is also used on line 66.
There was a problem hiding this comment.
What's the dependency? It's still being allocated in the code below under the same endpoint.Mutex, the call is just not so deep in the stack.
tgraf
added
release-note/bug
aanm
approved these changes
Jan 23, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the L7 redirects were allocated deep in the L4 BPF code
generation; this commit shifts that functionality up to the
regenerateBPF() layer, and wraps some proper locking around its access
to Consumable, as it modifies the Consumable's L4PolicyMap.
This should fix the following data race:
Fixes: #2409
Reported-by: Alexander Alemayhu alexander@alemayhu.com
Signed-off-by: Joe Stringer joe@covalent.io