2008-10-23 12:26:29 +07:00
|
|
|
#ifndef _ASM_X86_MSR_H
|
|
|
|
#define _ASM_X86_MSR_H
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2015-06-04 23:55:26 +07:00
|
|
|
#include "msr-index.h"
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2008-01-30 19:31:06 +07:00
|
|
|
#ifndef __ASSEMBLY__
|
2008-01-30 19:31:07 +07:00
|
|
|
|
|
|
|
#include <asm/asm.h>
|
|
|
|
#include <asm/errno.h>
|
2009-05-22 17:12:01 +07:00
|
|
|
#include <asm/cpumask.h>
|
2015-06-04 23:55:26 +07:00
|
|
|
#include <uapi/asm/msr.h>
|
2009-05-22 17:12:01 +07:00
|
|
|
|
|
|
|
struct msr {
|
|
|
|
union {
|
|
|
|
struct {
|
|
|
|
u32 l;
|
|
|
|
u32 h;
|
|
|
|
};
|
|
|
|
u64 q;
|
|
|
|
};
|
|
|
|
};
|
2008-01-30 19:31:07 +07:00
|
|
|
|
2009-12-17 06:16:25 +07:00
|
|
|
struct msr_info {
|
|
|
|
u32 msr_no;
|
|
|
|
struct msr reg;
|
|
|
|
struct msr *msrs;
|
|
|
|
int err;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct msr_regs_info {
|
|
|
|
u32 *regs;
|
|
|
|
int err;
|
|
|
|
};
|
|
|
|
|
x86/pm: Introduce quirk framework to save/restore extra MSR registers around suspend/resume
A bug was reported that on certain Broadwell platforms, after
resuming from S3, the CPU is running at an anomalously low
speed.
It turns out that the BIOS has modified the value of the
THERM_CONTROL register during S3, and changed it from 0 to 0x10,
thus enabled clock modulation(bit4), but with undefined CPU Duty
Cycle(bit1:3) - which causes the problem.
Here is a simple scenario to reproduce the issue:
1. Boot up the system
2. Get MSR 0x19a, it should be 0
3. Put the system into sleep, then wake it up
4. Get MSR 0x19a, it shows 0x10, while it should be 0
Although some BIOSen want to change the CPU Duty Cycle during
S3, in our case we don't want the BIOS to do any modification.
Fix this issue by introducing a more generic x86 framework to
save/restore specified MSR registers(THERM_CONTROL in this case)
for suspend/resume. This allows us to fix similar bugs in a much
simpler way in the future.
When the kernel wants to protect certain MSRs during suspending,
we simply add a quirk entry in msr_save_dmi_table, and customize
the MSR registers inside the quirk callback, for example:
u32 msr_id_need_to_save[] = {MSR_ID0, MSR_ID1, MSR_ID2...};
and the quirk mechanism ensures that, once resumed from suspend,
the MSRs indicated by these IDs will be restored to their
original, pre-suspend values.
Since both 64-bit and 32-bit kernels are affected, this patch
covers the common 64/32-bit suspend/resume code path. And
because the MSRs specified by the user might not be available or
readable in any situation, we use rdmsrl_safe() to safely save
these MSRs.
Reported-and-tested-by: Marcin Kaszewski <marcin.kaszewski@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@suse.de
Cc: len.brown@intel.com
Cc: linux@horizon.com
Cc: luto@kernel.org
Cc: rjw@rjwysocki.net
Link: http://lkml.kernel.org/r/c9abdcbc173dd2f57e8990e304376f19287e92ba.1448382971.git.yu.c.chen@intel.com
[ More edits to the naming of data structures. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-11-25 00:03:41 +07:00
|
|
|
struct saved_msr {
|
|
|
|
bool valid;
|
|
|
|
struct msr_info info;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct saved_msrs {
|
|
|
|
unsigned int num;
|
|
|
|
struct saved_msr *array;
|
|
|
|
};
|
|
|
|
|
2008-01-30 19:31:07 +07:00
|
|
|
/*
|
2008-10-17 12:25:07 +07:00
|
|
|
* both i386 and x86_64 returns 64-bit value in edx:eax, but gcc's "A"
|
|
|
|
* constraint has different meanings. For i386, "A" means exactly
|
|
|
|
* edx:eax, while for x86_64 it doesn't mean rdx:rax or edx:eax. Instead,
|
|
|
|
* it means rax *or* rdx.
|
2008-01-30 19:31:07 +07:00
|
|
|
*/
|
|
|
|
#ifdef CONFIG_X86_64
|
x86/asm/tsc: Save an instruction in DECLARE_ARGS users
Before, the code to do RDTSC looked like:
rdtsc
shl $0x20, %rdx
mov %eax, %eax
or %rdx, %rax
The "mov %eax, %eax" is required to clear the high 32 bits of RAX.
By declaring low and high as 64-bit variables, the code is
simplified to:
rdtsc
shl $0x20,%rdx
or %rdx,%rax
Yes, it's a 2-byte instruction that's not on a critical path,
but there are principles to be upheld.
Every user of EAX_EDX_RET has been checked. I tried to check
users of EAX_EDX_ARGS, but there weren't any, so I deleted it to
be safe.
( There's no benefit to making "high" 64 bits, but it was the
simplest way to proceed. )
Signed-off-by: George Spelvin <linux@horizon.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: jacob.jun.pan@linux.intel.com
Link: http://lkml.kernel.org/r/20150618075906.4615.qmail@ns.horizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-06-25 23:44:13 +07:00
|
|
|
/* Using 64-bit values saves one instruction clearing the high half of low */
|
|
|
|
#define DECLARE_ARGS(val, low, high) unsigned long low, high
|
|
|
|
#define EAX_EDX_VAL(val, low, high) ((low) | (high) << 32)
|
2008-01-30 19:31:07 +07:00
|
|
|
#define EAX_EDX_RET(val, low, high) "=a" (low), "=d" (high)
|
|
|
|
#else
|
|
|
|
#define DECLARE_ARGS(val, low, high) unsigned long long val
|
|
|
|
#define EAX_EDX_VAL(val, low, high) (val)
|
|
|
|
#define EAX_EDX_RET(val, low, high) "=A" (val)
|
2008-01-30 19:31:06 +07:00
|
|
|
#endif
|
|
|
|
|
2015-12-02 08:00:59 +07:00
|
|
|
#ifdef CONFIG_TRACEPOINTS
|
|
|
|
/*
|
|
|
|
* Be very careful with includes. This header is prone to include loops.
|
|
|
|
*/
|
|
|
|
#include <asm/atomic.h>
|
|
|
|
#include <linux/tracepoint-defs.h>
|
|
|
|
|
|
|
|
extern struct tracepoint __tracepoint_read_msr;
|
|
|
|
extern struct tracepoint __tracepoint_write_msr;
|
|
|
|
extern struct tracepoint __tracepoint_rdpmc;
|
|
|
|
#define msr_tracepoint_active(t) static_key_false(&(t).key)
|
2016-11-03 01:35:22 +07:00
|
|
|
extern void do_trace_write_msr(unsigned int msr, u64 val, int failed);
|
|
|
|
extern void do_trace_read_msr(unsigned int msr, u64 val, int failed);
|
|
|
|
extern void do_trace_rdpmc(unsigned int msr, u64 val, int failed);
|
2015-12-02 08:00:59 +07:00
|
|
|
#else
|
|
|
|
#define msr_tracepoint_active(t) false
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline void do_trace_write_msr(unsigned int msr, u64 val, int failed) {}
|
|
|
|
static inline void do_trace_read_msr(unsigned int msr, u64 val, int failed) {}
|
|
|
|
static inline void do_trace_rdpmc(unsigned int msr, u64 val, int failed) {}
|
2015-12-02 08:00:59 +07:00
|
|
|
#endif
|
|
|
|
|
2017-01-21 03:29:41 +07:00
|
|
|
/*
|
|
|
|
* __rdmsr() and __wrmsr() are the two primitives which are the bare minimum MSR
|
|
|
|
* accessors and should not have any tracing or other functionality piggybacking
|
|
|
|
* on them - those are *purely* for accessing MSRs and nothing more. So don't even
|
|
|
|
* think of extending them - you will be slapped with a stinking trout or a frozen
|
|
|
|
* shark will reach you, wherever you are! You've been warned.
|
|
|
|
*/
|
|
|
|
static inline unsigned long long notrace __rdmsr(unsigned int msr)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
2008-01-30 19:31:07 +07:00
|
|
|
DECLARE_ARGS(val, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2016-04-02 21:01:37 +07:00
|
|
|
asm volatile("1: rdmsr\n"
|
|
|
|
"2:\n"
|
|
|
|
_ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_rdmsr_unsafe)
|
|
|
|
: EAX_EDX_RET(val, low, high) : "c" (msr));
|
2017-01-21 03:29:41 +07:00
|
|
|
|
2008-01-30 19:31:07 +07:00
|
|
|
return EAX_EDX_VAL(val, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
|
|
|
|
2017-01-21 03:29:41 +07:00
|
|
|
static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high)
|
|
|
|
{
|
|
|
|
asm volatile("1: wrmsr\n"
|
|
|
|
"2:\n"
|
|
|
|
_ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)
|
|
|
|
: : "c" (msr), "a"(low), "d" (high) : "memory");
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned long long native_read_msr(unsigned int msr)
|
|
|
|
{
|
|
|
|
unsigned long long val;
|
|
|
|
|
|
|
|
val = __rdmsr(msr);
|
|
|
|
|
|
|
|
if (msr_tracepoint_active(__tracepoint_read_msr))
|
|
|
|
do_trace_read_msr(msr, val, 0);
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2007-10-24 03:37:24 +07:00
|
|
|
static inline unsigned long long native_read_msr_safe(unsigned int msr,
|
|
|
|
int *err)
|
|
|
|
{
|
2008-01-30 19:31:07 +07:00
|
|
|
DECLARE_ARGS(val, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2008-08-26 12:39:15 +07:00
|
|
|
asm volatile("2: rdmsr ; xor %[err],%[err]\n"
|
2007-10-24 03:37:24 +07:00
|
|
|
"1:\n\t"
|
|
|
|
".section .fixup,\"ax\"\n\t"
|
2016-04-02 21:01:40 +07:00
|
|
|
"3: mov %[fault],%[err]\n\t"
|
|
|
|
"xorl %%eax, %%eax\n\t"
|
|
|
|
"xorl %%edx, %%edx\n\t"
|
|
|
|
"jmp 1b\n\t"
|
2007-10-24 03:37:24 +07:00
|
|
|
".previous\n\t"
|
2008-03-23 15:02:51 +07:00
|
|
|
_ASM_EXTABLE(2b, 3b)
|
2008-08-26 12:39:15 +07:00
|
|
|
: [err] "=r" (*err), EAX_EDX_RET(val, low, high)
|
2009-09-01 04:23:29 +07:00
|
|
|
: "c" (msr), [fault] "i" (-EIO));
|
2015-12-02 08:00:59 +07:00
|
|
|
if (msr_tracepoint_active(__tracepoint_read_msr))
|
|
|
|
do_trace_read_msr(msr, EAX_EDX_VAL(val, low, high), *err);
|
2008-01-30 19:31:07 +07:00
|
|
|
return EAX_EDX_VAL(val, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
|
|
|
|
2016-11-07 10:13:39 +07:00
|
|
|
/* Can be uninlined because referenced by paravirt */
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline void notrace
|
|
|
|
native_write_msr(unsigned int msr, u32 low, u32 high)
|
2016-11-07 10:13:39 +07:00
|
|
|
{
|
2017-01-21 03:29:41 +07:00
|
|
|
__wrmsr(msr, low, high);
|
|
|
|
|
2016-06-04 01:00:59 +07:00
|
|
|
if (msr_tracepoint_active(__tracepoint_write_msr))
|
2015-12-02 08:00:59 +07:00
|
|
|
do_trace_write_msr(msr, ((u64)high << 32 | low), 0);
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
|
|
|
|
2008-12-25 05:30:02 +07:00
|
|
|
/* Can be uninlined because referenced by paravirt */
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline int notrace
|
|
|
|
native_write_msr_safe(unsigned int msr, u32 low, u32 high)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
|
|
|
int err;
|
2016-11-03 01:35:22 +07:00
|
|
|
|
2008-08-26 12:39:15 +07:00
|
|
|
asm volatile("2: wrmsr ; xor %[err],%[err]\n"
|
2007-10-24 03:37:24 +07:00
|
|
|
"1:\n\t"
|
|
|
|
".section .fixup,\"ax\"\n\t"
|
2008-08-26 12:39:15 +07:00
|
|
|
"3: mov %[fault],%[err] ; jmp 1b\n\t"
|
2007-10-24 03:37:24 +07:00
|
|
|
".previous\n\t"
|
2008-03-23 15:02:51 +07:00
|
|
|
_ASM_EXTABLE(2b, 3b)
|
2008-08-26 12:39:15 +07:00
|
|
|
: [err] "=a" (err)
|
2008-01-30 19:31:07 +07:00
|
|
|
: "c" (msr), "0" (low), "d" (high),
|
2009-09-01 04:23:29 +07:00
|
|
|
[fault] "i" (-EIO)
|
2008-06-25 11:18:59 +07:00
|
|
|
: "memory");
|
2016-06-04 01:00:59 +07:00
|
|
|
if (msr_tracepoint_active(__tracepoint_write_msr))
|
2015-12-02 08:00:59 +07:00
|
|
|
do_trace_write_msr(msr, ((u64)high << 32 | low), err);
|
2007-10-24 03:37:24 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-06-01 21:52:35 +07:00
|
|
|
extern int rdmsr_safe_regs(u32 regs[8]);
|
|
|
|
extern int wrmsr_safe_regs(u32 regs[8]);
|
2009-08-31 14:50:09 +07:00
|
|
|
|
2015-06-25 23:44:07 +07:00
|
|
|
/**
|
|
|
|
* rdtsc() - returns the current TSC without ordering constraints
|
|
|
|
*
|
|
|
|
* rdtsc() returns the result of RDTSC as a 64-bit integer. The
|
|
|
|
* only ordering constraint it supplies is the ordering implied by
|
|
|
|
* "asm volatile": it will put the RDTSC in the place you expect. The
|
|
|
|
* CPU can and will speculatively execute that RDTSC, though, so the
|
|
|
|
* results can be non-monotonic if compared on different CPUs.
|
|
|
|
*/
|
|
|
|
static __always_inline unsigned long long rdtsc(void)
|
2008-01-30 19:32:40 +07:00
|
|
|
{
|
|
|
|
DECLARE_ARGS(val, low, high);
|
|
|
|
|
|
|
|
asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
|
|
|
|
|
|
|
|
return EAX_EDX_VAL(val, low, high);
|
|
|
|
}
|
|
|
|
|
2015-06-25 23:44:08 +07:00
|
|
|
/**
|
|
|
|
* rdtsc_ordered() - read the current TSC in program order
|
|
|
|
*
|
|
|
|
* rdtsc_ordered() returns the result of RDTSC as a 64-bit integer.
|
|
|
|
* It is ordered like a load to a global in-memory counter. It should
|
|
|
|
* be impossible to observe non-monotonic rdtsc_unordered() behavior
|
|
|
|
* across multiple CPUs as long as the TSC is synced.
|
|
|
|
*/
|
|
|
|
static __always_inline unsigned long long rdtsc_ordered(void)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The RDTSC instruction is not ordered relative to memory
|
|
|
|
* access. The Intel SDM and the AMD APM are both vague on this
|
|
|
|
* point, but empirically an RDTSC instruction can be
|
|
|
|
* speculatively executed before prior loads. An RDTSC
|
|
|
|
* immediately after an appropriate barrier appears to be
|
|
|
|
* ordered as a normal load, that is, it provides the same
|
|
|
|
* ordering guarantees as reading from a global memory location
|
|
|
|
* that some other imaginary CPU is updating continuously with a
|
|
|
|
* time stamp.
|
|
|
|
*/
|
|
|
|
alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC,
|
|
|
|
"lfence", X86_FEATURE_LFENCE_RDTSC);
|
|
|
|
return rdtsc();
|
|
|
|
}
|
|
|
|
|
2015-08-21 13:33:53 +07:00
|
|
|
/* Deprecated, keep it for a cycle for easier merging: */
|
|
|
|
#define rdtscll(now) do { (now) = rdtsc_ordered(); } while (0)
|
|
|
|
|
2008-01-30 19:31:07 +07:00
|
|
|
static inline unsigned long long native_read_pmc(int counter)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
2008-01-30 19:31:07 +07:00
|
|
|
DECLARE_ARGS(val, low, high);
|
|
|
|
|
|
|
|
asm volatile("rdpmc" : EAX_EDX_RET(val, low, high) : "c" (counter));
|
2015-12-02 08:00:59 +07:00
|
|
|
if (msr_tracepoint_active(__tracepoint_rdpmc))
|
|
|
|
do_trace_rdpmc(counter, EAX_EDX_VAL(val, low, high), 0);
|
2008-01-30 19:31:07 +07:00
|
|
|
return EAX_EDX_VAL(val, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
|
|
#include <asm/paravirt.h>
|
2007-10-11 16:20:03 +07:00
|
|
|
#else
|
2007-10-24 03:37:24 +07:00
|
|
|
#include <linux/errno.h>
|
|
|
|
/*
|
|
|
|
* Access to machine-specific registers (available on 586 and better only)
|
|
|
|
* Note: the rd* operations modify the parameters directly (without using
|
|
|
|
* pointer indirection), this allows gcc to optimize better
|
|
|
|
*/
|
|
|
|
|
2013-03-05 03:16:19 +07:00
|
|
|
#define rdmsr(msr, low, high) \
|
2008-03-23 15:02:51 +07:00
|
|
|
do { \
|
|
|
|
u64 __val = native_read_msr((msr)); \
|
2013-03-05 03:16:19 +07:00
|
|
|
(void)((low) = (u32)__val); \
|
|
|
|
(void)((high) = (u32)(__val >> 32)); \
|
2008-03-23 15:02:51 +07:00
|
|
|
} while (0)
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline void wrmsr(unsigned int msr, u32 low, u32 high)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
2008-01-30 19:31:07 +07:00
|
|
|
native_write_msr(msr, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
|
|
|
|
2008-03-23 15:02:51 +07:00
|
|
|
#define rdmsrl(msr, val) \
|
|
|
|
((val) = native_read_msr((msr)))
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline void wrmsrl(unsigned int msr, u64 val)
|
2015-07-24 02:14:40 +07:00
|
|
|
{
|
2015-11-23 17:12:26 +07:00
|
|
|
native_write_msr(msr, (u32)(val & 0xffffffffULL), (u32)(val >> 32));
|
2015-07-24 02:14:40 +07:00
|
|
|
}
|
2007-10-24 03:37:24 +07:00
|
|
|
|
|
|
|
/* wrmsr with exception handling */
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline int wrmsr_safe(unsigned int msr, u32 low, u32 high)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
2008-01-30 19:31:07 +07:00
|
|
|
return native_write_msr_safe(msr, low, high);
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
|
|
|
|
2012-04-20 07:07:34 +07:00
|
|
|
/* rdmsr with exception handling */
|
2013-03-05 03:16:19 +07:00
|
|
|
#define rdmsr_safe(msr, low, high) \
|
2008-03-23 15:02:51 +07:00
|
|
|
({ \
|
|
|
|
int __err; \
|
|
|
|
u64 __val = native_read_msr_safe((msr), &__err); \
|
2013-03-05 03:16:19 +07:00
|
|
|
(*low) = (u32)__val; \
|
|
|
|
(*high) = (u32)(__val >> 32); \
|
2008-03-23 15:02:51 +07:00
|
|
|
__err; \
|
|
|
|
})
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2016-11-03 01:35:22 +07:00
|
|
|
static inline int rdmsrl_safe(unsigned int msr, unsigned long long *p)
|
2008-03-22 16:59:28 +07:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
*p = native_read_msr_safe(msr, &err);
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-31 14:50:10 +07:00
|
|
|
|
2008-03-23 15:02:51 +07:00
|
|
|
#define rdpmc(counter, low, high) \
|
|
|
|
do { \
|
|
|
|
u64 _l = native_read_pmc((counter)); \
|
|
|
|
(low) = (u32)_l; \
|
|
|
|
(high) = (u32)(_l >> 32); \
|
|
|
|
} while (0)
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2012-06-06 07:56:50 +07:00
|
|
|
#define rdpmcl(counter, val) ((val) = native_read_pmc(counter))
|
|
|
|
|
x86/asm/tsc, x86/paravirt: Remove read_tsc() and read_tscp() paravirt hooks
We've had ->read_tsc() and ->read_tscp() paravirt hooks since
the very beginning of paravirt, i.e.,
d3561b7fa0fb ("[PATCH] paravirt: header and stubs for paravirtualisation").
AFAICT, the only paravirt guest implementation that ever
replaced these calls was vmware, and it's gone. Arguably even
vmware shouldn't have hooked RDTSC -- we fully support systems
that don't have a TSC at all, so there's no point for a paravirt
implementation to pretend that we have a TSC but to replace it.
I also doubt that these hooks actually worked. Calls to rdtscl()
and rdtscll(), which respected the hooks, were used seemingly
interchangeably with native_read_tsc(), which did not.
Just remove them. If anyone ever needs them again, they can try
to make a case for why they need them.
Before, on a paravirt config:
text data bss dec hex filename
12618257 1816384 1093632 15528273 ecf151 vmlinux
After:
text data bss dec hex filename
12617207 1816384 1093632 15527223 eced37 vmlinux
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang Rui <ray.huang@amd.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm ML <kvm@vger.kernel.org>
Cc: virtualization@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/d08a2600fb298af163681e5efd8e599d889a5b97.1434501121.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-06-25 23:43:57 +07:00
|
|
|
#endif /* !CONFIG_PARAVIRT */
|
|
|
|
|
2015-06-05 07:13:44 +07:00
|
|
|
/*
|
|
|
|
* 64-bit version of wrmsr_safe():
|
|
|
|
*/
|
|
|
|
static inline int wrmsrl_safe(u32 msr, u64 val)
|
|
|
|
{
|
|
|
|
return wrmsr_safe(msr, (u32)val, (u32)(val >> 32));
|
|
|
|
}
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2013-03-05 03:16:19 +07:00
|
|
|
#define write_tsc(low, high) wrmsr(MSR_IA32_TSC, (low), (high))
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2009-12-16 12:48:04 +07:00
|
|
|
#define write_rdtscp_aux(val) wrmsr(MSR_TSC_AUX, (val), 0)
|
2007-10-24 03:37:24 +07:00
|
|
|
|
2009-12-12 00:14:40 +07:00
|
|
|
struct msr *msrs_alloc(void);
|
|
|
|
void msrs_free(struct msr *msrs);
|
2014-03-10 00:05:23 +07:00
|
|
|
int msr_set_bit(u32 msr, u8 bit);
|
|
|
|
int msr_clear_bit(u32 msr, u8 bit);
|
2009-12-12 00:14:40 +07:00
|
|
|
|
2007-10-24 03:37:24 +07:00
|
|
|
#ifdef CONFIG_SMP
|
2008-08-26 07:27:21 +07:00
|
|
|
int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
|
|
|
|
int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
|
2013-10-12 06:54:58 +07:00
|
|
|
int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);
|
|
|
|
int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q);
|
2009-07-30 16:10:02 +07:00
|
|
|
void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
|
|
|
|
void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
|
2007-10-24 03:37:24 +07:00
|
|
|
int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
|
|
|
|
int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
|
2013-10-12 06:54:58 +07:00
|
|
|
int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);
|
|
|
|
int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);
|
2009-09-01 04:13:48 +07:00
|
|
|
int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]);
|
|
|
|
int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]);
|
2007-10-24 03:37:24 +07:00
|
|
|
#else /* CONFIG_SMP */
|
2008-08-26 07:27:21 +07:00
|
|
|
static inline int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
|
|
|
rdmsr(msr_no, *l, *h);
|
2008-08-26 07:27:21 +07:00
|
|
|
return 0;
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
2008-08-26 07:27:21 +07:00
|
|
|
static inline int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
|
|
|
wrmsr(msr_no, l, h);
|
2008-08-26 07:27:21 +07:00
|
|
|
return 0;
|
2007-10-24 03:37:24 +07:00
|
|
|
}
|
2013-10-12 06:54:58 +07:00
|
|
|
static inline int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
|
|
|
|
{
|
|
|
|
rdmsrl(msr_no, *q);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static inline int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q)
|
|
|
|
{
|
|
|
|
wrmsrl(msr_no, q);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-11-05 19:15:41 +07:00
|
|
|
static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no,
|
2009-05-22 18:52:19 +07:00
|
|
|
struct msr *msrs)
|
|
|
|
{
|
2016-11-03 01:35:22 +07:00
|
|
|
rdmsr_on_cpu(0, msr_no, &(msrs[0].l), &(msrs[0].h));
|
2009-05-22 18:52:19 +07:00
|
|
|
}
|
2009-11-05 19:15:41 +07:00
|
|
|
static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no,
|
2009-05-22 18:52:19 +07:00
|
|
|
struct msr *msrs)
|
|
|
|
{
|
2016-11-03 01:35:22 +07:00
|
|
|
wrmsr_on_cpu(0, msr_no, msrs[0].l, msrs[0].h);
|
2009-05-22 18:52:19 +07:00
|
|
|
}
|
2008-03-23 15:02:51 +07:00
|
|
|
static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no,
|
|
|
|
u32 *l, u32 *h)
|
2007-10-24 03:37:24 +07:00
|
|
|
{
|
|
|
|
return rdmsr_safe(msr_no, l, h);
|
|
|
|
}
|
|
|
|
static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
|
|
|
|
{
|
|
|
|
return wrmsr_safe(msr_no, l, h);
|
|
|
|
}
|
2013-10-12 06:54:58 +07:00
|
|
|
static inline int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
|
|
|
|
{
|
|
|
|
return rdmsrl_safe(msr_no, q);
|
|
|
|
}
|
|
|
|
static inline int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q)
|
|
|
|
{
|
|
|
|
return wrmsrl_safe(msr_no, q);
|
|
|
|
}
|
2009-09-01 04:13:48 +07:00
|
|
|
static inline int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
|
|
|
|
{
|
|
|
|
return rdmsr_safe_regs(regs);
|
|
|
|
}
|
|
|
|
static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
|
|
|
|
{
|
|
|
|
return wrmsr_safe_regs(regs);
|
|
|
|
}
|
2007-10-24 03:37:24 +07:00
|
|
|
#endif /* CONFIG_SMP */
|
2009-09-01 04:16:57 +07:00
|
|
|
#endif /* __ASSEMBLY__ */
|
2008-10-23 12:26:29 +07:00
|
|
|
#endif /* _ASM_X86_MSR_H */
|