Patchwork [1/2] powerpc/math-emu: move the flush FPU state function into do_mathemu

login
register
mail settings
Submitter Kevin Hao
Date July 11, 2013, 12:21 p.m.
Message ID <1373545315-9219-2-git-send-email-haokexin@gmail.com>
Download mbox | patch
Permalink /patch/258440/
State Superseded
Headers show

Comments

Kevin Hao - July 11, 2013, 12:21 p.m.
By doing this we can make sure that the FPU state is only flushed to
the thread struct when it is really needed.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
---
 arch/powerpc/kernel/traps.c  | 9 ---------
 arch/powerpc/math-emu/math.c | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
Matt Helsley - July 12, 2013, 12:34 a.m.
On Thu, Jul 11, 2013 at 08:21:54PM +0800, Kevin Hao wrote:
> By doing this we can make sure that the FPU state is only flushed to
> the thread struct when it is really needed.
> 
> Signed-off-by: Kevin Hao <haokexin@gmail.com>
> ---
>  arch/powerpc/kernel/traps.c  | 9 ---------
>  arch/powerpc/math-emu/math.c | 9 +++++++++
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index bf33c22..58a8065 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -1131,15 +1131,6 @@ void __kprobes program_check_exception(struct pt_regs *regs)
>  	 * instruction or only on FP instructions, whether there is a
>  	 * pattern to occurrences etc. -dgibson 31/Mar/2003
>  	 */
> -
> -	/*
> -	 * If we support a HW FPU, we need to ensure the FP state
> -	 * if flushed into the thread_struct before attempting
> -	 * emulation
> -	 */
> -#ifdef CONFIG_PPC_FPU
> -	flush_fp_to_thread(current);
> -#endif
>  	switch (do_mathemu(regs)) {
>  	case 0:
>  		emulate_single_step(regs);
> diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
> index 3fe8e35..18ce6a7 100644
> --- a/arch/powerpc/math-emu/math.c
> +++ b/arch/powerpc/math-emu/math.c
> @@ -420,6 +420,15 @@ do_mathemu(struct pt_regs *regs)
>  		goto illegal;
>  	}
> 
> +	/*
> +	 * If we support a HW FPU, we need to ensure the FP state
> +	 * if flushed into the thread_struct before attempting

As long as you're moving the comment you could fix up the spelling
error: s/if/is/

Cheers,
	-Matt Helsley
Kevin Hao - July 14, 2013, 8:11 a.m.
On Thu, Jul 11, 2013 at 05:34:45PM -0700, Matt Helsley wrote:
> On Thu, Jul 11, 2013 at 08:21:54PM +0800, Kevin Hao wrote:
> > By doing this we can make sure that the FPU state is only flushed to
> > the thread struct when it is really needed.
> > 
> > Signed-off-by: Kevin Hao <haokexin@gmail.com>
> > ---
> >  arch/powerpc/kernel/traps.c  | 9 ---------
> >  arch/powerpc/math-emu/math.c | 9 +++++++++
> >  2 files changed, 9 insertions(+), 9 deletions(-)
> > 
> > diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> > index bf33c22..58a8065 100644
> > --- a/arch/powerpc/kernel/traps.c
> > +++ b/arch/powerpc/kernel/traps.c
> > @@ -1131,15 +1131,6 @@ void __kprobes program_check_exception(struct pt_regs *regs)
> >  	 * instruction or only on FP instructions, whether there is a
> >  	 * pattern to occurrences etc. -dgibson 31/Mar/2003
> >  	 */
> > -
> > -	/*
> > -	 * If we support a HW FPU, we need to ensure the FP state
> > -	 * if flushed into the thread_struct before attempting
> > -	 * emulation
> > -	 */
> > -#ifdef CONFIG_PPC_FPU
> > -	flush_fp_to_thread(current);
> > -#endif
> >  	switch (do_mathemu(regs)) {
> >  	case 0:
> >  		emulate_single_step(regs);
> > diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
> > index 3fe8e35..18ce6a7 100644
> > --- a/arch/powerpc/math-emu/math.c
> > +++ b/arch/powerpc/math-emu/math.c
> > @@ -420,6 +420,15 @@ do_mathemu(struct pt_regs *regs)
> >  		goto illegal;
> >  	}
> > 
> > +	/*
> > +	 * If we support a HW FPU, we need to ensure the FP state
> > +	 * if flushed into the thread_struct before attempting
> 
> As long as you're moving the comment you could fix up the spelling
> error: s/if/is/

Fixed. Thanks Matt.

Kevin

> 
> Cheers,
> 	-Matt Helsley
>

Patch

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index bf33c22..58a8065 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1131,15 +1131,6 @@  void __kprobes program_check_exception(struct pt_regs *regs)
 	 * instruction or only on FP instructions, whether there is a
 	 * pattern to occurrences etc. -dgibson 31/Mar/2003
 	 */
-
-	/*
-	 * If we support a HW FPU, we need to ensure the FP state
-	 * if flushed into the thread_struct before attempting
-	 * emulation
-	 */
-#ifdef CONFIG_PPC_FPU
-	flush_fp_to_thread(current);
-#endif
 	switch (do_mathemu(regs)) {
 	case 0:
 		emulate_single_step(regs);
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
index 3fe8e35..18ce6a7 100644
--- a/arch/powerpc/math-emu/math.c
+++ b/arch/powerpc/math-emu/math.c
@@ -420,6 +420,15 @@  do_mathemu(struct pt_regs *regs)
 		goto illegal;
 	}
 
+	/*
+	 * If we support a HW FPU, we need to ensure the FP state
+	 * if flushed into the thread_struct before attempting
+	 * emulation
+	 */
+#ifdef CONFIG_PPC_FPU
+	flush_fp_to_thread(current);
+#endif
+
 	eflag = func(op0, op1, op2, op3);
 
 	if (insn & 1) {