pvops: version 3.4.4
One patch already in upstream, so remove it here.
This commit is contained in:
parent
394e2aaef1
commit
dd4e419e25
1
linux-3.4.4.tar.bz2.sha1sum
Normal file
1
linux-3.4.4.tar.bz2.sha1sum
Normal file
@ -0,0 +1 @@
|
||||
edf887dd7f5805345da38bd54ae01dd5da757894 linux-3.4.4.tar.bz2
|
@ -1,56 +0,0 @@
|
||||
From 5e626254206a709c6e937f3dda69bf26c7344f6f Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@amd.com>
|
||||
Date: Tue, 29 May 2012 13:07:31 +0200
|
||||
Subject: [PATCH] xen/setup: filter APERFMPERF cpuid feature out
|
||||
|
||||
Xen PV kernels allow access to the APERF/MPERF registers to read the
|
||||
effective frequency. Access to the MSRs is however redirected to the
|
||||
currently scheduled physical CPU, making consecutive read and
|
||||
compares unreliable. In addition each rdmsr traps into the hypervisor.
|
||||
So to avoid bogus readouts and expensive traps, disable the kernel
|
||||
internal feature flag for APERF/MPERF if running under Xen.
|
||||
This will
|
||||
a) remove the aperfmperf flag from /proc/cpuinfo
|
||||
b) not mislead the power scheduler (arch/x86/kernel/cpu/sched.c) to
|
||||
use the feature to improve scheduling (by default disabled)
|
||||
c) not mislead the cpufreq driver to use the MSRs
|
||||
|
||||
This does not cover userland programs which access the MSRs via the
|
||||
device file interface, but this will be addressed separately.
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
|
||||
Cc: stable@vger.kernel.org # v3.0+
|
||||
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||||
---
|
||||
arch/x86/xen/enlighten.c | 8 ++++++++
|
||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
|
||||
index d1f9a04..272ebd0 100644
|
||||
--- a/arch/x86/xen/enlighten.c
|
||||
+++ b/arch/x86/xen/enlighten.c
|
||||
@@ -208,6 +208,9 @@ static void __init xen_banner(void)
|
||||
xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
|
||||
}
|
||||
|
||||
+#define CPUID_THERM_POWER_LEAF 6
|
||||
+#define APERFMPERF_PRESENT 0
|
||||
+
|
||||
static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;
|
||||
static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
|
||||
|
||||
@@ -241,6 +244,11 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
|
||||
*dx = cpuid_leaf5_edx_val;
|
||||
return;
|
||||
|
||||
+ case CPUID_THERM_POWER_LEAF:
|
||||
+ /* Disabling APERFMPERF for kernel usage */
|
||||
+ maskecx = ~(1 << APERFMPERF_PRESENT);
|
||||
+ break;
|
||||
+
|
||||
case 0xb:
|
||||
/* Suppress extended topology stuff */
|
||||
maskebx = 0;
|
||||
--
|
||||
1.7.4.4
|
||||
|
@ -7,7 +7,6 @@ patches.xen/pvops-3.4-0003-xen-acpi-sleep-Register-to-the-acpi_suspend_lowlevel.
|
||||
patches.xen/pvops-xen-blkfront-module-exit-handling-adjustments.patch
|
||||
patches.xen/pvops-xen-blkback-Copy-id-field-when-doing-BLKIF_DISCARD.patch
|
||||
patches.xen/pvops-xen-blkfront-Add-WARN-to-deal-with-misbehaving-backe.patch
|
||||
patches.xen/pvops-xen-setup-filter-APERFMPERF-cpuid-feature-out.patch
|
||||
patches.xen/pvops-3.4-enable-netfront-in-dom0.patch
|
||||
patches.xen/pvops-netback-calculate-correctly-the-SKB-slots.patch
|
||||
|
||||
|
@ -1 +1 @@
|
||||
3.4.2
|
||||
3.4.4
|
||||
|
Loading…
Reference in New Issue
Block a user