From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0A7CE75DE6 for ; Wed, 14 Jul 2021 09:42:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA3CBD18C for ; Wed, 14 Jul 2021 09:42:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 85657D183 for ; Wed, 14 Jul 2021 09:42:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 57E9241661 for ; Wed, 14 Jul 2021 09:42:16 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 14 Jul 2021 09:42:15 +0200 Message-Id: <20210714074215.45274-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.686 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common] fix #3527: cgroup: drop file buffers from memory usage X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 07:42:47 -0000 matches the behavior of lxcfs Signed-off-by: Wolfgang Bumiller --- src/PVE/CGroup.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PVE/CGroup.pm b/src/PVE/CGroup.pm index f82cbb9..21681b8 100644 --- a/src/PVE/CGroup.pm +++ b/src/PVE/CGroup.pm @@ -341,13 +341,11 @@ sub get_memory_stat { } elsif ($ver == 2) { my $mem = file_get_contents("$path/memory.current"); my $swap = file_get_contents("$path/memory.swap.current"); + my $stat = parse_flat_keyed_file(file_get_contents("$path/memory.stat")); chomp ($mem, $swap); - # FIXME: For the cgv1 equivalent of `total_cache` we may need to sum up - # the values in `memory.stat`... - - $res->{mem} = $mem; + $res->{mem} = $mem - $stat->{file}; $res->{swap} = $swap; } elsif ($ver == 1) { # cgroupv1 environment: -- 2.30.2