From bd3085c6672d24261d901131c0cd51df34f3c985 Mon Sep 17 00:00:00 2001
From: Carsten Grohmann <mail@carstengrohmann.de>
Date: Thu, 23 Mar 2023 21:44:39 +0100
Subject: [PATCH] Show memory watermarks together will all details

---
 OOMAnalyser.html | 13 +++++++++++++
 OOMAnalyser.py   |  4 ++++
 test.py          | 28 ++++++++++++++++++++++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/OOMAnalyser.html b/OOMAnalyser.html
index 03c1325..3e97fac 100644
--- a/OOMAnalyser.html
+++ b/OOMAnalyser.html
@@ -919,6 +919,18 @@ window.onerror = function (msg, url, lineNo, columnNo, errorObj) {
             </td>
         </tr>
 
+        <!-- Memory watermarks -->
+
+        <tr>
+            <th colspan="3" scope="row">Memory Watermarks </th>
+        </tr>
+        <tr>
+            <td></td>
+            <td class="terminal" colspan="2">
+                <pre class="mem_watermarks"></pre>
+            </td>
+        </tr>
+
         <tr>
             <th colspan="3" scope="row">Process Table</th>
         </tr>
@@ -1074,6 +1086,7 @@ window.onerror = function (msg, url, lineNo, columnNo, errorObj) {
         <li>Add analysis why the memory request failed</li>
         <li>Add check for heavy memory fragmentation</li>
         <li>Summary of the analysis revised</li>
+        <li>Show memory watermarks together will all details</li>
         <li>...</li>
     </ol>
 
diff --git a/OOMAnalyser.py b/OOMAnalyser.py
index 11e853c..95973d0 100644
--- a/OOMAnalyser.py
+++ b/OOMAnalyser.py
@@ -304,6 +304,10 @@ class BaseKernelConfig:
             r"(?P<mem_node_info>(^Node \d+ ((DMA|DMA32|Normal):|(hugepages)).+(\n|$))+)",
             False,
         ),
+        "Memory watermarks": (
+            r"(?P<mem_watermarks>(^(Node \d+ (DMA|DMA32|Normal) free:|lowmem_reserve\[\]:).+(\n|$))+)",
+            False,
+        ),
         "Page cache": (
             r"^(?P<pagecache_total_pages>\d+) total pagecache pages.*$",
             True,
diff --git a/test.py b/test.py
index f9c112e..d589577 100755
--- a/test.py
+++ b/test.py
@@ -294,7 +294,19 @@ class TestInBrowser(TestBase):
         self.assertEqual(
             mem_node_info.text[-80:],
             "Node 1 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB",
-            "Unexpected memory chunks",
+            "Unexpected memory information about hugepages",
+        )
+
+        mem_watermarks = self.driver.find_element(By.CLASS_NAME, "mem_watermarks")
+        self.assertEqual(
+            mem_watermarks.text[:51],
+            "Node 0 DMA free:15872kB min:40kB low:48kB high:60kB",
+            "Unexpected memory watermarks",
+        )
+        self.assertEqual(
+            mem_watermarks.text[-25:],
+            "lowmem_reserve[]: 0 0 0 0",
+            "Unexpected lowmem_reserve values",
         )
 
         head = self.driver.find_element(By.ID, "pstable_header")
@@ -374,7 +386,19 @@ class TestInBrowser(TestBase):
         self.assertEqual(
             mem_node_info.text[-80:],
             "Node 0 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB",
-            "Unexpected memory chunks",
+            "Unexpected memory information about hugepages",
+        )
+
+        mem_watermarks = self.driver.find_element(By.CLASS_NAME, "mem_watermarks")
+        self.assertEqual(
+            mem_watermarks.text[:54],
+            "Node 0 DMA free:15036kB min:352kB low:440kB high:528kB",
+            "Unexpected memory watermarks",
+        )
+        self.assertEqual(
+            mem_watermarks.text[-27:],
+            "lowmem_reserve[]: 0 0 0 0 0",
+            "Unexpected lowmem_reserve values",
         )
 
         head = self.driver.find_element(By.ID, "pstable_header")