diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2018-11-27 18:16:18 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-11-27 18:17:09 -0800 |
| commit | 573622fdcaa5c016d3e047353c729ca73d211c0e (patch) | |
| tree | 17a168bd7099ee85b8d00493521a07d19dee43ac /pkg/sentry/fs/inode.go | |
| parent | 5bd02b224fd0eb81fc028644137a24d0bbf7dab5 (diff) | |
Fix data race in fs.Async.
Replaces the WaitGroup with a RWMutex. Calls to Async hold the mutex for
reading, while AsyncBarrier takes the lock for writing. This ensures that all
executing Async work finishes before AsyncBarrier returns.
Also pushes the Async() call from Inode.Release into
gofer/InodeOperations.Release(). This removes a recursive Async call which
should not have been allowed in the first place. The gofer Release call is the
slow one (since it may make RPCs to the gofer), so putting the Async call there
makes sense.
PiperOrigin-RevId: 223093067
Change-Id: I116da7b20fce5ebab8d99c2ab0f27db7c89d890e
Diffstat (limited to 'pkg/sentry/fs/inode.go')
| -rw-r--r-- | pkg/sentry/fs/inode.go | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkg/sentry/fs/inode.go b/pkg/sentry/fs/inode.go index 38b140bd2..fa3beb111 100644 --- a/pkg/sentry/fs/inode.go +++ b/pkg/sentry/fs/inode.go @@ -110,20 +110,13 @@ func (i *Inode) destroy() { // wouldn't be in the destructor. i.Watches.targetDestroyed() - // Overlay resources should be released synchronously, since they may - // trigger more Inode.destroy calls which must themselves be handled - // synchronously, like the WriteOut call above. if i.overlay != nil { i.overlay.release() - i.MountSource.DecRef() - return + } else { + i.InodeOperations.Release(ctx) } - // Regular (non-overlay) resources may be released asynchronously. - Async(func() { - i.InodeOperations.Release(ctx) - i.MountSource.DecRef() - }) + i.MountSource.DecRef() } // Mappable calls i.InodeOperations.Mappable. |