diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-06 17:35:47 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-06 17:35:47 +0000 |
| commit | 9c0db04fe746df6260e9da0a0cd60a91f6c6887d (patch) | |
| tree | e71152a5926e32f151e641f2fd4d71504bef7d8f /pkg/sentry/fs/proc | |
| parent | 568ef4b075849f04e329e964918dbbcaeb675602 (diff) | |
| parent | 591ff0e424e3b30eb143bce06618cb8656784b90 (diff) | |
Merge release-20200422.0-34-g591ff0e (automated)
Diffstat (limited to 'pkg/sentry/fs/proc')
| -rw-r--r-- | pkg/sentry/fs/proc/meminfo.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/sentry/fs/proc/meminfo.go b/pkg/sentry/fs/proc/meminfo.go index 465b47da9..91617267d 100644 --- a/pkg/sentry/fs/proc/meminfo.go +++ b/pkg/sentry/fs/proc/meminfo.go @@ -58,12 +58,16 @@ func (d *meminfoData) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle) var buf bytes.Buffer fmt.Fprintf(&buf, "MemTotal: %8d kB\n", totalSize/1024) - memFree := (totalSize - totalUsage) / 1024 + memFree := totalSize - totalUsage + if memFree > totalSize { + // Underflow. + memFree = 0 + } // We use MemFree as MemAvailable because we don't swap. // TODO(rahat): When reclaim is implemented the value of MemAvailable // should change. - fmt.Fprintf(&buf, "MemFree: %8d kB\n", memFree) - fmt.Fprintf(&buf, "MemAvailable: %8d kB\n", memFree) + fmt.Fprintf(&buf, "MemFree: %8d kB\n", memFree/1024) + fmt.Fprintf(&buf, "MemAvailable: %8d kB\n", memFree/1024) fmt.Fprintf(&buf, "Buffers: 0 kB\n") // memory usage by block devices fmt.Fprintf(&buf, "Cached: %8d kB\n", (file+snapshot.Tmpfs)/1024) // Emulate a system with no swap, which disables inactivation of anon pages. |