Skip to content

Commit 0f70740

Browse files
committed
platform/x86: intel-uncore-freq: Prevent driver loading in guests
jira LE-1907 Rebuild_History Non-Buildable kernel-4.18.0-477.27.1.el8_8 commit-author Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> commit e769cb2 Empty-Commit: Cherry-Pick Conflicts during history rebuild. Will be included in final tarball splat. Ref for failed cherry-pick at: ciq/ciq_backports/kernel-4.18.0-477.27.1.el8_8/e769cb20.failed Loading this driver in guests results in unchecked MSR access error for MSR 0x620. There is no use of reading and modifying package/die scope uncore MSRs in guests. So check for CPU feature X86_FEATURE_HYPERVISOR to prevent loading of this driver in guests. Fixes: dbce412 ("platform/x86/intel-uncore-freq: Split common and enumeration part") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215870 Suggested-by: Borislav Petkov <bp@suse.de> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://lore.kernel.org/r/20220427100304.2562990-1-srinivas.pandruvada@linux.intel.com Signed-off-by: Hans de Goede <hdegoede@redhat.com> (cherry picked from commit e769cb2) Signed-off-by: Jonathan Maple <jmaple@ciq.com> # Conflicts: # drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
1 parent 4f7e11c commit 0f70740

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
platform/x86: intel-uncore-freq: Prevent driver loading in guests
2+
3+
jira LE-1907
4+
Rebuild_History Non-Buildable kernel-4.18.0-477.27.1.el8_8
5+
commit-author Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
6+
commit e769cb20c5b7c74513b88d1aed482309bcaece71
7+
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
8+
Will be included in final tarball splat. Ref for failed cherry-pick at:
9+
ciq/ciq_backports/kernel-4.18.0-477.27.1.el8_8/e769cb20.failed
10+
11+
Loading this driver in guests results in unchecked MSR access error for
12+
MSR 0x620.
13+
14+
There is no use of reading and modifying package/die scope uncore MSRs
15+
in guests. So check for CPU feature X86_FEATURE_HYPERVISOR to prevent
16+
loading of this driver in guests.
17+
18+
Fixes: dbce412a7733 ("platform/x86/intel-uncore-freq: Split common and enumeration part")
19+
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215870
20+
Suggested-by: Borislav Petkov <bp@suse.de>
21+
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
22+
Link: https://lore.kernel.org/r/20220427100304.2562990-1-srinivas.pandruvada@linux.intel.com
23+
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
24+
(cherry picked from commit e769cb20c5b7c74513b88d1aed482309bcaece71)
25+
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
26+
27+
# Conflicts:
28+
# drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
29+
* Unmerged path drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
30+
* Unmerged path drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c

0 commit comments

Comments
 (0)