Skip to content

[GR-62462] Make enter- and leavestub for interpreter uninterruptible #12706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 1 commit into from
Dec 14, 2025
+836 −265
Merged

[GR-62462] Make enter- and leavestub for interpreter uninterruptible #12706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions ...atevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import com.oracle.svm.core.code.CodeInfoTable;
import com.oracle.svm.core.code.RuntimeCodeInfoAccess;
import com.oracle.svm.core.code.RuntimeCodeInfoMemory;
import com.oracle.svm.core.deopt.DeoptimizationSlotPacking;
import com.oracle.svm.core.deopt.DeoptimizedFrame;
import com.oracle.svm.core.deopt.Deoptimizer;
import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader;
Expand Down Expand Up @@ -87,7 +86,6 @@
import com.oracle.svm.core.heap.UninterruptibleObjectVisitor;
import com.oracle.svm.core.heap.VMOperationInfos;
import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
import com.oracle.svm.core.interpreter.InterpreterSupport;
import com.oracle.svm.core.jdk.RuntimeSupport;
import com.oracle.svm.core.jfr.JfrGCWhen;
import com.oracle.svm.core.jfr.JfrTicks;
Expand Down Expand Up @@ -797,14 +795,7 @@ private static void walkStack(IsolateThread thread, JavaStackWalk walk, ObjectRe
CodeInfo codeInfo = CodeInfoAccess.unsafeConvert(frame.getIPCodeInfo());

if (JavaFrames.isInterpreterLeaveStub(frame)) {
/*
* Variable frame size is packed into the first stack slot used for argument
* passing (re-use of deopt slot).
*/
long varStackSize = DeoptimizationSlotPacking.decodeVariableFrameSizeFromDeoptSlot(sp.readLong(0));
Pointer actualSP = sp.add(Word.unsigned(varStackSize));

InterpreterSupport.walkInterpreterLeaveStubFrame(visitor, actualSP, sp);
/* nothing to scan */
} else {
NonmovableArray<Byte> referenceMapEncoding = CodeInfoAccess.getStackReferenceMapEncoding(codeInfo);
long referenceMapIndex = frame.getReferenceMapIndex();
Expand Down
12 changes: 1 addition & 11 deletions ...rc/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/StackVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,10 @@
import com.oracle.svm.core.NeverInline;
import com.oracle.svm.core.code.CodeInfo;
import com.oracle.svm.core.code.CodeInfoTable;
import com.oracle.svm.core.deopt.DeoptimizationSlotPacking;
import com.oracle.svm.core.deopt.DeoptimizedFrame;
import com.oracle.svm.core.heap.ObjectReferenceVisitor;
import com.oracle.svm.core.heap.RestrictHeapAccess;
import com.oracle.svm.core.interpreter.InterpreterSupport;
import com.oracle.svm.core.snippets.KnownIntrinsics;
import com.oracle.svm.core.stack.JavaFrames;
import com.oracle.svm.core.stack.JavaStackWalker;
import com.oracle.svm.core.stack.StackFrameVisitor;
import com.oracle.svm.core.thread.VMThreads;
Expand Down Expand Up @@ -96,14 +93,7 @@ public void initialize(IsolateThread thread) {
@RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate while verifying the stack.")
public boolean visitRegularFrame(Pointer currentSP, CodePointer currentIP, CodeInfo codeInfo) {
verifyFrameReferencesVisitor.initialize(thread, currentSP, currentIP);
if (JavaFrames.isInterpreterLeaveStub(currentIP)) {
// This should probably be handled in JavaStackWalker GR-71827
long varStackSize = DeoptimizationSlotPacking.decodeVariableFrameSizeFromDeoptSlot(currentSP.readLong(0));
Pointer actualSP = currentSP.add(Word.unsigned(varStackSize));
InterpreterSupport.walkInterpreterLeaveStubFrame(verifyFrameReferencesVisitor, actualSP, currentSP);
} else {
CodeInfoTable.visitObjectReferences(currentSP, currentIP, codeInfo, verifyFrameReferencesVisitor);
}
CodeInfoTable.visitObjectReferences(currentSP, currentIP, codeInfo, verifyFrameReferencesVisitor);
result &= verifyFrameReferencesVisitor.result;
return true;
}
Expand Down
105 changes: 52 additions & 53 deletions ...svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64InterpreterStubs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,11 @@
*/
package com.oracle.svm.core.graal.aarch64;

import com.oracle.svm.core.c.struct.OffsetOf;
import com.oracle.svm.core.deopt.DeoptimizationSlotPacking;
import com.oracle.svm.core.graal.code.InterpreterAccessStubData;
import com.oracle.svm.core.meta.SharedMethod;
import com.oracle.svm.core.util.VMError;
import jdk.graal.compiler.api.replacements.Fold;
import jdk.graal.compiler.asm.Label;
import jdk.graal.compiler.asm.aarch64.AArch64Address;
import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
import jdk.graal.compiler.core.common.NumUtil;
import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
import jdk.graal.compiler.word.Word;
import jdk.vm.ci.aarch64.AArch64;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.RegisterValue;
import jdk.vm.ci.code.StackSlot;
import jdk.vm.ci.meta.AllocatableValue;
import org.graalvm.nativeimage.c.struct.RawField;
import org.graalvm.nativeimage.c.struct.RawStructure;
import org.graalvm.nativeimage.c.struct.SizeOf;
import org.graalvm.word.Pointer;
import org.graalvm.word.PointerBase;

import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress;
import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED;
import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED;
import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED;
import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress;
import static jdk.vm.ci.aarch64.AArch64.r0;
import static jdk.vm.ci.aarch64.AArch64.r1;
import static jdk.vm.ci.aarch64.AArch64.r2;
Expand All @@ -69,6 +47,30 @@
import static jdk.vm.ci.aarch64.AArch64.v6;
import static jdk.vm.ci.aarch64.AArch64.v7;

import org.graalvm.nativeimage.c.struct.RawField;
import org.graalvm.nativeimage.c.struct.RawStructure;
import org.graalvm.nativeimage.c.struct.SizeOf;
import org.graalvm.word.Pointer;
import org.graalvm.word.PointerBase;

import com.oracle.svm.core.Uninterruptible;
import com.oracle.svm.core.c.struct.OffsetOf;
import com.oracle.svm.core.deopt.DeoptimizationSlotPacking;
import com.oracle.svm.core.graal.code.InterpreterAccessStubData;
import com.oracle.svm.core.graal.code.PreparedArgumentType;
import com.oracle.svm.core.meta.SharedMethod;
import com.oracle.svm.core.util.VMError;

import jdk.graal.compiler.api.replacements.Fold;
import jdk.graal.compiler.asm.Label;
import jdk.graal.compiler.asm.aarch64.AArch64Address;
import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
import jdk.graal.compiler.core.common.NumUtil;
import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
import jdk.graal.compiler.word.Word;
import jdk.vm.ci.aarch64.AArch64;
import jdk.vm.ci.code.Register;

public class AArch64InterpreterStubs {

public static final Register TRAMPOLINE_ARGUMENT = AArch64.r12;
Expand Down Expand Up @@ -150,16 +152,12 @@ public void enter(CompilationResultBuilder crb) {
super.enter(crb);
AArch64MacroAssembler masm = (AArch64MacroAssembler) crb.asm;

/* sp points to four reserved stack slots for this stub */
/* sp points to two reserved stack slots for this stub */

/* Pointer to InterpreterData struct */
masm.str(64, r1, createImmediateAddress(64, IMMEDIATE_UNSIGNED_SCALED, sp, 0));
/* Variable stack size */
masm.str(64, r2, createImmediateAddress(64, IMMEDIATE_UNSIGNED_SCALED, sp, 8));
/* gcReferenceMap next */
masm.str(64, r3, createImmediateAddress(64, IMMEDIATE_UNSIGNED_SCALED, sp, 16));

/* 4th slot is for stack alignment to 0x10 */

masm.sub(64, sp, sp, r2 /* variable stack size */);
}
Expand Down Expand Up @@ -260,11 +258,8 @@ public static int additionalFrameSizeEnterStub() {

public static int additionalFrameSizeLeaveStub() {
int wordSize = 8;
/*
* reserve four slots for: base address of outgoing stack args, variable stack size,
* gcReferenceMap, padding
*/
return 4 * wordSize;
// reserve two slots for: base address of outgoing stack args and variable stack size.
return 2 * wordSize;
}

@RawStructure
Expand Down Expand Up @@ -509,7 +504,8 @@ public void setSp(Pointer data, int stackSize, Pointer stackBuffer) {
}

@Override
public long getGpArgumentAt(AllocatableValue ccArg, Pointer data, int pos) {
@Uninterruptible(reason = REASON_RAW_POINTER, callerMustBe = true)
public long getGpArgumentAt(PreparedArgumentType cArgType, Pointer data, int pos) {
InterpreterDataAArch64 p = (InterpreterDataAArch64) data;
return switch (pos) {
case 0 -> p.getAbiGpArg0();
Expand All @@ -521,18 +517,19 @@ public long getGpArgumentAt(AllocatableValue ccArg, Pointer data, int pos) {
case 6 -> p.getAbiGpArg6();
case 7 -> p.getAbiGpArg7();
default -> {
StackSlot stackSlot = (StackSlot) ccArg;
VMError.guarantee(cArgType.isStackSlot());
Pointer spVal = Word.pointer(p.getAbiSpReg());
yield spVal.readLong(stackSlot.getOffset(0));
yield spVal.readLong(cArgType.getStackOffset());
}
};
}

@Override
public long setGpArgumentAt(AllocatableValue ccArg, Pointer data, int pos, long val) {
@Uninterruptible(reason = REASON_RAW_POINTER, callerMustBe = true)
public void setGpArgumentAt(PreparedArgumentType cArgType, Pointer data, int pos, long val, boolean incoming) {
InterpreterDataAArch64 p = (InterpreterDataAArch64) data;
if (pos >= 0 && pos <= 7) {
VMError.guarantee(ccArg instanceof RegisterValue);
VMError.guarantee(cArgType.isRegister());
switch (pos) {
case 0 -> p.setAbiGpArg0(val);
case 1 -> p.setAbiGpArg1(val);
Expand All @@ -543,24 +540,21 @@ public long setGpArgumentAt(AllocatableValue ccArg, Pointer data, int pos, long
case 6 -> p.setAbiGpArg6(val);
case 7 -> p.setAbiGpArg7(val);
}
/* no GC mask required */
return 0;
return;
}
StackSlot stackSlot = (StackSlot) ccArg;
VMError.guarantee(cArgType.isStackSlot());

Pointer spVal = Word.pointer(p.getAbiSpReg());
int offset = stackSlot.getOffset(0);
int offset = cArgType.getStackOffset();
VMError.guarantee(spVal.isNonNull());
VMError.guarantee(offset < p.getStackSize());
VMError.guarantee(incoming || offset < p.getStackSize());

spVal.writeLong(offset, val);

VMError.guarantee((pos - 8) < Long.SIZE, "more than 64 stack args are not supported");
return 1L << (pos - 8);
}

@Override
public long getFpArgumentAt(AllocatableValue ccArg, Pointer data, int pos) {
@Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
public long getFpArgumentAt(PreparedArgumentType cArgType, Pointer data, int pos) {
InterpreterDataAArch64 p = (InterpreterDataAArch64) data;
return switch (pos) {
case 0 -> p.getAbiFpArg0();
Expand All @@ -572,15 +566,16 @@ public long getFpArgumentAt(AllocatableValue ccArg, Pointer data, int pos) {
case 6 -> p.getAbiFpArg6();
case 7 -> p.getAbiFpArg7();
default -> {
StackSlot stackSlot = (StackSlot) ccArg;
VMError.guarantee(cArgType.isStackSlot());
Pointer spVal = Word.pointer(p.getAbiSpReg());
yield spVal.readLong(stackSlot.getOffset(0));
yield spVal.readLong(cArgType.getStackOffset());
}
};
}

@Override
public void setFpArgumentAt(AllocatableValue ccArg, Pointer data, int pos, long val) {
@Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
public void setFpArgumentAt(PreparedArgumentType cArgType, Pointer data, int pos, long val) {
InterpreterDataAArch64 p = (InterpreterDataAArch64) data;
switch (pos) {
case 0 -> p.setAbiFpArg0(val);
Expand All @@ -592,10 +587,10 @@ public void setFpArgumentAt(AllocatableValue ccArg, Pointer data, int pos, long
case 6 -> p.setAbiFpArg6(val);
case 7 -> p.setAbiFpArg7(val);
default -> {
StackSlot stackSlot = (StackSlot) ccArg;
VMError.guarantee(cArgType.isStackSlot());

Pointer spVal = Word.pointer(p.getAbiSpReg());
int offset = stackSlot.getOffset(0);
int offset = cArgType.getStackOffset();

VMError.guarantee(spVal.isNonNull());
VMError.guarantee(offset < p.getStackSize());
Expand All @@ -606,21 +601,25 @@ public void setFpArgumentAt(AllocatableValue ccArg, Pointer data, int pos, long
}

@Override
@Uninterruptible(reason = REASON_RAW_POINTER, callerMustBe = true)
public long getGpReturn(Pointer data) {
return ((InterpreterDataAArch64) data).getAbiGpRet();
}

@Override
@Uninterruptible(reason = REASON_RAW_POINTER, callerMustBe = true)
public void setGpReturn(Pointer data, long gpReturn) {
((InterpreterDataAArch64) data).setAbiGpRet(gpReturn);
}

@Override
@Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
public long getFpReturn(Pointer data) {
return ((InterpreterDataAArch64) data).getAbiFpRet();
}

@Override
@Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
public void setFpReturn(Pointer data, long fpReturn) {
((InterpreterDataAArch64) data).setAbiFpRet(fpReturn);
}
Expand Down
Loading