From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id DD1601FF16F
for <inbox@lore.proxmox.com>; Thu, 13 Mar 2025 12:46:18 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 35E401735C;
Thu, 13 Mar 2025 12:46:11 +0100 (CET)
From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 13 Mar 2025 12:45:35 +0100
Message-Id: <20250313114535.99912-2-dietmar@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250313114535.99912-1-dietmar@proxmox.com>
References: <20250313114535.99912-1-dietmar@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.570 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
Subject: [pbs-devel] [PATCH sys 2/2] sys: procfs: read_meminfo: use
MemAvailable from kernel to compute memused
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
The current code does not consider "SReclaimable" as cached memory,
which can lead to totally wrong values for memfree/memused.
This fix uses MemAvailable to compute memused, and returns MemFree
without adding buffers and caches. This corrensponds to the
values displayed by the "free" command line tool (total, used, free, avilable),
where used+available=total.
The value for buffers+cache can be estimated with: available - free
Also adds a simple test case for the parser.
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
proxmox-sys/src/linux/procfs/mod.rs | 85 +++++++++++++++++++++++++++--
1 file changed, 80 insertions(+), 5 deletions(-)
diff --git a/proxmox-sys/src/linux/procfs/mod.rs b/proxmox-sys/src/linux/procfs/mod.rs
index f9dbb5bc..46452d8f 100644
--- a/proxmox-sys/src/linux/procfs/mod.rs
+++ b/proxmox-sys/src/linux/procfs/mod.rs
@@ -432,24 +432,29 @@ fn parse_proc_meminfo(text: &str) -> Result<ProcFsMemInfo, Error> {
swapused: 0,
};
- let (mut buffers, mut cached) = (0, 0);
+ let mut available = 0;
+
for line in text.lines() {
let mut content_iter = line.split_whitespace();
if let (Some(key), Some(value)) = (content_iter.next(), content_iter.next()) {
match key {
"MemTotal:" => meminfo.memtotal = value.parse::<u64>()? * 1024,
"MemFree:" => meminfo.memfree = value.parse::<u64>()? * 1024,
+ "MemAvailable:" => available = value.parse::<u64>()? * 1024,
"SwapTotal:" => meminfo.swaptotal = value.parse::<u64>()? * 1024,
"SwapFree:" => meminfo.swapfree = value.parse::<u64>()? * 1024,
- "Buffers:" => buffers = value.parse::<u64>()? * 1024,
- "Cached:" => cached = value.parse::<u64>()? * 1024,
_ => continue,
}
}
}
- meminfo.memfree += buffers + cached;
- meminfo.memused = meminfo.memtotal - meminfo.memfree;
+ // see free.c and meminfo.h from https://gitlab.com/procps-ng/procps
+ // Note: USED+FREE != TOTAL (USED+FREE+BUFFER+CACHED+SRECLAIMABLE == TOTAL)
+
+ meminfo.memused = meminfo.memtotal - available;
+
+ // Available memory is: meminfo.memtotal - meminfo.memused
+ // Buffers + CACHE = meminfo.memtotal - meminfo.memused - meminfo.free
meminfo.swapused = meminfo.swaptotal - meminfo.swapfree;
@@ -462,6 +467,76 @@ fn parse_proc_meminfo(text: &str) -> Result<ProcFsMemInfo, Error> {
Ok(meminfo)
}
+#[test]
+fn test_read_proc_meminfo() {
+ let meminfo = parse_proc_meminfo(
+ "MemTotal: 32752584 kB
+MemFree: 2106048 kB
+MemAvailable: 13301592 kB
+Buffers: 0 kB
+Cached: 490072 kB
+SwapCached: 0 kB
+Active: 658700 kB
+Inactive: 59528 kB
+Active(anon): 191996 kB
+Inactive(anon): 49880 kB
+Active(file): 466704 kB
+Inactive(file): 9648 kB
+Unevictable: 16008 kB
+Mlocked: 12936 kB
+SwapTotal: 3 kB
+SwapFree: 2 kB
+Zswap: 0 kB
+Zswapped: 0 kB
+Dirty: 0 kB
+Writeback: 0 kB
+AnonPages: 244204 kB
+Mapped: 66032 kB
+Shmem: 9960 kB
+KReclaimable: 11525744 kB
+Slab: 21002876 kB
+SReclaimable: 11525744 kB
+SUnreclaim: 9477132 kB
+KernelStack: 6816 kB
+PageTables: 4812 kB
+SecPageTables: 0 kB
+NFS_Unstable: 0 kB
+Bounce: 0 kB
+WritebackTmp: 0 kB
+CommitLimit: 16376292 kB
+Committed_AS: 316368 kB
+VmallocTotal: 34359738367 kB
+VmallocUsed: 983836 kB
+VmallocChunk: 0 kB
+Percpu: 12096 kB
+HardwareCorrupted: 0 kB
+AnonHugePages: 0 kB
+ShmemHugePages: 0 kB
+ShmemPmdMapped: 0 kB
+FileHugePages: 0 kB
+FilePmdMapped: 0 kB
+Unaccepted: 0 kB
+HugePages_Total: 0
+HugePages_Free: 0
+HugePages_Rsvd: 0
+HugePages_Surp: 0
+Hugepagesize: 2048 kB
+Hugetlb: 0 kB
+DirectMap4k: 237284 kB
+DirectMap2M: 13281280 kB
+DirectMap1G: 22020096 kB
+",
+ )
+ .expect("successful parsed a sample /proc/meminfo entry");
+
+ assert_eq!(meminfo.memtotal, 33538646016);
+ assert_eq!(meminfo.memused, 19917815808);
+ assert_eq!(meminfo.memfree, 2156593152);
+ assert_eq!(meminfo.swapfree, 2048);
+ assert_eq!(meminfo.swaptotal, 3072);
+ assert_eq!(meminfo.swapused, 1024);
+}
+
#[derive(Clone, Debug)]
pub struct ProcFsCPUInfo {
pub user_hz: f64,
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel