x86, mwaitt: introduce AMD mwaitt support
v3 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
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 | 27 ++++++++++++++++++++++++++ arch/x86/lib/delay.c | 41 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-)
Signature · 1 line
1.9.1
PATCH v3 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 | 16 ++++++++++++++++ 2 files changed, 17 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 +16 -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,14 @@ static inline void __mwait(unsigned long eax, unsigned long ecx) :: "a" (eax), "c" (ecx)); } +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
Re: [PATCH v3 1/2] x86, mwaitt: add monitorx and mwaitx instruction
Quoted 21 lines · Huang Rui
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 clocksMWAIT 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)
Quoted 8 lines
MONITOR MONITORX
opcode 0f 01 c8 | 0f 01 fa
EAX (logical) address to monitor
ECX #GP if not zeroThe software P0 frequency is the same as the TSC frequency.
Max timeout = EBX/(TSC frequency)
As suggested last time, please put the description of MWAITX over __mwaitx() in the code as comments below. See below.
Quoted 38 lines
Signed-off-by Huang Rui <[email protected]>--- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/mwait.h | 16 ++++++++++++++++ 2 files changed, 17 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 +8
-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;" */
arch/x86/include/asm/mwait.h static inline void __mwait(unsigned long eax, unsigned long ecx) · line 39
Quoted 2 lines
arch/x86/include/asm/mwait.h +0
-0@@ -30,6 +38,14 @@ static inline void __mwait(unsigned long eax, unsigned long ecx) :: "a" (eax), "c" (ecx)); }
<Add comment here!>
Quoted 14 lines
arch/x86/include/asm/mwait.h +8
-0+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
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--Re: [PATCH v3 1/2] x86, mwaitt: add monitorx and mwaitx instruction
Quoted 27 lines · Borislav Petkov
Quoted 26 lines · Huang Rui
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 clocksMWAIT 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
Quoted 7 lines
Quoted 3 lines
The software P0 frequency is the same as the TSC frequency.
Max timeout = EBX/(TSC frequency)
As suggested last time, please put the description of MWAITX over
__mwaitx()in the code as comments below. See below.
Apology to miss that. Will do it at once.
Thanks,
Rui
PATCH v3 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)
@@ -80,4 +82,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 v3 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 32 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 +2
-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)@@ -80,4 +82,13 @@ static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)current_clr_polling ();
arch/x86/include/asm/mwait.h static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx) · line 92
Quoted 10 lines
arch/x86/include/asm/mwait.h +8
-0} +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 ); +}
What's the purpose of the "enable" parameter?
--Andy
Re: [PATCH v3 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 35 lines · Andy Lutomirski
Quoted 34 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 +2
-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)@@ -80,4 +82,13 @@ static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)current_clr_polling (); }
Quoted 11 lines
arch/x86/include/asm/mwait.h static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx) · line 92
Quoted 8 lines
arch/x86/include/asm/mwait.h +8
-0+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 ); +}What's the purpose of the "enable" parameter?
Enable mwaitx timer. Should I add comments to explain the usage?
Thanks,
Rui
Re: [PATCH v3 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 4 lines · Huang Rui
Quoted 2 lines
What's the purpose of the "enable" parameter?
Enable mwaitx timer. Should I add comments to explain the usage?
No, you should read your own patch, notice that the only usage site provides a true, then realize its a redundant bit of code and kill it dead.
Re: [PATCH v3 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 10 lines · Peter Zijlstra
Quoted 4 lines · Huang Rui
Quoted 2 lines
What's the purpose of the "enable" parameter?
Enable mwaitx timer. Should I add comments to explain the usage?
No, you should read your own patch, notice that the only usage site provides a true, then realize its a redundant bit of code and kill it dead.
Yeah, but I remembered at last time, someone tell me we shouldn't force to set timer always enabled. So I add this interface to expose more clearly. :)
So could I use __mwaitx directly like below:
__monitorx(&dummy, 0, 0);__mwaitx(0xf, delay, MWAITX_ECX_TIMER_ENABLE);
Thanks,
Rui
Re: [PATCH v3 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 3 lines · Huang Rui
Yeah, but I remembered at last time, someone tell me we shouldn't force to set timer always enabled. So I add this interface to expose more clearly. :)
Yeah, but this interface would make users go and look at it and try to remember what the enable parameter stood for.
Quoted 4 lines
So could I use
__mwaitxdirectly like below:
__monitorx(&dummy, 0, 0);__mwaitx(0xf, delay, MWAITX_ECX_TIMER_ENABLE);
Yes, this is more straight-forward and what the hardware instructions take, so more intuitive.
Thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--Re: [PATCH v3 2/2] x86, mwaitt: introduce mwaix delay with a configurable timer
Quoted 8 lines · Borislav Petkov
Quoted 3 lines · Huang Rui
Yeah, but I remembered at last time, someone tell me we shouldn't force to set timer always enabled. So I add this interface to expose more clearly. :)
Yeah, but this interface would make users go and look at it and try to remember what the enable parameter stood for.
Quoted 8 lines
Quoted 4 lines
So could I use
__mwaitxdirectly like below:
__monitorx(&dummy, 0, 0);__mwaitx(0xf, delay, MWAITX_ECX_TIMER_ENABLE);Yes, this is more straight-forward and what the hardware instructions take, so more intuitive.
OK, will do it. :)
Thanks,
Rui