Merge pull request #424 from nealsid/master

Author: opcm

src/MacMSRDriver/PcmMsr/CMakeLists.txt

@@ -9,6 +9,8 @@ add_executable(
 )
 
 set_target_properties(PcmMsrDriver PROPERTIES BUNDLE_EXTENSION kext MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/PcmMsr-Info.plist)
+
+
 target_include_directories(PcmMsrDriver PRIVATE
         ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/PrivateHeaders
         ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers
@@ -21,6 +23,11 @@ target_compile_definitions(PcmMsrDriver PRIVATE
         -DNeXT
 )
 
+target_compile_options(PcmMsrDriver PRIVATE
+        "-ffreestanding"
+        "-fapple-kext"
+)
+
 target_link_libraries(PcmMsrDriver PRIVATE ${IOKIT_LIBRARY}
         "-lkmodc++"
         "-lkmod"

src/MacMSRDriver/PcmMsr/PcmMsr.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2012, Intel Corporation
 // written by Austen Ott
-//    
+//
 #include <IOKit/IOLib.h>
 #include <libkern/sysctl.h>
 #include "PcmMsr.h"
@@ -63,7 +63,7 @@ void cpuGetTopoData(void* pTopos){
     entries[cpu].os_id = cpu;
     cpuid(0xB, 1, info[0], info[1], info[2], info[3]);
     entries[cpu].socket = info[3] >> info[0] & 0xF;
-    
+
     cpuid(0xB, 0, info[0], info[1], info[2], info[3]);
     entries[cpu].core_id = info[3] >> info[0] & 0xF;
 }
@@ -75,15 +75,15 @@ OSDefineMetaClassAndStructors(com_intel_driver_PcmMsr, IOService)
 bool PcmMsrDriverClassName::start(IOService* provider){
     bool	success;
     success = super::start(provider);
-	
+
 	if (!g_pci_driver) {
 		g_pci_driver = this;
 	}
-	
+
 	if (success) {
-		registerService();        
+		registerService();
 	}
-	
+
     return success;
 }
 uint32_t PcmMsrDriverClassName::getNumCores()
@@ -149,9 +149,9 @@ IOReturn PcmMsrDriverClassName::readMSR(pcm_msr_data_t* idatas,pcm_msr_data_t* o
     // All the msr_nums should be the same, so we just use the first one to pass to all cores
     IOReturn ret = kIOReturnBadArgument;
     if(idatas->cpu_num < num_cores)
-    {        
+    {
         mp_rendezvous_no_intrs(cpuReadMSR, (void*)idatas);
-        
+
         odatas->cpu_num = idatas->cpu_num;
         odatas->msr_num = idatas->msr_num;
         odatas->value = idatas->value;
@@ -169,14 +169,14 @@ IOReturn PcmMsrDriverClassName::writeMSR(pcm_msr_data_t* idata){
     if(idata->cpu_num < num_cores)
     {
         mp_rendezvous_no_intrs(cpuWriteMSR, (void*)idata);
-        
+
         ret = kIOReturnSuccess;
     }
     else
     {
         IOLog("Tried to write to a core with id higher than max core id.\n");
     }
-    
+
     return ret;
 }
 
@@ -210,7 +210,7 @@ IOReturn PcmMsrDriverClassName::decrementNumInstances(uint32_t* num_insts){
 uint32_t PcmMsrDriverClassName::read(uint32_t pci_address)
 {
     uint32_t value = 0;
-	
+
     __asm__("\t"
 			"movw $0xCF8,%%dx\n\t"
 			"andb $0xFC,%%al\n\t"
@@ -220,15 +220,15 @@ uint32_t PcmMsrDriverClassName::read(uint32_t pci_address)
 			: "=a"(value)
 			: "a"(pci_address)
 			: "%edx");
-	
+
     return value;
 }
 
 
 // write
 void PcmMsrDriverClassName::write(uint32_t pci_address, uint32_t value)
 {
-	
+
 	__asm__("\t"
 			"movw $0xCF8,%%dx\n\t"
 			"andb $0xFC,%%al\n\t"
@@ -246,7 +246,7 @@ void PcmMsrDriverClassName::write(uint32_t pci_address, uint32_t value)
 void* PcmMsrDriverClassName::mapMemory (uint32_t address, UInt8 **virtual_address)
 {
 	PRINT_DEBUG("%s[%p]::%s()\n", getName(), this, __FUNCTION__);
-	
+
     IOMemoryMap        *memory_map        = NULL;
     IOMemoryDescriptor *memory_descriptor = NULL;
 	#ifndef __clang_analyzer__ // address a false-positive
@@ -278,7 +278,7 @@ void* PcmMsrDriverClassName::mapMemory (uint32_t address, UInt8 **virtual_addres
     } else {
 		IOLog("%s[%p]::%s() -- IOMemoryDescriptor::withPhysicalAddress() failure\n", getName(), this, __FUNCTION__);
 	}
-	
+
     return (void*)memory_map;
 }
 
@@ -287,9 +287,9 @@ void* PcmMsrDriverClassName::mapMemory (uint32_t address, UInt8 **virtual_addres
 void PcmMsrDriverClassName::unmapMemory (void *memory_map)
 {
 	PRINT_DEBUG("%s[%p]::%s()\n", getName(), this, __FUNCTION__);
-	
+
     IOMemoryMap *m_map = (IOMemoryMap*)memory_map;
-	
+
     if (m_map) {
         m_map->getMemoryDescriptor()->complete();
         #ifndef __clang_analyzer__ // address a false-positive
@@ -298,6 +298,6 @@ void PcmMsrDriverClassName::unmapMemory (void *memory_map)
         m_map->unmap();
         m_map->release();
     }
-	
+
     return;
 }

src/cpucounters.cpp

@@ -1276,24 +1276,25 @@ bool PCM::discoverSystemTopology()
         MSR.push_back(std::make_shared<SafeMsrHandle>(i));
     }
 
-    TopologyEntry *entries = new TopologyEntry[num_cores];
-    MSR[0]->buildTopology(num_cores, entries);
+    TopologyEntry entries[num_cores];
+    if (MSR[0]->buildTopology(num_cores, entries) != 0) {
+      std::cerr << "Unable to build CPU topology" << std::endl;
+      return false;
+    }
     for(int i = 0; i < num_cores; i++){
         socketIdMap[entries[i].socket] = 0;
         if(entries[i].os_id >= 0)
         {
             if(entries[i].core_id == 0 && entries[i].socket == 0) ++threads_per_core;
             if (populateHybridEntry(entries[i], i) == false)
             {
-                delete[] entries;
                 return false;
             }
             topology.push_back(entries[i]);
         }
     }
-    delete[] entries;
 // End of OSX specific code
-#endif // end of ifndef __APPLE__
+#endif
 
 #endif //end of ifdef _MSC_VER
 
@@ -4514,14 +4515,14 @@ PCM::ErrorCode PCM::programServerUncoreLatencyMetrics(bool enable_pmm)
     if (enable_pmm == false)
     {   //DDR is false
         if (ICX == cpu_model)
-	{ 
+	{
             DDRConfig[0] = MC_CH_PCI_PMON_CTL_EVENT(0x80) + MC_CH_PCI_PMON_CTL_UMASK(1);  // DRAM RPQ occupancy
             DDRConfig[1] = MC_CH_PCI_PMON_CTL_EVENT(0x10) + MC_CH_PCI_PMON_CTL_UMASK(1);  // DRAM RPQ Insert
             DDRConfig[2] = MC_CH_PCI_PMON_CTL_EVENT(0x81) + MC_CH_PCI_PMON_CTL_UMASK(0);  // DRAM WPQ Occupancy
             DDRConfig[3] = MC_CH_PCI_PMON_CTL_EVENT(0x20) + MC_CH_PCI_PMON_CTL_UMASK(0);  // DRAM WPQ Insert
-	    
+
 	} else {
-	    
+
             DDRConfig[0] = MC_CH_PCI_PMON_CTL_EVENT(0x80) + MC_CH_PCI_PMON_CTL_UMASK(0);  // DRAM RPQ occupancy
             DDRConfig[1] = MC_CH_PCI_PMON_CTL_EVENT(0x10) + MC_CH_PCI_PMON_CTL_UMASK(0);  // DRAM RPQ Insert
             DDRConfig[2] = MC_CH_PCI_PMON_CTL_EVENT(0x81) + MC_CH_PCI_PMON_CTL_UMASK(0);  // DRAM WPQ Occupancy