From 7777eb5e15b9f08cdc621c84ff38c72334388b56 Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gziemski@openjdk.org>
Date: Mon, 5 Feb 2024 19:35:43 +0000
Subject: [PATCH] 8321931: memory_swap_current_in_bytes reports 0 as
 "unlimited"

Reviewed-by: sgehwolf, iklam
---
 src/hotspot/os/linux/osContainer_linux.cpp    |  2 +-
 .../containers/docker/TestContainerInfo.java  | 97 +++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/containers/docker/TestContainerInfo.java

diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index 14bfa5a7678..cd723228a75 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -149,7 +149,7 @@ jlong OSContainer::pids_current() {
 
 void OSContainer::print_container_helper(outputStream* st, jlong j, const char* metrics) {
   st->print("%s: ", metrics);
-  if (j > 0) {
+  if (j >= 0) {
     if (j >= 1024) {
       st->print_cr(UINT64_FORMAT " k", uint64_t(j) / K);
     } else {
diff --git a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
new file mode 100644
index 00000000000..dadc262cd5a
--- /dev/null
+++ b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @summary Test container info for cgroup v2
+ * @requires docker.support
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ *          jdk.jartool/sun.tools.jar
+ * @build CheckContainerized jdk.test.whitebox.WhiteBox PrintContainerInfo
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox
+ * @run driver TestContainerInfo
+ */
+import jtreg.SkippedException;
+import jdk.test.lib.containers.docker.Common;
+import jdk.test.lib.containers.docker.DockerTestUtils;
+import jdk.test.lib.containers.docker.DockerRunOptions;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+
+public class TestContainerInfo {
+    private static final String imageName = Common.imageName("container-info");
+
+    public static void main(String[] args) throws Exception {
+        if (!DockerTestUtils.canTestDocker()) {
+            return;
+        }
+
+        Common.prepareWhiteBox();
+        DockerTestUtils.buildJdkContainerImage(imageName);
+
+        try {
+            testPrintContainerInfoWithoutSwap();
+        } finally {
+            DockerTestUtils.removeDockerImage(imageName);
+        }
+    }
+
+    private static void testPrintContainerInfoWithoutSwap() throws Exception {
+        Common.logNewTestCase("Test print_container_info() - without swap");
+
+        DockerRunOptions opts = Common.newOpts(imageName, "PrintContainerInfo")
+                      .addDockerOpts("--memory=500m")
+                      .addDockerOpts("--memory-swap=500m"); // no swap
+        Common.addWhiteBoxOpts(opts);
+
+        OutputAnalyzer out = Common.run(opts);
+        checkContainerInfo(out);
+    }
+
+    private static void shouldMatchWithValue(OutputAnalyzer output, String match, String value) {
+        output.shouldContain(match);
+        String str = output.getOutput();
+        for (String s : str.split(System.lineSeparator())) {
+            if (s.contains(match)) {
+                if (!s.contains(value)) {
+                    throw new RuntimeException("memory_swap_current_in_bytes NOT " + value + "! Line was : " + s);
+                }
+            }
+        }
+    }
+
+    private static void checkContainerInfo(OutputAnalyzer out) throws Exception {
+        String str = out.getOutput();
+        if (str.contains("cgroupv2")) {
+            shouldMatchWithValue(out, "memory_swap_max_limit_in_bytes", "0");
+            shouldMatchWithValue(out, "memory_swap_current_in_bytes", "0");
+        } else {
+            throw new SkippedException("This test is cgroups v2 specific, skipped on cgroups v1");
+        }
+    }
+}