diff options
| author | Jamie Liu <jamieliu@google.com> | 2018-12-17 11:37:38 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-12-17 11:38:59 -0800 |
| commit | 2421006426445a1827422c2dbdd6fc6a47087147 (patch) | |
| tree | 49aa2bc113c208fc117aff8a036866a7260090e5 /pkg/sentry/limits/linux.go | |
| parent | 54694086dfb02a6f8453f043a44ffd10bb5a7070 (diff) | |
Implement mlock(), kind of.
Currently mlock() and friends do nothing whatsoever. However, mlocking
is directly application-visible in a number of ways; for example,
madvise(MADV_DONTNEED) and msync(MS_INVALIDATE) both fail on mlocked
regions. We handle this inconsistently: MADV_DONTNEED is too important
to not work, but MS_INVALIDATE is rejected.
Change MM to track mlocked regions in a manner consistent with Linux.
It still will not actually pin pages into host physical memory, but:
- mlock() will now cause sentry memory management to precommit mlocked
pages.
- MADV_DONTNEED and MS_INVALIDATE will interact with mlocked pages as
described above.
PiperOrigin-RevId: 225861605
Change-Id: Iee187204979ac9a4d15d0e037c152c0902c8d0ee
Diffstat (limited to 'pkg/sentry/limits/linux.go')
| -rw-r--r-- | pkg/sentry/limits/linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/limits/linux.go b/pkg/sentry/limits/linux.go index 511db6733..295f9c398 100644 --- a/pkg/sentry/limits/linux.go +++ b/pkg/sentry/limits/linux.go @@ -30,7 +30,7 @@ var FromLinuxResource = map[int]LimitType{ linux.RLIMIT_RSS: Rss, linux.RLIMIT_NPROC: ProcessCount, linux.RLIMIT_NOFILE: NumberOfFiles, - linux.RLIMIT_MEMLOCK: MemoryPagesLocked, + linux.RLIMIT_MEMLOCK: MemoryLocked, linux.RLIMIT_AS: AS, linux.RLIMIT_LOCKS: Locks, linux.RLIMIT_SIGPENDING: SignalsPending, |