From be837166e9fa01984f1e8863e8b3519e1554c872 Mon Sep 17 00:00:00 2001 From: HeRaNO Date: Mon, 11 Sep 2023 10:24:01 +0800 Subject: [PATCH] memory: use `peak` in `max_usage_in_bytes` Kernel 5.19 introduces `memory.peak` and kernel 6.5 introduces `memory.swap.peak` to expose the memory and swap usage watermark. This change use these values to fill `max_usage_in_bytes`. Signed-off-by: HeRaNO --- src/memory.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/memory.rs b/src/memory.rs index 55477f7..42aeed7 100644 --- a/src/memory.rs +++ b/src/memory.rs @@ -593,7 +593,10 @@ impl MemController { .open_path("memory.current", false) .and_then(read_u64_from) .unwrap_or(0), - max_usage_in_bytes: 0, + max_usage_in_bytes: self + .open_path("memory.peak", false) + .and_then(read_u64_from) + .unwrap_or(0), move_charge_at_immigrate: 0, numa_stat: NumaStat::default(), oom_control: OomControl::default(), @@ -736,7 +739,10 @@ impl MemController { .open_path("memory.swap.current", false) .and_then(read_u64_from) .unwrap_or(0), - max_usage_in_bytes: 0, + max_usage_in_bytes: self + .open_path("memory.swap.peak", false) + .and_then(read_u64_from) + .unwrap_or(0), } }