powerpc: Emulation support for load/store instructions on LE
emulate_step() uses a number of underlying kernel functions that were initially not enabled for LE. This has been rectified since. So, fix emulate_step() for LE for the corresponding instructions. Cc: stable@vger.kernel.org # v3.18+ Reported-by: Anton Blanchard <anton@samba.org> Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Родитель
b286cedd47
Коммит
e148bd17f4
|
@ -1799,8 +1799,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
goto instr_done;
|
goto instr_done;
|
||||||
|
|
||||||
case LARX:
|
case LARX:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
if (op.ea & (size - 1))
|
if (op.ea & (size - 1))
|
||||||
break; /* can't handle misaligned */
|
break; /* can't handle misaligned */
|
||||||
if (!address_ok(regs, op.ea, size))
|
if (!address_ok(regs, op.ea, size))
|
||||||
|
@ -1823,8 +1821,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
goto ldst_done;
|
goto ldst_done;
|
||||||
|
|
||||||
case STCX:
|
case STCX:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
if (op.ea & (size - 1))
|
if (op.ea & (size - 1))
|
||||||
break; /* can't handle misaligned */
|
break; /* can't handle misaligned */
|
||||||
if (!address_ok(regs, op.ea, size))
|
if (!address_ok(regs, op.ea, size))
|
||||||
|
@ -1849,8 +1845,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
goto ldst_done;
|
goto ldst_done;
|
||||||
|
|
||||||
case LOAD:
|
case LOAD:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
err = read_mem(®s->gpr[op.reg], op.ea, size, regs);
|
err = read_mem(®s->gpr[op.reg], op.ea, size, regs);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
if (op.type & SIGNEXT)
|
if (op.type & SIGNEXT)
|
||||||
|
@ -1862,8 +1856,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_FPU
|
#ifdef CONFIG_PPC_FPU
|
||||||
case LOAD_FP:
|
case LOAD_FP:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
if (size == 4)
|
if (size == 4)
|
||||||
err = do_fp_load(op.reg, do_lfs, op.ea, size, regs);
|
err = do_fp_load(op.reg, do_lfs, op.ea, size, regs);
|
||||||
else
|
else
|
||||||
|
@ -1872,15 +1864,11 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ALTIVEC
|
#ifdef CONFIG_ALTIVEC
|
||||||
case LOAD_VMX:
|
case LOAD_VMX:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
err = do_vec_load(op.reg, do_lvx, op.ea & ~0xfUL, regs);
|
err = do_vec_load(op.reg, do_lvx, op.ea & ~0xfUL, regs);
|
||||||
goto ldst_done;
|
goto ldst_done;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_VSX
|
#ifdef CONFIG_VSX
|
||||||
case LOAD_VSX:
|
case LOAD_VSX:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
err = do_vsx_load(op.reg, do_lxvd2x, op.ea, regs);
|
err = do_vsx_load(op.reg, do_lxvd2x, op.ea, regs);
|
||||||
goto ldst_done;
|
goto ldst_done;
|
||||||
#endif
|
#endif
|
||||||
|
@ -1903,8 +1891,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
goto instr_done;
|
goto instr_done;
|
||||||
|
|
||||||
case STORE:
|
case STORE:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
if ((op.type & UPDATE) && size == sizeof(long) &&
|
if ((op.type & UPDATE) && size == sizeof(long) &&
|
||||||
op.reg == 1 && op.update_reg == 1 &&
|
op.reg == 1 && op.update_reg == 1 &&
|
||||||
!(regs->msr & MSR_PR) &&
|
!(regs->msr & MSR_PR) &&
|
||||||
|
@ -1917,8 +1903,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_FPU
|
#ifdef CONFIG_PPC_FPU
|
||||||
case STORE_FP:
|
case STORE_FP:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
if (size == 4)
|
if (size == 4)
|
||||||
err = do_fp_store(op.reg, do_stfs, op.ea, size, regs);
|
err = do_fp_store(op.reg, do_stfs, op.ea, size, regs);
|
||||||
else
|
else
|
||||||
|
@ -1927,15 +1911,11 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ALTIVEC
|
#ifdef CONFIG_ALTIVEC
|
||||||
case STORE_VMX:
|
case STORE_VMX:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
err = do_vec_store(op.reg, do_stvx, op.ea & ~0xfUL, regs);
|
err = do_vec_store(op.reg, do_stvx, op.ea & ~0xfUL, regs);
|
||||||
goto ldst_done;
|
goto ldst_done;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_VSX
|
#ifdef CONFIG_VSX
|
||||||
case STORE_VSX:
|
case STORE_VSX:
|
||||||
if (regs->msr & MSR_LE)
|
|
||||||
return 0;
|
|
||||||
err = do_vsx_store(op.reg, do_stxvd2x, op.ea, regs);
|
err = do_vsx_store(op.reg, do_stxvd2x, op.ea, regs);
|
||||||
goto ldst_done;
|
goto ldst_done;
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче