x86, mwaitt: introduce AMD mwaitt support
v4 cover x86, mwaitt: introduce AMD mwaitt support
Hi,
This patch set introduces a new instruction support on AMD Carrizo (Family 15h, Model 60h-6fh). It adds mwaitx delay function with a configurable timer.
Andy and Boris provide a suggestion which use mwaitx on delay method.
Some discussions of the background, please see:
http://marc.info/?l=linux-kernel&m=143202042530498&w=2
http://marc.info/?l=linux-kernel&m=143161327003541&w=2
http://marc.info/?l=linux-kernel&m=143222815331016&w=2
They are rebased on tip/master.
Changes from v1 -> v2
- Remove mwaitx idle implementation since some disputes without power improvement.
- Add a patch which implement another use case on delay.
- Introduce a kernel parameter (delay) to make delay method configurable.
Changes from v2 -> v3
- Add compared data on commit message
- Remove kernel parameter
- Add hint to avoid to access deep state in future
- Update mwaitx delay method as Petter's suggestion
Changes from v3 -> v4
- Put the description into comments
I already do some testing with mwaitx on udelay.
Test scenario:
glb_loops = usec_to_tsc(delay_usec)
rdtsc -> read TSC counters as startmwaitx_delay(glb_loops)
rdtsc -> read TSC counters as end
diff = end - start
Compared the real TSC counts (diff), that means the loops of counter goes. And glb_loops is the input value of the EBX, that is the expect loops which user configures. Below is 10000 us of mwaitx delay, we could see about 1200 (diff - glb_loops) delayed with mwaitx.
[ 2369.008651] start=4401974718758, end=4401992576888, diff=17858130, glb_loops=17856939
Thanks,
Rui
Huang Rui (2):
x86, mwaitt: add monitorx and mwaitx instruction x86, mwaitt: introduce mwaix delay with a configurable timer
arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/mwait.h | 51 +++++++++++++++++++++++++++++++++++++++ arch/x86/lib/delay.c | 41 ++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 1 deletion(-)
Signature · 1 line
1.9.1
PATCH v4 1/2 x86, mwaitt: add monitorx and mwaitx instruction
On AMD Carrizo processors (Family 15h, Model 60h-6fh), there is a new feature called MWAITT (Mwait with a timer) as an extension of Monitor/Mwait.
MWAITT, another name is MWAITX (MWAIT with extensions), has a configurable timer that causes MWAITX to exit on expiration.
Compared with MONITOR/MWAIT, there are minor differences in opcode and input parameters.
MWAITX ECX[1]: enable timer if set
MWAITX EBX[31:0]: max wait time expressed in SW P0 clocks
MWAIT MWAITX
opcode 0f 01 c9 | 0f 01 fb
ECX[0] value of RFLAGS.IF seen by instruction
ECX[1] unused/#GP if set | enable timer if set
ECX[31:2] unused/#GP if set
EAX unused (reserve for hint)
EBX[31:0] unused | max wait time (loops)
MONITOR MONITORX
opcode 0f 01 c8 | 0f 01 fa
EAX (logical) address to monitor
ECX #GP if not zero
The software P0 frequency is the same as the TSC frequency.
Max timeout = EBX/(TSC frequency)
--- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/mwait.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+)
arch/x86/include/asm/cpufeature.h +1 -0
@@ -176,6 +176,7 @@#define X86_FEATURE_PERFCTR_NB ( 6*32+24)/* NB performance counter extensions */ #define X86_FEATURE_BPEXT (6*32+26)/* data breakpoint extension */ #define X86_FEATURE_PERFCTR_L2 ( 6*32+28)/* L2 performance counter extensions */ +#define X86_FEATURE_MWAITT ( 6*32+29)/* Mwait extension (MonitorX/MwaitX) */ /* * Auxiliary flags: Linux defined - For features scattered in various
arch/x86/include/asm/mwait.h +40 -0
@@ -23,6 +23,14 @@ static inline void __monitor(const void *eax, unsigned long ecx, :: "a" (eax), "c" (ecx), "d"(edx)); } +static inline void __monitorx (const void *eax,unsigned long ecx, +unsigned long edx) +{ +/* "monitorx %eax, %ecx, %edx;" */ + asmvolatile (".byte 0x0f, 0x01, 0xfa;" + ::"a" (eax),"c" (ecx),"d" (edx)); +} +static inline void __mwait (unsigned long eax,unsigned long ecx) {/* "mwait %eax, %ecx;" */
@@ -30,6 +38,38 @@ static inline void __mwait(unsigned long eax, unsigned long ecx) :: "a" (eax), "c" (ecx)); } +/* +* MWAITT allows for both a timer value to get you out of the MWAIT as +* well as the normal exit conditions. +* +* MWAITX ECX[1]: enable timer if set +* MWAITX EBX[31:0]: max wait time expressed in SW P0 clocks +* +* Below is the compared data between MWAIT and MWAITX on AMD +* processors: +* MWAIT MWAITX +* opcode 0f 01 c9 | 0f 01 fb +* ECX[0] value of RFLAGS.IF seen by instruction +* ECX[1] unused/#GP if set | enable timer if set +* ECX[31:2] unused/#GP if set +* EAX unused (reserve for hint) +* EBX[31:0] unused | max wait time (loops) +* +* MONITOR MONITORX +* opcode 0f 01 c8 | 0f 01 fa +* EAX (logical) address to monitor +* ECX #GP if not zero +* +* The software P0 frequency is the same as the TSC frequency. +*/ +static inline void __mwaitx (unsigned long eax,unsigned long ebx, +unsigned long ecx) +{ +/* "mwaitx %eax, %ebx, %ecx;" */ + asmvolatile (".byte 0x0f, 0x01, 0xfb;" + ::"a" (eax),"b" (ebx),"c" (ecx)); +} +static inline void __sti_mwait (unsigned long eax,unsigned long ecx) {trace_hardirqs_on ();
Signature · 1 line
1.9.1
PATCH v4 2/2 x86, mwaitt: introduce mwaix delay with a configurable timer
In reply to Huang RuiMWAITX can enable a timer and a corresponding timer value specified in SW P0 clocks. The SW P0 frequency is the same with TSC. The timer provides an upper bound on how long the instruction waits before exiting.
The implementation of delay function in kernel can lerverage the timer of MWAITX. This patch provides a new method (delay_mwaitx) to measure delay time.
--- arch/x86/include/asm/mwait.h | 11 +++++++++++ arch/x86/lib/delay.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-)
arch/x86/include/asm/mwait.h +11 -0
@@ -14,6 +14,8 @@#define CPUID5_ECX_INTERRUPT_BREAK 0x2#define MWAIT_ECX_INTERRUPT_BREAK 0x1 +#define MWAITX_ECX_TIMER_ENABLE BIT(1) +#define MWAITX_MAX_LOOPS ((u32)-1)static inline void __monitor (const void *eax,unsigned long ecx,unsigned long edx)
@@ -104,4 +106,13 @@ static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx) current_clr_polling(); } +static inline void mwaitx (unsigned long eax,unsigned long loops, +bool enable) +{ +if (enable) +__mwaitx (eax, loops,MWAITX_ECX_TIMER_ENABLE ); +else +__mwaitx (eax,0 ,0 ); +} +#endif /* _ASM_X86_MWAIT_H */
arch/x86/lib/delay.c +40 -1
59 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [PATCH v4 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 99 lines · Huang Rui
MWAITX can enable a timer and a corresponding timer value specified in SW P0 clocks. The SW P0 frequency is the same with TSC. The timer provides an upper bound on how long the instruction waits before exiting.
The implementation of delay function in kernel can lerverage the timer of MWAITX. This patch provides a new method (
delay_mwaitx) to measure delay time.Suggested-by Andy Lutomirski <[email protected]>Suggested-by Borislav Petkov <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Huang Rui <[email protected]>--- arch/x86/include/asm/mwait.h | 11 +++++++++++ arch/x86/lib/delay.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-)arch/x86/include/asm/mwait.h +11
-0@@ -14,6 +14,8 @@#define CPUID5_ECX_INTERRUPT_BREAK 0x2#define MWAIT_ECX_INTERRUPT_BREAK 0x1 +#define MWAITX_ECX_TIMER_ENABLE BIT(1) +#define MWAITX_MAX_LOOPS ((u32)-1)static inline void __monitor (const void *eax,unsigned long ecx,unsigned long edx)@@ -104,4 +106,13 @@ static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx) current_clr_polling(); } +static inline void mwaitx (unsigned long eax,unsigned long loops, +bool enable) +{ +if (enable) +__mwaitx (eax, loops,MWAITX_ECX_TIMER_ENABLE ); +else +__mwaitx (eax,0 ,0 ); +} +#endif /* _ASM_X86_MWAIT_H */ arch/x86/lib/delay.c +36
-0@@ -20,6 +20,7 @@#include <asm/processor.h> #include <asm/delay.h> #include <asm/timer.h> +#include <asm/mwait.h> #ifdef CONFIG_SMP # include <asm/smp.h> @@ -87,6 +88,41 @@ static void delay_tsc(unsigned long __loops) }/* +* On AMD platforms mwaitx has a configurable 32-bit timer, that counts +* with TSC frequency. And the input value is the loop of the counter, it +* will exit with the timer expired. +*/ +static void delay_mwaitx (unsigned long __loops) +{ +u32 end, start, delay, addr, loops = __loops; + +rdtsc_barrier (); +rdtscl (start); + +for (;;) { + delay =min (MWAITX_MAX_LOOPS , loops); + +__monitorx (&addr,0 ,0 ); +/* +* AMD, like Intel, supports the EAX hint and EAX=0xf +* means, do not enter any deep C-state and we use it +* here in delay() to minimize wakeup latency. +*/ +mwaitx (0xf , delay, true); + +rdtsc_barrier (); +rdtscl (end); + +if (loops <= end - start) +break ; + + loops -= end - start; + + start = end; + } +} + +/* * Since we calibrate only once at boot, this * function should be set once at boot and not changed */
arch/x86/lib/delay.c int read_current_timer(unsigned long *timer_val) · line 147
Quoted 5 lines
arch/x86/lib/delay.c +1
-1@@ -108,7 +144,10 @@ int read_current_timer(unsigned long *timer_val)void __delay (unsigned long loops) { -delay_fn (loops); +if (!static_cpu_has_safe (X86_FEATURE_MWAITT ))
Actually, as Thomas suggested, you don't need that static_cpu_has_safe() thing either. You can change use_tsc_delay() to do this:
void use_tsc_delay(void)
{
if (delay_fn == delay_loop)
delay_fn = delay_tsc;
}and then add:
void use_mwaitx_delay(void)
{
delay_fn = delay_mwaitx;
}and in cpu/amd.c:init_amd() do:
if (static_cpu_has_safe(X86_FEATURE_MWAITT)) use_mwaitx_delay();
Something like that, at least. tglx might have a better idea though.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--