[GR-48695] Backport to 23.0: Uncommitting of memory failed - should not reach here.

PullRequest: graal/15886

Author: hamzaGhaissi

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java

@@ -123,6 +123,11 @@ static UnsignedWord getAlignedHeapChunkAlignment() {
         return getAlignedHeapChunkSize();
     }
 
+    @Fold
+    public static UnsignedWord getMinUnalignedChunkSize() {
+        return UnalignedHeapChunk.getChunkSizeForObject(HeapParameters.getLargeArrayThreshold());
+    }
+
     @Fold
     public static UnsignedWord getLargeArrayThreshold() {
         long largeArrayThreshold = SerialAndEpsilonGCOptions.LargeArrayThreshold.getValue();

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java

@@ -105,10 +105,6 @@ public static Pointer getObjectEnd(UnalignedHeader that) {
         return HeapChunk.getEndPointer(that);
     }
 
-    public static UnsignedWord getOverhead() {
-        return getObjectStartOffset();
-    }
-
     static UnsignedWord getChunkSizeForObject(UnsignedWord objectSize) {
         UnsignedWord objectStart = getObjectStartOffset();
         UnsignedWord alignment = WordFactory.unsigned(ConfigurationValues.getObjectLayout().getAlignment());

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointErrors.java

@@ -59,6 +59,9 @@ private CEntryPointErrors() {
     @Description("An argument was NULL.") //
     public static final int NULL_ARGUMENT = 2;
 
+    @Description("Memory allocation failed, the OS is probably out of memory.") //
+    public static final int ALLOCATION_FAILED = 3;
+
     @Description("The specified thread is not attached to the isolate.") //
     public static final int UNATTACHED_THREAD = 4;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/AbstractRuntimeCodeInstaller.java

@@ -47,11 +47,13 @@ protected Pointer allocateCodeMemory(long size) {
     }
 
     protected void makeCodeMemoryExecutableReadOnly(Pointer start, UnsignedWord size) {
-        RuntimeCodeInfoAccess.makeCodeMemoryExecutableReadOnly((CodePointer) start, size);
+        int result = RuntimeCodeInfoAccess.makeCodeMemoryExecutableReadOnly((CodePointer) start, size);
+        VMError.guarantee(result == 0, "Failed to make code memory read only.");
     }
 
     protected void makeCodeMemoryExecutableWritable(Pointer start, UnsignedWord size) {
-        RuntimeCodeInfoAccess.makeCodeMemoryExecutableWritable((CodePointer) start, size);
+        int result = RuntimeCodeInfoAccess.makeCodeMemoryExecutableWritable((CodePointer) start, size);
+        VMError.guarantee(result == 0, "Failed to make code memory writable.");
     }
 
     protected static void doInstallPrepared(SharedMethod method, CodeInfo codeInfo, SubstrateInstalledCode installedCode) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java

@@ -42,6 +42,7 @@
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.c.function.CEntryPointErrors;
 import com.oracle.svm.core.code.RuntimeCodeCache;
+import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.util.VMError;
@@ -109,7 +110,7 @@ public Pointer allocateAlignedChunk(UnsignedWord nbytes, UnsignedWord alignment)
 
     @Override
     public Pointer allocateUnalignedChunk(UnsignedWord nbytes) {
-        return allocate(nbytes, WordFactory.unsigned(1), false);
+        return allocate(nbytes, getAlignmentForUnalignedChunks(), false);
     }
 
     @Override
@@ -172,6 +173,16 @@ private void free(PointerBase start, UnsignedWord nbytes) {
         }
     }
 
+    /**
+     * Unaligned chunks also need some minimal alignment - otherwise, the data in the chunk header
+     * or the Java heap object within the unaligned chunk would be misaligned.
+     */
+    @Fold
+    protected static UnsignedWord getAlignmentForUnalignedChunks() {
+        int alignment = Math.max(ConfigurationValues.getTarget().wordSize, ConfigurationValues.getObjectLayout().getAlignment());
+        return WordFactory.unsigned(alignment);
+    }
+
     private final VirtualMemoryTracker tracker = new VirtualMemoryTracker();
 
     public static class VirtualMemoryTracker {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java

@@ -32,7 +32,6 @@
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.UnsignedWord;
-import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters;
@@ -43,12 +42,6 @@
  * memory or swap space.
  */
 public interface CommittedMemoryProvider {
-    /**
-     * Value for alignment parameters that indicates that no specific alignment is required (other
-     * than the {@linkplain #getGranularity() granularity} usually).
-     */
-    UnsignedWord UNALIGNED = WordFactory.unsigned(1);
-
     @Fold
     static CommittedMemoryProvider get() {
         return ImageSingletons.lookup(CommittedMemoryProvider.class);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/PointerUtils.java

@@ -101,6 +101,7 @@ public static UnsignedWord absoluteDifference(PointerBase pointer1, PointerBase
      * @param y Another Pointer.
      * @return The whichever Pointer is smaller.
      */
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static <T extends PointerBase> T min(T x, T y) {
         return (((Pointer) x).belowOrEqual((Pointer) y)) ? x : y;
     }
@@ -112,6 +113,7 @@ public static <T extends PointerBase> T min(T x, T y) {
      * @param y Another Pointer.
      * @return The whichever Pointer is larger.
      */
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static <T extends PointerBase> T max(T x, T y) {
         return (((Pointer) x).aboveOrEqual((Pointer) y)) ? x : y;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/VMError.java

@@ -64,6 +64,9 @@ public static final class HostedError extends Error {
 
     }
 
+    public static final String msgShouldNotReachHere = "should not reach here";
+    public static final String msgShouldNotReachHereAtRuntime = msgShouldNotReachHere + ": this code is expected to be unreachable at runtime";
+
     public static RuntimeException shouldNotReachHere() {
         throw new HostedError("should not reach here");
     }
@@ -80,6 +83,13 @@ public static RuntimeException shouldNotReachHere(String msg, Throwable cause) {
         throw new HostedError(msg, cause);
     }
 
+    /**
+     * A hardcoded list of options (if, switch) did not handle the case actually provided.
+     */
+    public static RuntimeException shouldNotReachHereAtRuntime() {
+        throw new HostedError(msgShouldNotReachHereAtRuntime);
+    }
+
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static void guarantee(boolean condition) {
         if (!condition) {