Skip to contentSkip to conversation

x86/fsgsbase/64: Fix the base write helper functions

PATCH In review Chang S. Bae 2 participants 4 messages Oct 30, 2018 – Oct 31, 2018 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/fsgsbase/64: Fix the base write helper functions

Factor out the code to change index from x86_fsbase_write_cpu() and x86_gsbase_write_cpu_inactive(). Now the code is located in do_arch_prctl_64().

The helper functions that purport to write the base register should just write the base register only. It shouldn't have magic optimizations to change the index.

putreg() in ptrace does not write the current task, but a stopped task.

Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Dave Hansen <[email protected]>
---
 arch/x86/kernel/process_64.c | 67 +++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 28 deletions(-)
arch/x86/kernel/process_64.c +39 -28
index 31b4755369f0..4fd865fb7097 100644
@@ -339,19 +339,11 @@ static unsigned long x86_fsgsbase_read_task(struct task_struct *task,
 
 void x86_fsbase_write_cpu(unsigned long fsbase)
 {
-	/*
-	 * Set the selector to 0 as a notion, that the segment base is
-	 * overwritten, which will be checked for skipping the segment load
-	 * during context switch.
-	 */
-	loadseg(FS, 0);
 	wrmsrl(MSR_FS_BASE, fsbase);
 }
 
 void x86_gsbase_write_cpu_inactive(unsigned long gsbase)
 {
-	/* Set the selector to 0 for the same reason as %fs above. */
-	loadseg(GS, 0);
 	wrmsrl(MSR_KERNEL_GS_BASE, gsbase);
 }
 
@@ -359,9 +351,7 @@ unsigned long x86_fsbase_read_task(struct task_struct *task)
 {
 	unsigned long fsbase;
 
-	if (task == current)
-		fsbase = x86_fsbase_read_cpu();
-	else if (task->thread.fsindex == 0)
+	if (task->thread.fsindex == 0)
 		fsbase = task->thread.fsbase;
 	else
 		fsbase = x86_fsgsbase_read_task(task, task->thread.fsindex);
@@ -373,9 +363,7 @@ unsigned long x86_gsbase_read_task(struct task_struct *task)
 {
 	unsigned long gsbase;
 
-	if (task == current)
-		gsbase = x86_gsbase_read_cpu_inactive();
-	else if (task->thread.gsindex == 0)
+	if (task->thread.gsindex == 0)
 		gsbase = task->thread.gsbase;
 	else
 		gsbase = x86_fsgsbase_read_task(task, task->thread.gsindex);
@@ -392,12 +380,8 @@ int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase)
 	if (unlikely(fsbase >= TASK_SIZE_MAX))
 		return -EPERM;
 
-	preempt_disable();
 	task->thread.fsbase = fsbase;
-	if (task == current)
-		x86_fsbase_write_cpu(fsbase);
 	task->thread.fsindex = 0;
-	preempt_enable();
 
 	return 0;
 }
@@ -407,12 +391,8 @@ int x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase)
 	if (unlikely(gsbase >= TASK_SIZE_MAX))
 		return -EPERM;
 
-	preempt_disable();
 	task->thread.gsbase = gsbase;
-	if (task == current)
-		x86_gsbase_write_cpu_inactive(gsbase);
 	task->thread.gsindex = 0;
-	preempt_enable();
 
 	return 0;
 }
@@ -757,22 +737,53 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2)
 	int ret = 0;
 
 	switch (option) {
-	case ARCH_SET_GS: {
-		ret = x86_gsbase_write_task(task, arg2);
-		break;
-	}
 	case ARCH_SET_FS: {
+		preempt_disable();
 		ret = x86_fsbase_write_task(task, arg2);
+		if (task == current && ret == 0) {
+			/*
+			 * Set the selector to 0, implying that the base is
+			 * overwritten. The index value will be checked
+			 * during context switch for skipping segment reload.
+			 */
+			loadseg(FS, 0);
+			x86_fsbase_write_cpu(arg2);
+		}
+		preempt_enable();
+		break;
+	}
+	case ARCH_SET_GS: {
+		preempt_disable();
+		ret = x86_gsbase_write_task(task, arg2);
+		if (task == current && ret == 0) {
+			/*
+			 * Set the selector to 0 for the same reason
+			 * as %fs above.
+			 */
+			loadseg(GS, 0);
+			x86_gsbase_write_cpu_inactive(arg2);
+		}
+		preempt_enable();
 		break;
 	}
 	case ARCH_GET_FS: {
-		unsigned long base = x86_fsbase_read_task(task);
+		unsigned long base;
+
+		if (task == current)
+			base = x86_fsbase_read_cpu();
+		else
+			base = x86_fsbase_read_task(task);
 
 		ret = put_user(base, (unsigned long __user *)arg2);
 		break;
 	}
 	case ARCH_GET_GS: {
-		unsigned long base = x86_gsbase_read_task(task);
+		unsigned long base;
+
+		if (task == current)
+			base = x86_gsbase_read_cpu_inactive();
+		else
+			base = x86_gsbase_read_task(task);
 
 		ret = put_user(base, (unsigned long __user *)arg2);
 		break;
Signature · 1 line
2.19.1
#1 lore raw
Quoted 9 lines

Factor out the code to change index from x86_fsbase_write_cpu() and x86_gsbase_write_cpu_inactive(). Now the code is located in do_arch_prctl_64().

The helper functions that purport to write the base register should just write the base register only. It shouldn't have magic optimizations to change the index.

putreg() in ptrace does not write the current task, but a stopped task.

Wm, I just realized that the changelog should also clearly include this:

	"While at here, subsequently factor out the read for the current task's base 
	from x86_fsbase_read_task() and x86_gsbase_read_task() to do_arch_prctl_64()."

Sorry for this. Let me know if you feel it should go as a separate patch.

Chang

#2 lore raw
In reply to Chang S. Bae
Quoted 7 lines · Chang S. Bae

Factor out the code to change index from x86_fsbase_write_cpu() and x86_gsbase_write_cpu_inactive(). Now the code is located in do_arch_prctl_64().

arch/x86/kernel/process_64.c unsigned long x86_fsbase_read_task(struct task_struct *task) · line 354

Quoted 7 lines
arch/x86/kernel/process_64.c +1 -3
@@ -359,9 +351,7 @@ unsigned long x86_fsbase_read_task(struct task_struct *task)
 {
        unsigned long fsbase;
 
-       if (task == current)
-               fsbase = x86_fsbase_read_cpu();
-       else if (task->thread.fsindex == 0)
+       if (task->thread.fsindex == 0)

I'm okay with this change but, if you do it, please add:

WARN_ON_ONCE(task == current);

and make it be in a separate patch.

arch/x86/kernel/process_64.c unsigned long x86_gsbase_read_task(struct task_struct *task) · line 366

Quoted 11 lines
arch/x86/kernel/process_64.c +1 -3
                fsbase = task->thread.fsbase;
        else
                fsbase = x86_fsgsbase_read_task(task, task->thread.fsindex);
@@ -373,9 +363,7 @@ unsigned long x86_gsbase_read_task(struct task_struct *task)
 {
        unsigned long gsbase;
 
-       if (task == current)
-               gsbase = x86_gsbase_read_cpu_inactive();
-       else if (task->thread.gsindex == 0)
+       if (task->thread.gsindex == 0)

Same here.

arch/x86/kernel/process_64.c int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase) · line 384

Quoted 12 lines
arch/x86/kernel/process_64.c +0 -3
                gsbase = task->thread.gsbase;
        else
                gsbase = x86_fsgsbase_read_task(task, task->thread.gsindex);
@@ -392,12 +380,8 @@ int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase)
        if (unlikely(fsbase >= TASK_SIZE_MAX))
                return -EPERM;
 
-       preempt_disable();
        task->thread.fsbase = fsbase;
-       if (task == current)
-               x86_fsbase_write_cpu(fsbase);
        task->thread.fsindex = 0;

I'm confused. You're still setting fsindex to zero here.

arch/x86/kernel/process_64.c int x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase) · line 395

Quoted 13 lines
arch/x86/kernel/process_64.c +0 -4
-       preempt_enable();
 
        return 0;
 }
@@ -407,12 +391,8 @@ int x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase)
        if (unlikely(gsbase >= TASK_SIZE_MAX))
                return -EPERM;
 
-       preempt_disable();
        task->thread.gsbase = gsbase;
-       if (task == current)
-               x86_gsbase_write_cpu_inactive(gsbase);
        task->thread.gsindex = 0;

Same here.

Quoted 16 lines
arch/x86/kernel/process_64.c +6 -4
@@ -757,22 +737,53 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2)
        int ret = 0;
 
        switch (option) {
-       case ARCH_SET_GS: {
-               ret = x86_gsbase_write_task(task, arg2);
-               break;
-       }
        case ARCH_SET_FS: {
+               preempt_disable();
                ret = x86_fsbase_write_task(task, arg2);
+               if (task == current && ret == 0) {
+                       /*
+                        * Set the selector to 0, implying that the base is
+                        * overwritten. The index value will be checked
+                        * during context switch for skipping segment reload.

arch/x86/kernel/process_64.c long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) · line 757

Quoted 10 lines
arch/x86/kernel/process_64.c +10 -0
+                        */
+                       loadseg(FS, 0);
+                       x86_fsbase_write_cpu(arg2);
+               }
+               preempt_enable();
+               break;
+       }
+       case ARCH_SET_GS: {
+               preempt_disable();
+               ret = x86_gsbase_write_task(task, arg2);

This would trip the warning that I'm asking you to add. This makes me think you should not make that change.

arch/x86/kernel/process_64.c long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) · line 765

Quoted 8 lines
arch/x86/kernel/process_64.c +8 -0
+               if (task == current && ret == 0) {
+                       /*
+                        * Set the selector to 0 for the same reason
+                        * as %fs above.
+                        */
+                       loadseg(GS, 0);
+                       x86_gsbase_write_cpu_inactive(arg2);
+               }

Why only if task == current?

I think this code should be:

ret = x86_gsbase_write_task(task, arg);
if (ret == 0) {
/* ARCH_SET_GS has always overwritten the index and the base. Zero
is the most sensible value to put in the index, and is the only value that makes any sense if FSGSBASE is unavailable. */
if (task == current)

    loadseg(GS, 0);
  else
    task->thread.gsindex = 0;
}
#3 lore raw
Quoted 22 lines · Andy Lutomirski
Quoted 7 lines · Chang S. Bae

Factor out the code to change index from x86_fsbase_write_cpu() and x86_gsbase_write_cpu_inactive(). Now the code is located in do_arch_prctl_64().

arch/x86/kernel/process_64.c unsigned long x86_fsbase_read_task(struct task_struct *task) · line 354

Quoted 7 lines
arch/x86/kernel/process_64.c +1 -3
@@ -359,9 +351,7 @@ unsigned long x86_fsbase_read_task(struct task_struct *task)
 {
       unsigned long fsbase;
 
-       if (task == current)
-               fsbase = x86_fsbase_read_cpu();
-       else if (task->thread.fsindex == 0)
+       if (task->thread.fsindex == 0)

I'm okay with this change but, if you do it, please add:

Quoted 4 lines

WARN_ON_ONCE(task == current);

and make it be in a separate patch.

Okay. Let me unchange those read functions, as it does what is claimed to do.

Quoted 7 lines
Quoted 7 lines
arch/x86/kernel/process_64.c +0 -0
               gsbase = task->thread.gsbase;
       else
               gsbase = x86_fsgsbase_read_task(task, task->thread.gsindex);
@@ -392,12 +380,8 @@ int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase)
       if (unlikely(fsbase >= TASK_SIZE_MAX))
               return -EPERM;
 
Quoted 8 lines

arch/x86/kernel/process_64.c int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase) · line 384

Quoted 5 lines
arch/x86/kernel/process_64.c +0 -3
-       preempt_disable();
       task->thread.fsbase = fsbase;
-       if (task == current)
-               x86_fsbase_write_cpu(fsbase);
       task->thread.fsindex = 0;

I'm confused. You're still setting fsindex to zero here.

These task write functions are getting thiner, although I agree the index update should move out.

Quoted 10 lines

ret = x86_gsbase_write_task(task, arg);
if (ret == 0) {
/* ARCH_SET_GS has always overwritten the index and the base. Zero
is the most sensible value to put in the index, and is the only value that makes any sense if FSGSBASE is unavailable. */
if (task == current)
loadseg(GS, 0);
else
task->thread.gsindex = 0;
}

Thank you for the clarification. I think writing base should come right after loadseg().

Chang