1*4882a593SmuzhiyunFrom 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Ralph Siemsen <ralph.siemsen@linaro.org> 3*4882a593SmuzhiyunDate: Mon, 27 Sep 2021 22:18:50 -0400 4*4882a593SmuzhiyunSubject: [PATCH] lib: fix MemAvailable parsing 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe amount of available memory was not being returned correctly, which 7*4882a593Smuzhiyunresulted in tests being executed when they should have been skipped. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunFixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") 10*4882a593SmuzhiyunSigned-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> 11*4882a593SmuzhiyunSigned-off-by: Li Wang <liwang@redhat.com> 12*4882a593SmuzhiyunSigned-off-by: Petr Vorel <petr.vorel@gmail.com> 13*4882a593Smuzhiyun[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ] 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun lib/tst_memutils.c | 4 ++-- 16*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/lib/tst_memutils.c b/lib/tst_memutils.c 19*4882a593Smuzhiyunindex ae1cad29b..a46de78f5 100644 20*4882a593Smuzhiyun--- a/lib/tst_memutils.c 21*4882a593Smuzhiyun+++ b/lib/tst_memutils.c 22*4882a593Smuzhiyun@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun long long tst_available_mem(void) 25*4882a593Smuzhiyun { 26*4882a593Smuzhiyun- long long mem_available; 27*4882a593Smuzhiyun+ unsigned long long mem_available = 0; 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", 30*4882a593Smuzhiyun+ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", 31*4882a593Smuzhiyun &mem_available)) { 32*4882a593Smuzhiyun mem_available = SAFE_READ_MEMINFO("MemFree:") 33*4882a593Smuzhiyun + SAFE_READ_MEMINFO("Cached:"); 34*4882a593Smuzhiyun-- 35*4882a593Smuzhiyun2.33.0 36*4882a593Smuzhiyun 37