fix crash on BDX when trying to program IRP or IIO PMU

rdementi · rdementi · commit 0f7ba1387c19 · 2024-04-03T17:33:28.000+02:00
Change-Id: Icc9b6fdc4d32618eecc0e5e3e3e8a62184983c58
diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp
@@ -2430,9 +2430,9 @@ void PCM::initUncorePMUsDirect()
         IRP_UNIT_CTL = SPR_IRP_UNIT_CTL;
         break;
     }
+    irpPMUs.resize(num_sockets);
     if (IRP_UNIT_CTL)
     {
-        irpPMUs.resize(num_sockets);
         for (uint32 s = 0; s < (uint32)num_sockets; ++s)
         {
             auto& handle = MSR[socketRefCore[s]];
@@ -9270,6 +9270,7 @@ uint32 PCM::getMaxNumOfIIOStacks() const
 {
     if (iioPMUs.size() > 0)
     {
+        assert(irpPMUs.size());
         assert(iioPMUs[0].size() == irpPMUs[0].size());
         return (uint32)iioPMUs[0].size();
     }

Original file line number	Diff line number	Diff line change
`@@ -2430,9 +2430,9 @@ void PCM::initUncorePMUsDirect()`
`2430`	`2430`	`IRP_UNIT_CTL = SPR_IRP_UNIT_CTL;`
`2431`	`2431`	`break;`
`2432`	`2432`	`}`
	`2433`	`+ irpPMUs.resize(num_sockets);`
`2433`	`2434`	`if (IRP_UNIT_CTL)`
`2434`	`2435`	`{`
`2435`		`- irpPMUs.resize(num_sockets);`
`2436`	`2436`	`for (uint32 s = 0; s < (uint32)num_sockets; ++s)`
`2437`	`2437`	`{`
`2438`	`2438`	`auto& handle = MSR[socketRefCore[s]];`
`@@ -9270,6 +9270,7 @@ uint32 PCM::getMaxNumOfIIOStacks() const`
`9270`	`9270`	`{`
`9271`	`9271`	`if (iioPMUs.size() > 0)`
`9272`	`9272`	`{`
	`9273`	`+ assert(irpPMUs.size());`
`9273`	`9274`	`assert(iioPMUs[0].size() == irpPMUs[0].size());`
`9274`	`9275`	`return (uint32)iioPMUs[0].size();`
`9275`	`9276`	`}`