Merge remote-tracking branch 'opcm-github/master'

Change-Id: I18f0bbe2f7ac88c0c6a3674355913df9a008023e

Author: rdementi

Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:42@sha256:ee88ab8a5c8bf78687ddcecadf824767e845adc19d8cdedb56f48521eb162b43 AS builder
+FROM fedora:43@sha256:6cd815d862109208adf6040ea13391fe6aeb87a9dc80735c2ab07083fdf5e03a AS builder
 # Dockerfile for Intel PCM sensor server
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2020-2024 Intel Corporation
@@ -7,7 +7,7 @@ RUN dnf -y install gcc-c++ git findutils make cmake openssl openssl-devel libasa
 COPY . /tmp/pcm
 RUN cd /tmp/pcm && mkdir build && cd build && cmake -DPCM_NO_STATIC_LIBASAN=OFF .. && make -j
 
-FROM fedora:42@sha256:ee88ab8a5c8bf78687ddcecadf824767e845adc19d8cdedb56f48521eb162b43
+FROM fedora:43@sha256:6cd815d862109208adf6040ea13391fe6aeb87a9dc80735c2ab07083fdf5e03a
 COPY --from=builder /tmp/pcm/build/bin/* /usr/local/bin/
 COPY --from=builder /tmp/pcm/build/bin/opCode*.txt /usr/local/share/pcm/
 COPY --from=builder /usr/share/hwdata/pci.ids /usr/share/hwdata/pci.ids

src/MacMSRDriver/PcmMsr/CMakeLists.txt

@@ -11,10 +11,24 @@ add_executable(
 
 set_target_properties(PcmMsrDriver PROPERTIES BUNDLE_EXTENSION kext MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/PcmMsr-Info.plist)
 
+# For KEXT compilation on macOS, we must explicitly point to the Kernel frameworks within the SDK.
+if(APPLE)
+    # Find the active macOS SDK path
+    execute_process(
+        COMMAND xcrun --sdk macosx --show-sdk-path
+        OUTPUT_VARIABLE MACOSX_SDK_PATH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        RESULT_VARIABLE XCRUN_RESULT
+    )
+    if(NOT XCRUN_RESULT EQUAL 0 OR NOT MACOSX_SDK_PATH)
+        message(FATAL_ERROR "Failed to find macOS SDK path using xcrun")
+    endif()
+    message(STATUS "Using SDK for KEXT: ${MACOSX_SDK_PATH}")
+endif()
 
 target_include_directories(PcmMsrDriver PRIVATE
-        ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/PrivateHeaders
-        ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers
+        "${MACOSX_SDK_PATH}/System/Library/Frameworks/Kernel.framework/PrivateHeaders"
+        "${MACOSX_SDK_PATH}/System/Library/Frameworks/Kernel.framework/Headers"
 )
 target_compile_definitions(PcmMsrDriver PRIVATE
         -DKERNEL

src/topologyentry.h

@@ -116,13 +116,17 @@ struct PCM_API TopologyEntry // describes a core
 
 inline void fillEntry(TopologyEntry & entry, const uint32 & smtMaskWidth, const uint32 & coreMaskWidth, const uint32 & l2CacheMaskShift, const int apic_id)
 {
+    #ifndef USER_KERNEL_SHARED
     DBG(1, "entry.os_id = ", entry.os_id, " apic_id = ", apic_id);
+    #endif
     entry.thread_id = smtMaskWidth ? extract_bits_32(apic_id, 0, smtMaskWidth - 1) : 0;
     entry.core_id = coreMaskWidth ? extract_bits_32(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
     entry.socket_id = extract_bits_32(apic_id, smtMaskWidth + coreMaskWidth, 31);
     entry.tile_id = extract_bits_32(apic_id, l2CacheMaskShift, 31);
     entry.socket_unique_core_id = entry.core_id;
+    #ifndef USER_KERNEL_SHARED
     DBG(1, "entry.os_id = ", entry.os_id, " apic_id = ", apic_id, " entry.thread_id = ", entry.thread_id, " entry.core_id = ", entry.core_id, " entry.socket_id = ", entry.socket_id , " entry.tile_id = ", entry.tile_id, " entry.socket_unique_core_id = ", entry.socket_unique_core_id);
+    #endif
 }
 
 inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32 & l2CacheMaskShift, uint32 & l3CacheMaskShift)
@@ -145,7 +149,9 @@ inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32
             }
             levelType = extract_bits_32(cpuid_args.array[2], 8, 15);
             levelShift = extract_bits_32(cpuid_args.array[0], 0, 4);
-           DBG(1, "levelType = ", levelType, " levelShift = ", levelShift);
+            #ifndef USER_KERNEL_SHARED
+            DBG(1, "levelType = ", levelType, " levelShift = ", levelShift);
+            #endif
             switch (levelType)
             {
             case 1: //level type is SMT, so levelShift is the SMT_Mask_Width
@@ -254,7 +260,9 @@ inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32
         }
 #endif
     }
+    #ifndef USER_KERNEL_SHARED
     DBG(1, "smtMaskWidth = ", smtMaskWidth, " coreMaskWidth = ", coreMaskWidth, " l2CacheMaskShift = ", l2CacheMaskShift, " l3CacheMaskShift = ", l3CacheMaskShift);
+    #endif
     return true;
 }