diff options
Diffstat (limited to 'pkg/sentry/fsimpl/host')
| -rw-r--r-- | pkg/sentry/fsimpl/host/host.go | 24 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/host_state_autogen.go | 90 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/mmap.go | 133 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/save_restore.go | 8 |
4 files changed, 33 insertions, 222 deletions
diff --git a/pkg/sentry/fsimpl/host/host.go b/pkg/sentry/fsimpl/host/host.go index eeed0f97d..39b902a3e 100644 --- a/pkg/sentry/fsimpl/host/host.go +++ b/pkg/sentry/fsimpl/host/host.go @@ -48,6 +48,7 @@ type inode struct { kernfs.InodeNoStatFS kernfs.InodeNotDirectory kernfs.InodeNotSymlink + kernfs.CachedMappable kernfs.InodeTemporary // This holds no meaning as this inode can't be Looked up and is always valid. locks vfs.FileLocks @@ -96,16 +97,6 @@ type inode struct { // Event queue for blocking operations. queue waiter.Queue - // mapsMu protects mappings. - mapsMu sync.Mutex `state:"nosave"` - - // If this file is mmappable, mappings tracks mappings of hostFD into - // memmap.MappingSpaces. - mappings memmap.MappingSet - - // pf implements platform.File for mappings of hostFD. - pf inodePlatformFile - // If haveBuf is non-zero, hostFD represents a pipe, and buf contains data // read from the pipe from previous calls to inode.beforeSave(). haveBuf // and buf are protected by bufMu. haveBuf is accessed using atomic memory @@ -135,7 +126,7 @@ func newInode(ctx context.Context, fs *filesystem, hostFD int, savable bool, fil isTTY: isTTY, savable: savable, } - i.pf.inode = i + i.CachedMappable.Init(hostFD) i.EnableLeakCheck() // If the hostFD can return EWOULDBLOCK when set to non-blocking, do so and @@ -439,14 +430,7 @@ func (i *inode) SetStat(ctx context.Context, fs *vfs.Filesystem, creds *auth.Cre oldpgend, _ := usermem.PageRoundUp(oldSize) newpgend, _ := usermem.PageRoundUp(s.Size) if oldpgend != newpgend { - i.mapsMu.Lock() - i.mappings.Invalidate(memmap.MappableRange{newpgend, oldpgend}, memmap.InvalidateOpts{ - // Compare Linux's mm/truncate.c:truncate_setsize() => - // truncate_pagecache() => - // mm/memory.c:unmap_mapping_range(evencows=1). - InvalidatePrivate: true, - }) - i.mapsMu.Unlock() + i.CachedMappable.InvalidateRange(memmap.MappableRange{newpgend, oldpgend}) } } } @@ -797,7 +781,7 @@ func (f *fileDescription) ConfigureMMap(_ context.Context, opts *memmap.MMapOpts return syserror.ENODEV } i := f.inode - i.pf.fileMapperInitOnce.Do(i.pf.fileMapper.Init) + i.CachedMappable.InitFileMapperOnce() return vfs.GenericConfigureMMap(&f.vfsfd, i, opts) } diff --git a/pkg/sentry/fsimpl/host/host_state_autogen.go b/pkg/sentry/fsimpl/host/host_state_autogen.go index 6de6c002c..705f8010a 100644 --- a/pkg/sentry/fsimpl/host/host_state_autogen.go +++ b/pkg/sentry/fsimpl/host/host_state_autogen.go @@ -37,6 +37,7 @@ func (i *inode) StateFields() []string { "InodeNoStatFS", "InodeNotDirectory", "InodeNotSymlink", + "CachedMappable", "InodeTemporary", "locks", "inodeRefs", @@ -48,8 +49,6 @@ func (i *inode) StateFields() []string { "isTTY", "savable", "queue", - "mappings", - "pf", "haveBuf", "buf", } @@ -60,42 +59,40 @@ func (i *inode) StateSave(stateSinkObject state.Sink) { stateSinkObject.Save(0, &i.InodeNoStatFS) stateSinkObject.Save(1, &i.InodeNotDirectory) stateSinkObject.Save(2, &i.InodeNotSymlink) - stateSinkObject.Save(3, &i.InodeTemporary) - stateSinkObject.Save(4, &i.locks) - stateSinkObject.Save(5, &i.inodeRefs) - stateSinkObject.Save(6, &i.hostFD) - stateSinkObject.Save(7, &i.ino) - stateSinkObject.Save(8, &i.ftype) - stateSinkObject.Save(9, &i.mayBlock) - stateSinkObject.Save(10, &i.seekable) - stateSinkObject.Save(11, &i.isTTY) - stateSinkObject.Save(12, &i.savable) - stateSinkObject.Save(13, &i.queue) - stateSinkObject.Save(14, &i.mappings) - stateSinkObject.Save(15, &i.pf) - stateSinkObject.Save(16, &i.haveBuf) - stateSinkObject.Save(17, &i.buf) + stateSinkObject.Save(3, &i.CachedMappable) + stateSinkObject.Save(4, &i.InodeTemporary) + stateSinkObject.Save(5, &i.locks) + stateSinkObject.Save(6, &i.inodeRefs) + stateSinkObject.Save(7, &i.hostFD) + stateSinkObject.Save(8, &i.ino) + stateSinkObject.Save(9, &i.ftype) + stateSinkObject.Save(10, &i.mayBlock) + stateSinkObject.Save(11, &i.seekable) + stateSinkObject.Save(12, &i.isTTY) + stateSinkObject.Save(13, &i.savable) + stateSinkObject.Save(14, &i.queue) + stateSinkObject.Save(15, &i.haveBuf) + stateSinkObject.Save(16, &i.buf) } func (i *inode) StateLoad(stateSourceObject state.Source) { stateSourceObject.Load(0, &i.InodeNoStatFS) stateSourceObject.Load(1, &i.InodeNotDirectory) stateSourceObject.Load(2, &i.InodeNotSymlink) - stateSourceObject.Load(3, &i.InodeTemporary) - stateSourceObject.Load(4, &i.locks) - stateSourceObject.Load(5, &i.inodeRefs) - stateSourceObject.Load(6, &i.hostFD) - stateSourceObject.Load(7, &i.ino) - stateSourceObject.Load(8, &i.ftype) - stateSourceObject.Load(9, &i.mayBlock) - stateSourceObject.Load(10, &i.seekable) - stateSourceObject.Load(11, &i.isTTY) - stateSourceObject.Load(12, &i.savable) - stateSourceObject.Load(13, &i.queue) - stateSourceObject.Load(14, &i.mappings) - stateSourceObject.Load(15, &i.pf) - stateSourceObject.Load(16, &i.haveBuf) - stateSourceObject.Load(17, &i.buf) + stateSourceObject.Load(3, &i.CachedMappable) + stateSourceObject.Load(4, &i.InodeTemporary) + stateSourceObject.Load(5, &i.locks) + stateSourceObject.Load(6, &i.inodeRefs) + stateSourceObject.Load(7, &i.hostFD) + stateSourceObject.Load(8, &i.ino) + stateSourceObject.Load(9, &i.ftype) + stateSourceObject.Load(10, &i.mayBlock) + stateSourceObject.Load(11, &i.seekable) + stateSourceObject.Load(12, &i.isTTY) + stateSourceObject.Load(13, &i.savable) + stateSourceObject.Load(14, &i.queue) + stateSourceObject.Load(15, &i.haveBuf) + stateSourceObject.Load(16, &i.buf) stateSourceObject.AfterLoad(i.afterLoad) } @@ -201,34 +198,6 @@ func (r *inodeRefs) StateLoad(stateSourceObject state.Source) { stateSourceObject.AfterLoad(r.afterLoad) } -func (i *inodePlatformFile) StateTypeName() string { - return "pkg/sentry/fsimpl/host.inodePlatformFile" -} - -func (i *inodePlatformFile) StateFields() []string { - return []string{ - "inode", - "fdRefs", - "fileMapper", - } -} - -func (i *inodePlatformFile) beforeSave() {} - -func (i *inodePlatformFile) StateSave(stateSinkObject state.Sink) { - i.beforeSave() - stateSinkObject.Save(0, &i.inode) - stateSinkObject.Save(1, &i.fdRefs) - stateSinkObject.Save(2, &i.fileMapper) -} - -func (i *inodePlatformFile) StateLoad(stateSourceObject state.Source) { - stateSourceObject.Load(0, &i.inode) - stateSourceObject.Load(1, &i.fdRefs) - stateSourceObject.Load(2, &i.fileMapper) - stateSourceObject.AfterLoad(i.afterLoad) -} - func (c *ConnectedEndpoint) StateTypeName() string { return "pkg/sentry/fsimpl/host.ConnectedEndpoint" } @@ -300,7 +269,6 @@ func init() { state.Register((*filesystem)(nil)) state.Register((*fileDescription)(nil)) state.Register((*inodeRefs)(nil)) - state.Register((*inodePlatformFile)(nil)) state.Register((*ConnectedEndpoint)(nil)) state.Register((*TTYFileDescription)(nil)) } diff --git a/pkg/sentry/fsimpl/host/mmap.go b/pkg/sentry/fsimpl/host/mmap.go deleted file mode 100644 index 3d7eb2f96..000000000 --- a/pkg/sentry/fsimpl/host/mmap.go +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright 2020 The gVisor Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package host - -import ( - "gvisor.dev/gvisor/pkg/context" - "gvisor.dev/gvisor/pkg/safemem" - "gvisor.dev/gvisor/pkg/sentry/fs/fsutil" - "gvisor.dev/gvisor/pkg/sentry/memmap" - "gvisor.dev/gvisor/pkg/sync" - "gvisor.dev/gvisor/pkg/usermem" -) - -// inodePlatformFile implements memmap.File. It exists solely because inode -// cannot implement both kernfs.Inode.IncRef and memmap.File.IncRef. -// -// inodePlatformFile should only be used if inode.canMap is true. -// -// +stateify savable -type inodePlatformFile struct { - *inode - - // fdRefsMu protects fdRefs. - fdRefsMu sync.Mutex `state:"nosave"` - - // fdRefs counts references on memmap.File offsets. It is used solely for - // memory accounting. - fdRefs fsutil.FrameRefSet - - // fileMapper caches mappings of the host file represented by this inode. - fileMapper fsutil.HostFileMapper - - // fileMapperInitOnce is used to lazily initialize fileMapper. - fileMapperInitOnce sync.Once `state:"nosave"` -} - -// IncRef implements memmap.File.IncRef. -// -// Precondition: i.inode.canMap must be true. -func (i *inodePlatformFile) IncRef(fr memmap.FileRange) { - i.fdRefsMu.Lock() - i.fdRefs.IncRefAndAccount(fr) - i.fdRefsMu.Unlock() -} - -// DecRef implements memmap.File.DecRef. -// -// Precondition: i.inode.canMap must be true. -func (i *inodePlatformFile) DecRef(fr memmap.FileRange) { - i.fdRefsMu.Lock() - i.fdRefs.DecRefAndAccount(fr) - i.fdRefsMu.Unlock() -} - -// MapInternal implements memmap.File.MapInternal. -// -// Precondition: i.inode.canMap must be true. -func (i *inodePlatformFile) MapInternal(fr memmap.FileRange, at usermem.AccessType) (safemem.BlockSeq, error) { - return i.fileMapper.MapInternal(fr, i.hostFD, at.Write) -} - -// FD implements memmap.File.FD. -func (i *inodePlatformFile) FD() int { - return i.hostFD -} - -// AddMapping implements memmap.Mappable.AddMapping. -// -// Precondition: i.inode.canMap must be true. -func (i *inode) AddMapping(ctx context.Context, ms memmap.MappingSpace, ar usermem.AddrRange, offset uint64, writable bool) error { - i.mapsMu.Lock() - mapped := i.mappings.AddMapping(ms, ar, offset, writable) - for _, r := range mapped { - i.pf.fileMapper.IncRefOn(r) - } - i.mapsMu.Unlock() - return nil -} - -// RemoveMapping implements memmap.Mappable.RemoveMapping. -// -// Precondition: i.inode.canMap must be true. -func (i *inode) RemoveMapping(ctx context.Context, ms memmap.MappingSpace, ar usermem.AddrRange, offset uint64, writable bool) { - i.mapsMu.Lock() - unmapped := i.mappings.RemoveMapping(ms, ar, offset, writable) - for _, r := range unmapped { - i.pf.fileMapper.DecRefOn(r) - } - i.mapsMu.Unlock() -} - -// CopyMapping implements memmap.Mappable.CopyMapping. -// -// Precondition: i.inode.canMap must be true. -func (i *inode) CopyMapping(ctx context.Context, ms memmap.MappingSpace, srcAR, dstAR usermem.AddrRange, offset uint64, writable bool) error { - return i.AddMapping(ctx, ms, dstAR, offset, writable) -} - -// Translate implements memmap.Mappable.Translate. -// -// Precondition: i.inode.canMap must be true. -func (i *inode) Translate(ctx context.Context, required, optional memmap.MappableRange, at usermem.AccessType) ([]memmap.Translation, error) { - mr := optional - return []memmap.Translation{ - { - Source: mr, - File: &i.pf, - Offset: mr.Start, - Perms: usermem.AnyAccess, - }, - }, nil -} - -// InvalidateUnsavable implements memmap.Mappable.InvalidateUnsavable. -// -// Precondition: i.inode.canMap must be true. -func (i *inode) InvalidateUnsavable(ctx context.Context) error { - // We expect the same host fd across save/restore, so all translations - // should be valid. - return nil -} diff --git a/pkg/sentry/fsimpl/host/save_restore.go b/pkg/sentry/fsimpl/host/save_restore.go index 7e32a8863..8800652a9 100644 --- a/pkg/sentry/fsimpl/host/save_restore.go +++ b/pkg/sentry/fsimpl/host/save_restore.go @@ -68,11 +68,3 @@ func (i *inode) afterLoad() { } } } - -// afterLoad is invoked by stateify. -func (i *inodePlatformFile) afterLoad() { - if i.fileMapper.IsInited() { - // Ensure that we don't call i.fileMapper.Init() again. - i.fileMapperInitOnce.Do(func() {}) - } -} |