calculateMemUsageUnixNoCache: subtract total_inactive_file, not cache

The new stat definition corresponds to containerd/CRI and cadvisor.

https://github.com/containerd/cri/blob/c1115d4e57f55a5f45fb3efd29d3181ce26d5c6a/pkg/server/container_stats_list_unix.go#L106-L129
google/cadvisor@307d1b1

Fix moby/moby#40727

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

cli/command/container/stats_helpers.go

@@ -226,8 +226,15 @@ func calculateNetwork(network map[string]types.NetworkStats) (float64, float64)
 
 // calculateMemUsageUnixNoCache calculate memory usage of the container.
 // Page cache is intentionally excluded to avoid misinterpretation of the output.
+//
+// From https://github.com/google/cadvisor/commit/307d1b1cb320fef66fab02db749f07a459245451
+// and https://github.com/containerd/cri/commit/6b8846cdf8b8c98c1d965313d66bc8489166059a
 func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 {
-	return float64(mem.Usage - mem.Stats["cache"])
+	if v, isCgroup1 := mem.Stats["total_inactive_file"]; isCgroup1 {
+		return float64(mem.Usage - v)
+	}
+	// cgroup v2
+	return float64(mem.Usage - mem.Stats["inactive_file"])
 }
 
 func calculateMemPercentUnixNoCache(limit float64, usedNoCache float64) float64 {

cli/command/container/stats_helpers_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCalculateMemUsageUnixNoCache(t *testing.T) {
 	// Given
-	stats := types.MemoryStats{Usage: 500, Stats: map[string]uint64{"cache": 400}}
+	stats := types.MemoryStats{Usage: 500, Stats: map[string]uint64{"total_inactive_file": 400}}
 
 	// When
 	result := calculateMemUsageUnixNoCache(stats)