commit 98c8207b8f57220cfca1fbba2f3a5d45b939aecc
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 15 23:04:49 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Apr 15 23:04:49 2022 -0700
tree 28d867aba3e00d8aede73258e1eac65055f63997
parent 032d0f912a057ffa4b13c371d2bae325c27edc08
parent e1434b254bb22f681fe348abb44fa02722870ce5

Merge e1434b254bb22f681fe348abb44fa02722870ce5 on remote branch

Change-Id: I111fcfb4bede254169310aa3facf9a5573ec361e

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 32750b0..8dae108 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name": "libmeminfo_test"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "libmeminfo_test"
+    }
   ]
 }

procmeminfo.cpp

diff --git a/procmeminfo.cpp b/procmeminfo.cpp
index b22e1bd..13a17da 100644
--- a/procmeminfo.cpp
+++ b/procmeminfo.cpp
@@ -386,10 +386,6 @@
     size_t num_in_page_cache = 0;
     size_t num_leftover_pages = num_pages;
     for (size_t cur_page = first_page; cur_page < first_page + num_pages; ++cur_page) {
-        if (!get_wss) {
-            vma.usage.vss += pagesz;
-        }
-
         // Cache page map data.
         if (cur_page_cache_index == num_in_page_cache) {
             static constexpr size_t kMaxPages = 2048;
@@ -482,6 +478,9 @@
             vma.usage.shared_clean += is_dirty ? 0 : pagesz;
         }
     }
+    if (!get_wss) {
+        vma.usage.vss += pagesz * num_pages;
+    }
     return true;
 }