8349146: [REDO] Implement a better allocator for downcalls

src/java.base/share/classes/jdk/internal/foreign/BufferStack.java

@@ -0,0 +1,206 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 jdk.internal.foreign;
+
+import jdk.internal.misc.CarrierThreadLocal;
+import jdk.internal.vm.annotation.ForceInline;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SegmentAllocator;
+import java.lang.ref.Reference;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Consumer;
+
+/**
+ * A buffer stack that allows efficient reuse of memory segments. This is useful in cases
+ * where temporary memory is needed.
+ * <p>
+ * Use the factories {@code BufferStack.of(...)} to create new instances of this class.
+ * <p>
+ * Note: The reused segments are neither zeroed out before nor after re-use.
+ */
+public final class BufferStack {
+
+    private final long byteSize;
+    private final CarrierThreadLocal<PerThread> tl;
+
+    public BufferStack(long byteSize, long byteAlignment) {
+        this.byteSize = byteSize;
+        this.tl = new CarrierThreadLocal<>() {
+            @Override
+            protected BufferStack.PerThread initialValue() {
+                return BufferStack.PerThread.of(byteSize, byteAlignment);
+            }
+        };
+    }
+
+    /**
+     * {@return a new Arena that tries to provide {@code byteSize} and {@code byteAlignment}
+     *          allocations by recycling the BufferStack's internal memory}
+     *
+     * @param byteSize      to be reserved from this BufferStack's internal memory
+     * @param byteAlignment to be used for reservation
+     */
+    @ForceInline
+    public Arena pushFrame(long byteSize, long byteAlignment) {
+        return tl.get().pushFrame(byteSize, byteAlignment);
+    }
+
+    /**
+     * {@return a new Arena that tries to provide {@code byteSize}
+     *          allocations by recycling the BufferStack's internal memory}
+     *
+     * @param byteSize      to be reserved from this BufferStack's internal memory
+     */
+    @ForceInline
+    public Arena pushFrame(long byteSize) {
+        return pushFrame(byteSize, 1);
+    }
+
+    /**
+     * {@return a new Arena that tries to provide {@code layout}
+     *          allocations by recycling the BufferStack's internal memory}
+     *
+     * @param layout for which to reserve internal memory
+     */
+    @ForceInline
+    public Arena pushFrame(MemoryLayout layout) {
+        return pushFrame(layout.byteSize(), layout.byteAlignment());
+    }
+
+    @Override
+    public String toString() {
+        return "BufferStack[" + byteSize + "]";
+    }
+
+    private record PerThread(ReentrantLock lock, Arena arena, SlicingAllocator stack) {
+
+        @ForceInline
+        public Arena pushFrame(long size, long byteAlignment) {
+            boolean needsLock = Thread.currentThread().isVirtual() && !lock.isHeldByCurrentThread();
+            if (needsLock && !lock.tryLock()) {
+                // Rare: another virtual thread on the same carrier competed for acquisition.
+                return Arena.ofConfined();
+            }
+            if (!stack.canAllocate(size, byteAlignment)) {
+                if (needsLock) lock.unlock();
+                return Arena.ofConfined();
+            }
+            return new Frame(needsLock, size, byteAlignment);
+        }
+
+        static PerThread of(long byteSize, long byteAlignment) {
+            final Arena arena = Arena.ofAuto();
+            return new PerThread(new ReentrantLock(),
+                    arena,
+                    new SlicingAllocator(arena.allocate(byteSize, byteAlignment)));
+        }
+
+        private final class Frame implements Arena {
+            private final boolean locked;
+            private final long parentOffset;
+            private final long topOfStack;
+            private final Arena confinedArena = Arena.ofConfined();
+            private final SegmentAllocator frame;
+
+            @SuppressWarnings("restricted")
+            @ForceInline
+            public Frame(boolean locked, long byteSize, long byteAlignment) {
+                this.locked = locked;
+                parentOffset = stack.currentOffset();
+                MemorySegment frameSegment = stack.allocate(byteSize, byteAlignment);
+                topOfStack = stack.currentOffset();
+                // The cleanup action will keep the original automatic `arena` (from which
+                // the reusable segment is first allocated) alive even if this Frame
+                // becomes unreachable but there are reachable segments still alive.
+                frame = new SlicingAllocator(frameSegment.reinterpret(confinedArena, new CleanupAction(arena)));
+            }
+
+            record CleanupAction(Arena arena) implements Consumer<MemorySegment> {
+                @Override
+                public void accept(MemorySegment memorySegment) {
+                    Reference.reachabilityFence(arena);
+                }
+            }
+
+            @ForceInline
+            private void assertOrder() {
+                if (topOfStack != stack.currentOffset())
+                    throw new IllegalStateException("Out of order access: frame not top-of-stack");
+            }
+
+            @ForceInline
+            @Override
+            @SuppressWarnings("restricted")
+            public MemorySegment allocate(long byteSize, long byteAlignment) {
+                // Make sure we are on the right thread and not closed
+                MemorySessionImpl.toMemorySession(confinedArena).checkValidState();
+                return frame.allocate(byteSize, byteAlignment);
+            }
+
+            @ForceInline
+            @Override
+            public MemorySegment.Scope scope() {
+                return confinedArena.scope();
+            }
+
+            @ForceInline
+            @Override
+            public void close() {
+                assertOrder();
+                // the Arena::close method is called "early" as it checks thread
+                // confinement and crucially before any mutation of the internal
+                // state takes place.
+                confinedArena.close();
+                stack.resetTo(parentOffset);
+                if (locked) {
+                    lock.unlock();
+                }
+            }
+        }
+    }
+
+    public static BufferStack of(long byteSize, long byteAlignment) {
+        if (byteSize < 0) {
+            throw new IllegalArgumentException("Negative byteSize: " + byteSize);
+        }
+        if (byteAlignment < 0) {
+            throw new IllegalArgumentException("Negative byteAlignment: " + byteAlignment);
+        }
+        return new BufferStack(byteSize, byteAlignment);
+    }
+
+    public static BufferStack of(long byteSize) {
+        return new BufferStack(byteSize, 1);
+    }
+
+    public static BufferStack of(MemoryLayout layout) {
+        // Implicit null check
+        return of(layout.byteSize(), layout.byteAlignment());
+    }
+}

src/java.base/share/classes/jdk/internal/foreign/SlicingAllocator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -38,6 +38,22 @@ public SlicingAllocator(MemorySegment segment) {
         this.segment = segment;
     }
 
+    public long currentOffset() {
+        return sp;
+    }
+
+    public void resetTo(long offset) {
+        if (offset < 0 || offset > sp)
+            throw new IllegalArgumentException(String.format("offset %d should be in [0, %d] ", offset, sp));
+        this.sp = offset;
+    }
+
+    public boolean canAllocate(long byteSize, long byteAlignment) {
+        long min = segment.address();
+        long start = Utils.alignUp(min + sp, byteAlignment) - min;
+        return start + byteSize <= segment.byteSize();
+    }
+
     MemorySegment trySlice(long byteSize, long byteAlignment) {
         long min = segment.address();
         long start = Utils.alignUp(min + sp, byteAlignment) - min;

src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java

@@ -24,9 +24,9 @@
  */
 package jdk.internal.foreign.abi;
 
-import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.JavaLangInvokeAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.foreign.BufferStack;
 import jdk.internal.foreign.CABI;
 import jdk.internal.foreign.abi.AbstractLinker.UpcallStubFactory;
 import jdk.internal.foreign.abi.aarch64.linux.LinuxAArch64Linker;
@@ -390,26 +390,12 @@ static long pickChunkOffset(long chunkOffset, long byteWidth, int chunkWidth) {
                 : chunkOffset;
     }
 
-    public static Arena newBoundedArena(long size) {
-        return new Arena() {
-            final Arena arena = Arena.ofConfined();
-            final SegmentAllocator slicingAllocator = SegmentAllocator.slicingAllocator(arena.allocate(size));
-
-            @Override
-            public Scope scope() {
-                return arena.scope();
-            }
+    private static final int LINKER_STACK_SIZE = Integer.getInteger("jdk.internal.foreign.LINKER_STACK_SIZE", 256);
+    private static final BufferStack LINKER_STACK = BufferStack.of(LINKER_STACK_SIZE, 1);
 
-            @Override
-            public void close() {
-                arena.close();
-            }
-
-            @Override
-            public MemorySegment allocate(long byteSize, long byteAlignment) {
-                return slicingAllocator.allocate(byteSize, byteAlignment);
-            }
-        };
+    @ForceInline
+    public static Arena newBoundedArena(long size) {
+        return LINKER_STACK.pushFrame(size, 8);
     }
 
     public static Arena newEmptyArena() {

test/jdk/ProblemList.txt

@@ -784,6 +784,8 @@ jdk/jfr/jvm/TestWaste.java                                      8282427 generic-
 
 # jdk_foreign
 
+java/foreign/TestBufferStackStress.java                         8350455 macosx-all
+
 ############################################################################
 # Client manual tests