Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

synchronize bpf watch map reads #3506

Merged
merged 2 commits into from
Apr 1, 2020
Merged

synchronize bpf watch map reads #3506

merged 2 commits into from
Apr 1, 2020

Conversation

fspmarshall
Copy link
Contributor

Fixes #3505

@fspmarshall
Copy link
Contributor Author

retest this please

webvictim
webvictim approved these changes Apr 1, 2020
View reviewed changes
lib/bpf/bpf.go
@@ -457,6 +457,13 @@ func (s *Service) emit6NetworkEvent(eventBytes []byte) {
ctx.AuditLog.EmitAuditEvent(events.SessionNetwork, eventFields)
}

func (s *Service) getWatch(cgoupID uint64) (ctx *SessionContext, ok bool) {
Copy link
Contributor

Choose a reason for hiding this comment

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

cgroupID

lib/bpf/bpf.go
func (s *Service) getWatch(cgoupID uint64) (ctx *SessionContext, ok bool) {
s.watchMu.Lock()
defer s.watchMu.Unlock()
ctx, ok = s.watch[cgoupID]
Copy link
Contributor

Choose a reason for hiding this comment

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

cgroupID

@russjones russjones merged commit 924fb9c into master Apr 1, 2020
@russjones russjones deleted the fspmarshall/bpf-read-sync branch April 1, 2020 18:41
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@klizhentas klizhentas klizhentas approved these changes

@webvictim webvictim webvictim approved these changes

@russjones russjones russjones approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Data race in bpf module
4 participants
@fspmarshall @klizhentas @webvictim @russjones