Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1354038

[RFC PATCH] x86/delay: Do not use cpu_tss in preemptible ctxt in delay_mwaitx()

Show all headers | View raw

From: Borislav Petkov <bp@suse.de>

So Andy had a good idea about using a cacheline-aligned, seldomly used
per-cpu var as the MONITORX target but we can't use it in preemptible
context. The first simple idea I have is to disable preemption around us
dereffing it.

Better ideas?

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Huang Rui <ray.huang@amd.com>
Cc: spg_linux_kernel@amd.com
---
 arch/x86/lib/delay.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
index e912b2f6d36e..c1810afcd2ea 100644
--- a/arch/x86/lib/delay.c
+++ b/arch/x86/lib/delay.c
@@ -92,17 +92,22 @@ static void delay_tsc(unsigned long __loops)
 static void delay_mwaitx(unsigned long __loops)
 {
 	u64 start, end, delay, loops = __loops;
+	struct tss_struct *t;
+
+	/*
+	 * Use cpu_tss as a cacheline-aligned, seldomly accessed per-cpu
+	 * variable as the monitor target.
+	 */
+	preempt_disable();
+	t = this_cpu_ptr(&cpu_tss);
+	preempt_enable();
 
 	start = rdtsc_ordered();
 
 	for (;;) {
 		delay = min_t(u64, MWAITX_MAX_LOOPS, loops);
 
-		/*
-		 * Use cpu_tss as a cacheline-aligned, seldomly
-		 * accessed per-cpu variable as the monitor target.
-		 */
-		__monitorx(this_cpu_ptr(&cpu_tss), 0, 0);
+		__monitorx(t, 0, 0);
 
 		/*
 		 * AMD, like Intel, supports the EAX hint and EAX=0xf
-- 
2.3.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[RFC PATCH] x86/delay: Do not use cpu_tss in preemptible ctxt in delay_mwaitx() Borislav Petkov <bp@alien8.de> - 2016-03-09 12:40 +0100
  Re: [RFC PATCH] x86/delay: Do not use cpu_tss in preemptible ctxt in delay_mwaitx() Andy Lutomirski <luto@amacapital.net> - 2016-03-09 19:00 +0100
    Re: [RFC PATCH] x86/delay: Do not use cpu_tss in preemptible ctxt in  delay_mwaitx() Borislav Petkov <bp@alien8.de> - 2016-03-09 19:20 +0100
      [PATCH] x86/delay: Avoid preemptible context checks in delay_mwaitx() Borislav Petkov <bp@alien8.de> - 2016-03-09 22:00 +0100
        [tip:x86/urgent] x86/delay: Avoid preemptible context checks in  delay_mwaitx() tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-03-10 12:10 +0100

csiph-web