Skip to contentSkip to conversation

platform/x86: don't unconditionally attach Intel PMC when virtualized

PATCH Superseded Roger Pau Monne 2 participants 2 messages Nov 10, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 platform/x86: don't unconditionally attach Intel PMC when virtualized

The current logic in the Intel PMC driver will forcefully attach it when detecting any CPU on the intel_pmc_core_platform_ids array, even if the matching ACPI device is not present.

There's no checking in pmc_core_probe() to assert that the PMC device is present, and hence on virtualized environments the PMC device probes successfully, even if the underlying registers are not present. Previous to 21ae43570940 the driver would check for the presence of a specific PCI device, and that prevented the driver from attaching when running virtualized.

Fix by only forcefully attaching the PMC device when not running virtualized. Note that virtualized platforms can still get the device to load if the appropriate ACPI device is present on the tables provided to the VM.

Make an exception for the Xen initial domain, which does have full hardware access, and hence can attach to the PMC if present.

Fixes 21ae43570940 ('platform/x86: intel_pmc_core: Substitute PCI with CPUID enumeration')
Cc Rajneesh Bhardwaj <[email protected]>
Cc David E Box <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Mark Gross <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Juergen Gross <[email protected]>

---
Changes since v1:
- Use cpu_feature_enabled() instead of boot_cpu_has().

---
 drivers/platform/x86/intel/pmc/pltdrv.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/platform/x86/intel/pmc/pltdrv.c +10 -0
index 15ca8afdd973..4f9fe8a21d8f 100644
@@ -18,6 +18,8 @@
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
 
+#include <xen/xen.h>
+
 static void intel_pmc_core_release(struct device *dev)
 {
 	kfree(dev);
@@ -53,6 +55,14 @@ static int __init pmc_core_platform_init(void)
 	if (acpi_dev_present("INT33A1", NULL, -1))
 		return -ENODEV;
 
+	/*
+	 * Skip forcefully attaching the device for VMs. Make an exception for
+	 * Xen dom0, which does have full hardware access.
+	 */
+	if (cpu_feature_enabled(X86_FEATURE_HYPERVISOR) &&
+	    !xen_initial_domain())
+		return -ENODEV;
+
 	if (!x86_match_cpu(intel_pmc_core_platform_ids))
 		return -ENODEV;
 
Signature · 1 line
2.37.3
#1 lore raw
Quoted 23 lines · Roger Pau Monne

The current logic in the Intel PMC driver will forcefully attach it when detecting any CPU on the intel_pmc_core_platform_ids array, even if the matching ACPI device is not present.

There's no checking in pmc_core_probe() to assert that the PMC device is present, and hence on virtualized environments the PMC device probes successfully, even if the underlying registers are not present. Previous to 21ae43570940 the driver would check for the presence of a specific PCI device, and that prevented the driver from attaching when running virtualized.

Fix by only forcefully attaching the PMC device when not running virtualized. Note that virtualized platforms can still get the device to load if the appropriate ACPI device is present on the tables provided to the VM.

Make an exception for the Xen initial domain, which does have full hardware access, and hence can attach to the PMC if present.

Fixes 21ae43570940 ('platform/x86: intel_pmc_core: Substitute PCI with CPUID enumeration')
Quoted 9 lines
Cc Rajneesh Bhardwaj <[email protected]>
Cc David E Box <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Mark Gross <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Juergen Gross <[email protected]>

You may use --cc to the sending tool, instead of polluting a commit message with that. Moreover, the Cc list will be archived on lore.kernel.org anyway, in case you really need it to be recorded.

...

drivers/platform/x86/intel/pmc/pltdrv.c static int __init pmc_core_platform_init(void) · line 63

Quoted 2 lines
drivers/platform/x86/intel/pmc/pltdrv.c +2 -0
+	if (cpu_feature_enabled(X86_FEATURE_HYPERVISOR) &&
+	    !xen_initial_domain())

One line? It's 81 character only and we have no strong 80 here, IIRC.

Quoted 1 line
drivers/platform/x86/intel/pmc/pltdrv.c +1 -0
+		return -ENODEV;
Signature · 2 lines
With Best Regards,
Andy Shevchenko