netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Suppress the known lock issue

Browse Source 
It is triggered too often in syzkaller jobs.

PiperOrigin-RevId: 455431173
This commit is contained in:
Andrei Vagin
2022-06-16 11:40:03 -07:00
committed by gVisor bot
parent 1b604ce010
commit 7ef9f97f41
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/mm/procfs.go
+12 -6
View File
@@ -60,8 +60,10 @@ func (mm *MemoryManager) NeedsUpdate(generation int64) bool {
// ReadMapsDataInto is called by fsimpl/proc.mapsData.Generate to
// implement /proc/[pid]/maps.
func (mm *MemoryManager) ReadMapsDataInto(ctx context.Context, buf *bytes.Buffer) {
mm.mappingMu.RLock()
defer mm.mappingMu.RUnlock()
// FIXME(b/235153601): Need to replace RLockBypass with RLockBypass
// after fixing b/235153601.
mm.mappingMu.RLockBypass()
defer mm.mappingMu.RUnlockBypass()
var start hostarch.Addr
for vseg := mm.vmas.LowerBoundSegment(start); vseg.Ok(); vseg = vseg.NextSegment() {
@@ -177,8 +179,10 @@ func (mm *MemoryManager) appendVMAMapsEntryLocked(ctx context.Context, vseg vmaI
// ReadSmapsDataInto is called by fsimpl/proc.smapsData.Generate to
// implement /proc/[pid]/maps.
func (mm *MemoryManager) ReadSmapsDataInto(ctx context.Context, buf *bytes.Buffer) {
mm.mappingMu.RLock()
defer mm.mappingMu.RUnlock()
// FIXME(b/235153601): Need to replace RLockBypass with RLockBypass
// after fixing b/235153601.
mm.mappingMu.RLockBypass()
defer mm.mappingMu.RUnlockBypass()
var start hostarch.Addr
for vseg := mm.vmas.LowerBoundSegment(start); vseg.Ok(); vseg = vseg.NextSegment() {
@@ -195,8 +199,10 @@ func (mm *MemoryManager) ReadSmapsDataInto(ctx context.Context, buf *bytes.Buffe
// ReadSmapsSeqFileData is called by fs/proc.smapsData.ReadSeqFileData to
// implement /proc/[pid]/smaps.
func (mm *MemoryManager) ReadSmapsSeqFileData(ctx context.Context, handle seqfile.SeqHandle) ([]seqfile.SeqData, int64) {
mm.mappingMu.RLock()
defer mm.mappingMu.RUnlock()
// FIXME(b/235153601): Need to replace RLockBypass with RLockBypass
// after fixing b/235153601.
mm.mappingMu.RLockBypass()
defer mm.mappingMu.RUnlockBypass()
var data []seqfile.SeqData
var start hostarch.Addr
if handle != nil {