Fix PerfMap lock ordering violation by deferring LogStubs operations

src/coreclr/inc/CrstTypes.def

@@ -517,6 +517,10 @@ End
 
 Crst PerfMap
     AcquiredAfter CodeVersioning AssemblyList
+    AcquiredBefore PerfMapDeferredActions
+End
+
+Crst PerfMapDeferredActions
 End
 
 Crst InterfaceDispatchGlobalLists

src/coreclr/inc/crsttypes_generated.h

@@ -85,41 +85,42 @@ enum CrstType
     CrstPEImage = 67,
     CrstPendingTypeLoadEntry = 68,
     CrstPerfMap = 69,
-    CrstPgoData = 70,
-    CrstPinnedByrefValidation = 71,
-    CrstPinnedHeapHandleTable = 72,
-    CrstPregeneratedStringThunks = 73,
-    CrstProfilerGCRefDataFreeList = 74,
-    CrstProfilingAPIStatus = 75,
-    CrstRCWCache = 76,
-    CrstRCWCleanupList = 77,
-    CrstReadyToRunEntryPointToMethodDescMap = 78,
-    CrstReflection = 79,
-    CrstReJITGlobalRequest = 80,
-    CrstSigConvert = 81,
-    CrstSingleUseLock = 82,
-    CrstStressLog = 83,
-    CrstStubCache = 84,
-    CrstStubDispatchCache = 85,
-    CrstSyncBlockCache = 86,
-    CrstSyncHashLock = 87,
-    CrstSystemDomain = 88,
-    CrstSystemDomainDelayedUnloadList = 89,
-    CrstThreadIdDispenser = 90,
-    CrstThreadLocalStorageLock = 91,
-    CrstThreadStore = 92,
-    CrstTieredCompilation = 93,
-    CrstTypeEquivalenceMap = 94,
-    CrstTypeIDMap = 95,
-    CrstUMEntryThunkCache = 96,
-    CrstUMEntryThunkFreeListLock = 97,
-    CrstUniqueStack = 98,
-    CrstUnresolvedClassLock = 99,
-    CrstUnwindInfoTablePendingLock = 100,
-    CrstUnwindInfoTablePublishLock = 101,
-    CrstVSDIndirectionCellLock = 102,
-    CrstWrapperTemplate = 103,
-    kNumberOfCrstTypes = 104
+    CrstPerfMapDeferredActions = 70,
+    CrstPgoData = 71,
+    CrstPinnedByrefValidation = 72,
+    CrstPinnedHeapHandleTable = 73,
+    CrstPregeneratedStringThunks = 74,
+    CrstProfilerGCRefDataFreeList = 75,
+    CrstProfilingAPIStatus = 76,
+    CrstRCWCache = 77,
+    CrstRCWCleanupList = 78,
+    CrstReadyToRunEntryPointToMethodDescMap = 79,
+    CrstReflection = 80,
+    CrstReJITGlobalRequest = 81,
+    CrstSigConvert = 82,
+    CrstSingleUseLock = 83,
+    CrstStressLog = 84,
+    CrstStubCache = 85,
+    CrstStubDispatchCache = 86,
+    CrstSyncBlockCache = 87,
+    CrstSyncHashLock = 88,
+    CrstSystemDomain = 89,
+    CrstSystemDomainDelayedUnloadList = 90,
+    CrstThreadIdDispenser = 91,
+    CrstThreadLocalStorageLock = 92,
+    CrstThreadStore = 93,
+    CrstTieredCompilation = 94,
+    CrstTypeEquivalenceMap = 95,
+    CrstTypeIDMap = 96,
+    CrstUMEntryThunkCache = 97,
+    CrstUMEntryThunkFreeListLock = 98,
+    CrstUniqueStack = 99,
+    CrstUnresolvedClassLock = 100,
+    CrstUnwindInfoTablePendingLock = 101,
+    CrstUnwindInfoTablePublishLock = 102,
+    CrstVSDIndirectionCellLock = 103,
+    CrstWrapperTemplate = 104,
+    kNumberOfCrstTypes = 105
 };
 
 #endif // __CRST_TYPES_INCLUDED
@@ -131,7 +132,7 @@ enum CrstType
 int g_rgCrstLevelMap[] =
 {
     9,          // CrstAppDomainCache
-    2,          // CrstAssemblyList
+    3,          // CrstAssemblyList
     13,         // CrstAssemblyLoader
     2,          // CrstAsyncContinuations
     3,          // CrstAvailableClass
@@ -199,7 +200,8 @@ int g_rgCrstLevelMap[] =
     0,          // CrstNotifyGdb
     4,          // CrstPEImage
     20,         // CrstPendingTypeLoadEntry
-    0,          // CrstPerfMap
+    2,          // CrstPerfMap
+    0,          // CrstPerfMapDeferredActions
     3,          // CrstPgoData
     0,          // CrstPinnedByrefValidation
     15,         // CrstPinnedHeapHandleTable
@@ -309,6 +311,7 @@ LPCSTR g_rgCrstNameMap[] =
     "CrstPEImage",
     "CrstPendingTypeLoadEntry",
     "CrstPerfMap",
+    "CrstPerfMapDeferredActions",
     "CrstPgoData",
     "CrstPinnedByrefValidation",
     "CrstPinnedHeapHandleTable",

src/coreclr/pal/inc/pal.h

@@ -371,6 +371,18 @@ PALAPI
 // Log a method to the jitdump file.
 PAL_PerfJitDump_LogMethod(void* pCode, size_t codeSize, const char* symbol, void* debugInfo, void* unwindInfo, bool reportCodeBlock);
 
+PALIMPORT
+int
+PALAPI
+// Log a method to the jitdump file with a pre-captured timestamp and code buffer.
+PAL_PerfJitDump_LogMethodWithTimestamp(void* pCode, size_t codeSize, const char* symbol, void* debugInfo, void* unwindInfo, uint64_t timestamp, void* codeBuffer, size_t codeBufferSize);
+
+PALIMPORT
+uint64_t
+PALAPI
+// Get the current timestamp in the same format used by jitdump records.
+PAL_PerfJitDump_GetTimeStamp();
+
 PALIMPORT
 int
 PALAPI

src/coreclr/pal/src/misc/perfjitdump.cpp

@@ -330,6 +330,86 @@ struct PerfJitDumpState
         return 0;
     }
 
+    int LogMethodWithTimestamp(void* pCode, size_t codeSize, const char* symbol, void* debugInfo, void* unwindInfo, uint64_t timestamp, void* codeBuffer, size_t codeBufferSize)
+    {
+        int result = 0;
+
+        if (enabled)
+        {
+            size_t symbolLen = strlen(symbol);
+
+            JitCodeLoadRecord record;
+
+            size_t bytesRemaining = sizeof(JitCodeLoadRecord) + symbolLen + 1 + codeBufferSize;
+
+            record.header.timestamp = timestamp;
+            record.vma = (uint64_t) pCode;
+            record.code_addr = (uint64_t) pCode;
+            record.code_size = codeSize;
+            record.header.total_size = bytesRemaining;
+
+            iovec items[] = {
+                { &record, sizeof(JitCodeLoadRecord) },
+                { (void *)symbol, symbolLen + 1 },
+                { codeBuffer, codeBufferSize },
+            };
+            size_t itemsCount = sizeof(items) / sizeof(items[0]);
+
+            size_t itemsWritten = 0;
+
+            if (!enabled)
+                goto exit2;
+
+            // Increment codeIndex while locked
+            record.code_index = ++codeIndex;
+
+            do
+            {
+                result = writev(fd, items + itemsWritten, itemsCount - itemsWritten);
+
+                if ((size_t)result == bytesRemaining)
+                    break;
+
+                if (result == -1)
+                {
+                    if (errno == EINTR)
+                        continue;
+
+                    return FatalError();
+                }
+
+                // Detect unexpected failure cases.
+                _ASSERTE(bytesRemaining > (size_t)result);
+                _ASSERTE(result > 0);
+
+                // Handle partial write case
+
+                bytesRemaining -= result;
+
+                do
+                {
+                    if ((size_t)result < items[itemsWritten].iov_len)
+                    {
+                        items[itemsWritten].iov_len -= result;
+                        items[itemsWritten].iov_base = (void*)((size_t) items[itemsWritten].iov_base + result);
+                        break;
+                    }
+                    else
+                    {
+                        result -= items[itemsWritten].iov_len;
+                        itemsWritten++;
+
+                        // Detect unexpected failure case.
+                        _ASSERTE(itemsWritten < itemsCount);
+                    }
+                } while (result > 0);
+            } while (true);
+
+        }
+exit2:
+        return 0;
+    }
+
     int Finish()
     {
         int result = 0;
@@ -394,6 +474,20 @@ PAL_PerfJitDump_LogMethod(void* pCode, size_t codeSize, const char* symbol, void
     return GetState().LogMethod(pCode, codeSize, symbol, debugInfo, unwindInfo, reportCodeBlock);
 }
 
+int
+PALAPI
+PAL_PerfJitDump_LogMethodWithTimestamp(void* pCode, size_t codeSize, const char* symbol, void* debugInfo, void* unwindInfo, uint64_t timestamp, void* codeBuffer, size_t codeBufferSize)
+{
+    return GetState().LogMethodWithTimestamp(pCode, codeSize, symbol, debugInfo, unwindInfo, timestamp, codeBuffer, codeBufferSize);
+}
+
+uint64_t
+PALAPI
+PAL_PerfJitDump_GetTimeStamp()
+{
+    return GetTimeStampNS();
+}
+
 int
 PALAPI
 PAL_PerfJitDump_Finish()
@@ -424,6 +518,20 @@ PAL_PerfJitDump_LogMethod(void* pCode, size_t codeSize, const char* symbol, void
     return 0;
 }
 
+int
+PALAPI
+PAL_PerfJitDump_LogMethodWithTimestamp(void* pCode, size_t codeSize, const char* symbol, void* debugInfo, void* unwindInfo, uint64_t timestamp, void* codeBuffer, size_t codeBufferSize)
+{
+    return 0;
+}
+
+uint64_t
+PALAPI
+PAL_PerfJitDump_GetTimeStamp()
+{
+    return 0;
+}
+
 int
 PALAPI
 PAL_PerfJitDump_Finish()

src/coreclr/vm/eventing/eventpipe/ds-rt-coreclr.h

@@ -233,7 +233,7 @@ static
 uint32_t
 ds_rt_enable_perfmap (uint32_t type)
 {
-	LIMITED_METHOD_CONTRACT;
+	STANDARD_VM_CONTRACT;
 
 #ifdef FEATURE_PERFMAP
 	PerfMap::PerfMapType perfMapType = (PerfMap::PerfMapType)type;

src/coreclr/vm/finalizerthread.cpp

@@ -11,6 +11,9 @@
 #include "eventpipeadapter.h"
 #include "ebr.h"
 #include "dn-stdio.h"
+#ifdef FEATURE_PERFMAP
+#include "perfmap.h"
+#endif
 
 #ifdef FEATURE_COMINTEROP
 #include "runtimecallablewrapper.h"
@@ -154,7 +157,11 @@ bool FinalizerThread::HaveExtraWorkForFinalizer()
         || YieldProcessorNormalization::IsMeasurementScheduled()
         || HasDelayedDynamicMethod()
         || ThreadStore::s_pThreadStore->ShouldTriggerGCForDeadThreads()
-        || g_EbrCollector.CleanUpRequested();
+        || g_EbrCollector.CleanUpRequested()
+#ifdef FEATURE_PERFMAP
+        || PerfMap::HasDeferredEntries()
+#endif
+        ;
 
 #endif // TARGET_WASM
 }
@@ -210,6 +217,14 @@ static void DoExtraWorkForFinalizer(Thread* finalizerThread)
         GCX_PREEMP();
         g_EbrCollector.CleanUpPending();
     }
+
+#ifdef FEATURE_PERFMAP
+    if (PerfMap::HasDeferredEntries())
+    {
+        GCX_PREEMP();
+        PerfMap::DrainDeferredEntries();
+    }
+#endif
 }
 
 OBJECTREF FinalizerThread::GetNextFinalizableObject()