summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/proc/meminfo.go
diff options
context:
space:
mode:
authorNicolas Lacasse <nlacasse@google.com>2020-05-06 10:28:50 -0700
committergVisor bot <gvisor-bot@google.com>2020-05-06 10:30:18 -0700
commit591ff0e424e3b30eb143bce06618cb8656784b90 (patch)
tree46b63f822864e51c6ecbbe909f986e19fc0033df /pkg/sentry/fs/proc/meminfo.go
parent8416da33d25bf28cfcfdcbe658f696d6883eebcd (diff)
Add maximum memory limit.
PiperOrigin-RevId: 310179277
Diffstat (limited to 'pkg/sentry/fs/proc/meminfo.go')
-rw-r--r--pkg/sentry/fs/proc/meminfo.go10
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.