NUMA support for Serviceability Agent

Author: jsikstro

src/hotspot/share/gc/z/vmStructs_z.hpp

@@ -29,6 +29,7 @@
 #include "gc/z/zForwarding.hpp"
 #include "gc/z/zGranuleMap.hpp"
 #include "gc/z/zHeap.hpp"
+#include "gc/z/zNUMA.hpp"
 #include "gc/z/zPageAllocator.hpp"
 #include "gc/z/zPageType.hpp"
 #include "gc/z/zValue.hpp"
@@ -91,6 +92,7 @@ typedef ZValue<ZPerNUMAStorage, ZCacheState> ZPerNUMACacheState;
   nonstatic_field(ZPageAllocator,               _max_capacity,        const size_t)                  \
   nonstatic_field(ZPageAllocator,               _states,              ZPerNUMACacheState)            \
                                                                                                      \
+  static_field(ZNUMA,                           _count,               uint32_t)                      \
   nonstatic_field(ZPerNUMACacheState,           _addr,                const uintptr_t)               \
                                                                                                      \
   volatile_nonstatic_field(ZCacheState,         _capacity,            size_t)                        \
@@ -140,6 +142,7 @@ typedef ZValue<ZPerNUMAStorage, ZCacheState> ZPerNUMACacheState;
   declare_toplevel_type(ZPage)                                                                       \
   declare_toplevel_type(ZPageType)                                                                   \
   declare_toplevel_type(ZPageAllocator)                                                              \
+  declare_toplevel_type(ZNUMA)                                                                       \
   declare_toplevel_type(ZPerNUMACacheState)                                                          \
   declare_toplevel_type(ZCacheState)                                                                 \
   declare_toplevel_type(ZPageTable)                                                                  \

src/hotspot/share/gc/z/zNUMA.hpp

@@ -24,10 +24,13 @@
 #ifndef SHARE_GC_Z_ZNUMA_HPP
 #define SHARE_GC_Z_ZNUMA_HPP
 
+#include "gc/z/vmStructs_z.hpp"
 #include "memory/allStatic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ZNUMA : public AllStatic {
+  friend class VMStructs;
+
 private:
   static bool     _enabled;
   static uint32_t _count;

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZNUMA.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZNUMA {
+
+    private static CIntegerField countField;
+
+    static {
+        VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+    }
+
+    private static synchronized void initialize(TypeDataBase db) {
+        Type type = db.lookupType("ZNUMA");
+
+        countField = type.getCIntegerField("_count");
+    }
+
+    public long count() {
+        return countField.getValue();
+    }
+}

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageAllocator.java

@@ -38,6 +38,7 @@ public class ZPageAllocator extends VMObject {
 
     private static CIntegerField maxCapacityField;
     private static long cacheStateFieldOffset;
+    private static long numaCount;
 
     static {
         VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
@@ -48,6 +49,7 @@ private static synchronized void initialize(TypeDataBase db) {
 
         maxCapacityField = type.getCIntegerField("_max_capacity");
         cacheStateFieldOffset = type.getAddressField("_states").getOffset();
+        numaCount = (new ZNUMA()).count();
     }
 
     private ZPerNUMACacheState states() {
@@ -60,11 +62,19 @@ public long maxCapacity() {
     }
 
     public long capacity() {
-        return states().value().capacity();
+        long total_capacity = 0;
+        for (int id = 0; id < numaCount; id++) {
+          total_capacity += states().value(id).capacity();
+        }
+        return total_capacity;
     }
 
     public long used() {
-        return states().value().used();
+        long total_used = 0;
+        for (int id = 0; id < numaCount; id++) {
+          total_used += states().value(id).used();
+        }
+        return total_used;
     }
 
     public ZPageAllocator(Address addr) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPerNUMACacheState.java

@@ -37,6 +37,7 @@
 public class ZPerNUMACacheState extends VMObject {
 
     private static AddressField addrField;
+    private static long valueOffset = 4 * 1024; // 4K
 
     static {
         VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
@@ -47,9 +48,10 @@ private static synchronized void initialize(TypeDataBase db) {
         addrField = type.getAddressField("_addr");
     }
 
-    public ZCacheState value() {
-        Address valueAddr = addrField.getValue(addr);
-        return VMObjectFactory.newObject(ZCacheState.class, valueAddr);
+    public ZCacheState value(long id) {
+        Address valueArrayAddr = addrField.getValue(addr);
+        Address cacheStateAddr = valueArrayAddr.addOffsetTo(id * valueOffset);
+        return VMObjectFactory.newObject(ZCacheState.class, cacheStateAddr);
     }
 
     public ZPerNUMACacheState(Address addr) {

test/hotspot/gtest/gc/z/test_zMapper_windows.cpp

@@ -75,6 +75,7 @@ class ZMapperTest : public Test {
 
     ZSyscall::initialize();
     ZGlobalsPointers::initialize();
+    ZNUMA::initialize();
 
     // Fake a ZVirtualMemoryManager
     _vmm = (ZVirtualMemoryManager*)os::malloc(sizeof(ZVirtualMemoryManager), mtTest);