Skip to contentSkip to conversation

x86, math-emu: fix init_fpu for task != current

PATCH In review Daniel Glöckner 2 participants 5 messages Mar 2, 2009 – Mar 4, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, math-emu: fix init_fpu for task != current

init_fpu calls finit to initialize a task's xstate, while finit always works on the current task. If we use PTRACE_GETFPREGS on another process and both processes did not already use floating point, we get a null pointer exception in finit.

This patch creates a new function finit_task that takes a task_struct parameter. finit becomes a wrapper that simply calls finit_task with current. On the plus side this avoids many calls to get_current which would each resolve to an inline assembler mov instruction.

---
 arch/x86/include/asm/i387.h |    1 +
 arch/x86/kernel/i387.c      |    2 +-
 arch/x86/math-emu/fpu_aux.c |   31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 12 deletions(-)
arch/x86/include/asm/i387.h +1 -0
index 48f0004..10f349b 100644
@@ -172,6 +172,7 @@ static inline void __save_init_fpu(struct task_struct *tsk)
 
 #else  /* CONFIG_X86_32 */
 
+extern void finit_task(struct task_struct *tsk);
 extern void finit(void);
 
 static inline void tolerant_fwait(void)
arch/x86/kernel/i387.c +1 -1
index b0f61f0..f2f8540 100644
@@ -136,7 +136,7 @@ int init_fpu(struct task_struct *tsk)
 #ifdef CONFIG_X86_32
 	if (!HAVE_HWFP) {
 		memset(tsk->thread.xstate, 0, xstate_size);
-		finit();
+		finit_task(tsk);
 		set_stopped_child_used_math(tsk);
 		return 0;
 	}
arch/x86/math-emu/fpu_aux.c +20 -11
index 491e737..aa09870 100644
@@ -30,20 +30,29 @@ static void fclex(void)
 }
 
 /* Needs to be externally visible */
-void finit(void)
+void finit_task(struct task_struct *tsk)
 {
-	control_word = 0x037f;
-	partial_status = 0;
-	top = 0;		/* We don't keep top in the status word internally. */
-	fpu_tag_word = 0xffff;
+	struct i387_soft_struct *soft = &tsk->thread.xstate->soft;
+	struct address *oaddr, *iaddr;
+	soft->cwd = 0x037f;
+	soft->swd = 0;
+	soft->ftop = 0;	/* We don't keep top in the status word internally. */
+	soft->twd = 0xffff;
 	/* The behaviour is different from that detailed in
 	   Section 15.1.6 of the Intel manual */
-	operand_address.offset = 0;
-	operand_address.selector = 0;
-	instruction_address.offset = 0;
-	instruction_address.selector = 0;
-	instruction_address.opcode = 0;
-	no_ip_update = 1;
+	oaddr = (struct address *)&soft->foo;
+	oaddr->offset = 0;
+	oaddr->selector = 0;
+	iaddr = (struct address *)&soft->fip;
+	iaddr->offset = 0;
+	iaddr->selector = 0;
+	iaddr->opcode = 0;
+	soft->no_update = 1;
+}
+
+void finit(void)
+{
+	finit_task(current);
 }
 
 /*
Signature · 10 lines
1.5.6


-- 
Dipl.-Math. Daniel Glöckner, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax -11, Bahnhofsallee 1b, 37081 Göttingen, Germany
Geschäftsführung: Dr. Uwe Kracke, Dr. Cord Seele, Ust-IdNr.: DE 205 198 055
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160

emlix - your embedded linux partner
#1 lore raw
Quoted 47 lines · Daniel Glöckner

init_fpu calls finit to initialize a task's xstate, while finit always works on the current task. If we use PTRACE_GETFPREGS on another process and both processes did not already use floating point, we get a null pointer exception in finit.

This patch creates a new function finit_task that takes a task_struct parameter. finit becomes a wrapper that simply calls finit_task with current. On the plus side this avoids many calls to get_current which would each resolve to an inline assembler mov instruction.

---
 arch/x86/include/asm/i387.h |    1 +
 arch/x86/kernel/i387.c      |    2 +-
 arch/x86/math-emu/fpu_aux.c |   31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 12 deletions(-)
arch/x86/include/asm/i387.h +1 -0
index 48f0004..10f349b 100644
@@ -172,6 +172,7 @@ static inline void __save_init_fpu(struct task_struct *tsk)
 
 #else  /* CONFIG_X86_32 */
 
+extern void finit_task(struct task_struct *tsk);
 extern void finit(void);
 
 static inline void tolerant_fwait(void)
arch/x86/kernel/i387.c +1 -1
index b0f61f0..f2f8540 100644
@@ -136,7 +136,7 @@ int init_fpu(struct task_struct *tsk)
 #ifdef CONFIG_X86_32
 	if (!HAVE_HWFP) {
 		memset(tsk->thread.xstate, 0, xstate_size);
-		finit();
+		finit_task(tsk);
 		set_stopped_child_used_math(tsk);
 		return 0;
 	}
arch/x86/math-emu/fpu_aux.c +0 -0
index 491e737..aa09870 100644

arch/x86/math-emu/fpu_aux.c static void fclex(void) · line 33

Quoted 5 lines
arch/x86/math-emu/fpu_aux.c +1 -1
@@ -30,20 +30,29 @@ static void fclex(void)
 }
 
 /* Needs to be externally visible */
-void finit(void)
+void finit_task(struct task_struct *tsk)

ok, the fix looks good - but we sure want to define this function in the "# CONFIG_MATH_EMU is not set" case too, agreed?

Ingo

#2 lore raw
Quoted 1 line · Ingo Molnar

* Daniel Glöckner <[email protected]> wrote:

[..]

Quoted 4 lines
Quoted 4 lines

This patch creates a new function finit_task that takes a task_struct parameter. finit becomes a wrapper that simply calls finit_task with current. On the plus side this avoids many calls to get_current which would each resolve to an inline assembler mov instruction.

[..]

Quoted 11 lines
Quoted 11 lines
arch/x86/kernel/i387.c +1 -1
@@ -136,7 +136,7 @@ int init_fpu(struct task_struct *tsk)
 #ifdef CONFIG_X86_32
 	if (!HAVE_HWFP) {
 		memset(tsk->thread.xstate, 0, xstate_size);
-		finit();
+		finit_task(tsk);
 		set_stopped_child_used_math(tsk);
 		return 0;
 	}

[..]

Quoted 3 lines

ok, the fix looks good - but we sure want to define this function in the "# CONFIG_MATH_EMU is not set" case too, agreed?

To avoid linker errors if the compiler emits the call although !HAVE_HWFP is always false? Sounds plausible. I also removed finit from i387.h as the only other external call site, reg_ld_str.c, gets its prototype from fpu_proto.h.

---
 arch/x86/include/asm/i387.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
arch/x86/include/asm/i387.h +6 -1
index 10f349b..71c9e51 100644
@@ -172,8 +172,13 @@ static inline void __save_init_fpu(struct task_struct *tsk)
 
 #else  /* CONFIG_X86_32 */
 
+#ifdef CONFIG_MATH_EMULATION
 extern void finit_task(struct task_struct *tsk);
-extern void finit(void);
+#else
+static inline void finit_task(struct task_struct *tsk)
+{
+}
+#endif
 
 static inline void tolerant_fwait(void)
 {

--
1.5.6

Signature · 6 lines
Dipl.-Math. Daniel Glöckner, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax -11, Bahnhofsallee 1b, 37081 Göttingen, Germany
Geschäftsführung: Dr. Uwe Kracke, Dr. Cord Seele, Ust-IdNr.: DE 205 198 055
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160

emlix - your embedded linux partner
#3 lore raw
Quoted 21 lines · Daniel Glöckner
Quoted 1 line · Ingo Molnar

* Daniel Glöckner <[email protected]> wrote:

[..]

Quoted 4 lines
Quoted 4 lines

This patch creates a new function finit_task that takes a task_struct parameter. finit becomes a wrapper that simply calls finit_task with current. On the plus side this avoids many calls to get_current which would each resolve to an inline assembler mov instruction.

[..]

Quoted 11 lines
Quoted 11 lines
arch/x86/kernel/i387.c +1 -1
@@ -136,7 +136,7 @@ int init_fpu(struct task_struct *tsk)
 #ifdef CONFIG_X86_32
 	if (!HAVE_HWFP) {
 		memset(tsk->thread.xstate, 0, xstate_size);
-		finit();
+		finit_task(tsk);
 		set_stopped_child_used_math(tsk);
 		return 0;
 	}

[..]

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

ok, the fix looks good - but we sure want to define this function in the "# CONFIG_MATH_EMU is not set" case too, agreed?

To avoid linker errors if the compiler emits the call although !HAVE_HWFP is always false? Sounds plausible. I also removed finit from i387.h as the only other external call site, reg_ld_str.c, gets its prototype from fpu_proto.h.

Could you please send a single combo patch with a full changelog, etc.

Thanks,

Ingo

#4 lore raw

PATCH 1/1 x86, math-emu: fix init_fpu for task != current

init_fpu calls finit to initialize a task's xstate, while finit always works on the current task. If we use PTRACE_GETFPREGS on another process and both processes did not already use floating point, we get a null pointer exception in finit.

This patch creates a new function finit_task that takes a task_struct parameter. finit becomes a wrapper that simply calls finit_task with current. On the plus side this avoids many calls to get_current which would each resolve to an inline assembler mov instruction.

An empty finit_task has been added to i387.h to avoid linker errors in case the compiler still emits the call in init_fpu when CONFIG_MATH_EMULATION is not defined.

The declaration of finit in i387.h has been removed as the remaining code using this function gets its prototype from fpu_proto.h.

---
 arch/x86/include/asm/i387.h |    8 +++++++-
 arch/x86/kernel/i387.c      |    2 +-
 arch/x86/math-emu/fpu_aux.c |   31 ++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 13 deletions(-)
arch/x86/include/asm/i387.h +7 -1
index 48f0004..71c9e51 100644
@@ -172,7 +172,13 @@ static inline void __save_init_fpu(struct task_struct *tsk)
 
 #else  /* CONFIG_X86_32 */
 
-extern void finit(void);
+#ifdef CONFIG_MATH_EMULATION
+extern void finit_task(struct task_struct *tsk);
+#else
+static inline void finit_task(struct task_struct *tsk)
+{
+}
+#endif
 
 static inline void tolerant_fwait(void)
 {
arch/x86/kernel/i387.c +1 -1
index b0f61f0..f2f8540 100644
@@ -136,7 +136,7 @@ int init_fpu(struct task_struct *tsk)
 #ifdef CONFIG_X86_32
 	if (!HAVE_HWFP) {
 		memset(tsk->thread.xstate, 0, xstate_size);
-		finit();
+		finit_task(tsk);
 		set_stopped_child_used_math(tsk);
 		return 0;
 	}
arch/x86/math-emu/fpu_aux.c +20 -11
index 491e737..aa09870 100644
@@ -30,20 +30,29 @@ static void fclex(void)
 }
 
 /* Needs to be externally visible */
-void finit(void)
+void finit_task(struct task_struct *tsk)
 {
-	control_word = 0x037f;
-	partial_status = 0;
-	top = 0;		/* We don't keep top in the status word internally. */
-	fpu_tag_word = 0xffff;
+	struct i387_soft_struct *soft = &tsk->thread.xstate->soft;
+	struct address *oaddr, *iaddr;
+	soft->cwd = 0x037f;
+	soft->swd = 0;
+	soft->ftop = 0;	/* We don't keep top in the status word internally. */
+	soft->twd = 0xffff;
 	/* The behaviour is different from that detailed in
 	   Section 15.1.6 of the Intel manual */
-	operand_address.offset = 0;
-	operand_address.selector = 0;
-	instruction_address.offset = 0;
-	instruction_address.selector = 0;
-	instruction_address.opcode = 0;
-	no_ip_update = 1;
+	oaddr = (struct address *)&soft->foo;
+	oaddr->offset = 0;
+	oaddr->selector = 0;
+	iaddr = (struct address *)&soft->fip;
+	iaddr->offset = 0;
+	iaddr->selector = 0;
+	iaddr->opcode = 0;
+	soft->no_update = 1;
+}
+
+void finit(void)
+{
+	finit_task(current);
 }
 
 /*
Signature · 10 lines
1.5.6


-- 
Dipl.-Math. Daniel Glöckner, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax -11, Bahnhofsallee 1b, 37081 Göttingen, Germany
Geschäftsführung: Dr. Uwe Kracke, Dr. Cord Seele, Ust-IdNr.: DE 205 198 055
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160

emlix - your embedded linux partner