| Message ID | 20200828085706.29190-1-huangpei@loongson.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [Fixes] MIPS: add missing MSACSR and upper MSA initialization | expand |
Hi Pei, On 8/28/20 4:57 PM, Huang Pei wrote: > init_fp_ctx just initialize the fp/msa context, and own_fp_inatomic > just restore FCSR and 64bit FP regs from it, but miss MSACSR and upper > MSA regs for MSA, so MSACSR and MSA upper regs's value from previous > task on current cpu can leak into current task and cause unpredictable > behavior when MSA context not initialized. > > Signed-off-by: Huang Pei <huangpei@loongson.cn> Actually I think what Thomas meant by saying "add a Fixes tag" in the previous thread was "to add a Fixes: tag to refer to the broken commit" . So perhaps send a v3? > --- > arch/mips/kernel/traps.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c > index 38aa07ccdbcc..cf788591f091 100644 > --- a/arch/mips/kernel/traps.c > +++ b/arch/mips/kernel/traps.c > @@ -1287,6 +1287,18 @@ static int enable_restore_fp_context(int msa) > err = own_fpu_inatomic(1); > if (msa && !err) { > enable_msa(); > + /* > + * with MSA enabled, userspace can see MSACSR > + * and MSA regs, but the values in them are from > + * other task before current task, restore them > + * from saved fp/msa context > + */ > + write_msa_csr(current->thread.fpu.msacsr); > + /* > + * own_fpu_inatomic(1) just restore low 64bit, > + * fix the high 64bit > + */ > + init_msa_upper(); > set_thread_flag(TIF_USEDMSA); > set_thread_flag(TIF_MSA_CTX_LIVE); > }
On Fri, Aug 28, 2020 at 11:26:19PM +0800, WANG Xuerui wrote: > Hi Pei, > > On 8/28/20 4:57 PM, Huang Pei wrote: > > init_fp_ctx just initialize the fp/msa context, and own_fp_inatomic > > just restore FCSR and 64bit FP regs from it, but miss MSACSR and upper > > MSA regs for MSA, so MSACSR and MSA upper regs's value from previous > > task on current cpu can leak into current task and cause unpredictable > > behavior when MSA context not initialized. > > > > Signed-off-by: Huang Pei <huangpei@loongson.cn> > Actually I think what Thomas meant by saying "add a Fixes tag" in the > previous thread was "to add a Fixes: tag to refer to the broken commit" . So > perhaps send a v3? > > --- > > arch/mips/kernel/traps.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c > > index 38aa07ccdbcc..cf788591f091 100644 > > --- a/arch/mips/kernel/traps.c > > +++ b/arch/mips/kernel/traps.c > > @@ -1287,6 +1287,18 @@ static int enable_restore_fp_context(int msa) > > err = own_fpu_inatomic(1); > > if (msa && !err) { > > enable_msa(); > > + /* > > + * with MSA enabled, userspace can see MSACSR > > + * and MSA regs, but the values in them are from > > + * other task before current task, restore them > > + * from saved fp/msa context > > + */ > > + write_msa_csr(current->thread.fpu.msacsr); > > + /* > > + * own_fpu_inatomic(1) just restore low 64bit, > > + * fix the high 64bit > > + */ > > + init_msa_upper(); > > set_thread_flag(TIF_USEDMSA); > > set_thread_flag(TIF_MSA_CTX_LIVE); > > } Got it, resend with a tag refering to hte broken commit
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 38aa07ccdbcc..cf788591f091 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -1287,6 +1287,18 @@ static int enable_restore_fp_context(int msa) err = own_fpu_inatomic(1); if (msa && !err) { enable_msa(); + /* + * with MSA enabled, userspace can see MSACSR + * and MSA regs, but the values in them are from + * other task before current task, restore them + * from saved fp/msa context + */ + write_msa_csr(current->thread.fpu.msacsr); + /* + * own_fpu_inatomic(1) just restore low 64bit, + * fix the high 64bit + */ + init_msa_upper(); set_thread_flag(TIF_USEDMSA); set_thread_flag(TIF_MSA_CTX_LIVE); }
init_fp_ctx just initialize the fp/msa context, and own_fp_inatomic just restore FCSR and 64bit FP regs from it, but miss MSACSR and upper MSA regs for MSA, so MSACSR and MSA upper regs's value from previous task on current cpu can leak into current task and cause unpredictable behavior when MSA context not initialized. Signed-off-by: Huang Pei <huangpei@loongson.cn> --- arch/mips/kernel/traps.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)