| Message ID | 20200901065309.5952-1-huangpei@loongson.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | f8a005e1632ce23f4a958401986f558ac03e12ce |
| Headers | show |
| Series | [v4] MIPS: add missing MSACSR and upper MSA initialization | expand |
Hi, all, On Tue, Sep 1, 2020 at 2:53 PM Huang Pei <huangpei@loongson.cn> wrote: > > In cc97ab235f ("MIPS: Simplify FP context initialization), 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. > I still think this needs an ACK from Paul Burton. Huacai > Fixes: cc97ab235f ("MIPS: Simplify FP context initialization") > Signed-off-by: Huang Pei <huangpei@loongson.cn> > --- > 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); > } > -- > 2.17.1 >
On Tue, Sep 01, 2020 at 02:53:09PM +0800, Huang Pei wrote: > In cc97ab235f ("MIPS: Simplify FP context initialization), 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. > > Fixes: cc97ab235f ("MIPS: Simplify FP context initialization") > Signed-off-by: Huang Pei <huangpei@loongson.cn> > --- > arch/mips/kernel/traps.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) applied to mips-fixes. Thomas.
On Tue, Sep 01, 2020 at 03:43:15PM +0800, Huacai Chen wrote: > Hi, all, > > On Tue, Sep 1, 2020 at 2:53 PM Huang Pei <huangpei@loongson.cn> wrote: > > > > In cc97ab235f ("MIPS: Simplify FP context initialization), 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. > > > I still think this needs an ACK from Paul Burton. I'm also curious why Paul removed the init_msa_upper() call in that patch, but I don't need an explicit ACK from him. I've checked how FPU/MSA context is setup and to me this patch does the correct thing. IMHO it doesn't do any harm. So if we find out they are for whatever reason redudant it's quite easy to revert this patch. Thomas.
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); }
In cc97ab235f ("MIPS: Simplify FP context initialization), 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. Fixes: cc97ab235f ("MIPS: Simplify FP context initialization") Signed-off-by: Huang Pei <huangpei@loongson.cn> --- arch/mips/kernel/traps.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)