Message ID | 20220526141444.302078-1-wxjstz@126.com |
---|---|
State | Superseded |
Headers | show |
Series | lib: sbi: fix system_opcode_insn | expand |
On Thu, May 26, 2022 at 7:45 PM Xiang W <wxjstz@126.com> wrote: > > If the csr's operation comes from M mode, it should not be forwarded > to low-privilege processing, this patch fixes this problem. > > Signed-off-by: Xiang W <wxjstz@126.com> > Reviewed-by: Anup Patel <anup@brainfault.org> Applied this patch to the riscv/opensbi repo. Thanks, Anup > --- > Changes in v4: > - Improve print statement > > Changes in v3: > - move checking prev_mode before sbi_emulate_csr_read and return > failure by Anup's suggestion > > Changes in v2: > - add missing head file > > lib/sbi/sbi_illegal_insn.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/lib/sbi/sbi_illegal_insn.c b/lib/sbi/sbi_illegal_insn.c > index bfe7d61..388ad55 100644 > --- a/lib/sbi/sbi_illegal_insn.c > +++ b/lib/sbi/sbi_illegal_insn.c > @@ -16,6 +16,7 @@ > #include <sbi/sbi_pmu.h> > #include <sbi/sbi_trap.h> > #include <sbi/sbi_unpriv.h> > +#include <sbi/sbi_console.h> > > typedef int (*illegal_insn_func)(ulong insn, struct sbi_trap_regs *regs); > > @@ -37,8 +38,15 @@ static int system_opcode_insn(ulong insn, struct sbi_trap_regs *regs) > int do_write, rs1_num = (insn >> 15) & 0x1f; > ulong rs1_val = GET_RS1(insn, regs); > int csr_num = (u32)insn >> 20; > + ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; > ulong csr_val, new_csr_val; > > + if (prev_mode == PRV_M) { > + sbi_printf("%s: Failed to access CSR %#x from M-mode", > + __func__, csr_num); > + return SBI_EFAIL; > + } > + > /* TODO: Ensure that we got CSR read/write instruction */ > > if (sbi_emulate_csr_read(csr_num, regs, &csr_val)) > -- > 2.30.2 >
diff --git a/lib/sbi/sbi_illegal_insn.c b/lib/sbi/sbi_illegal_insn.c index bfe7d61..388ad55 100644 --- a/lib/sbi/sbi_illegal_insn.c +++ b/lib/sbi/sbi_illegal_insn.c @@ -16,6 +16,7 @@ #include <sbi/sbi_pmu.h> #include <sbi/sbi_trap.h> #include <sbi/sbi_unpriv.h> +#include <sbi/sbi_console.h> typedef int (*illegal_insn_func)(ulong insn, struct sbi_trap_regs *regs); @@ -37,8 +38,15 @@ static int system_opcode_insn(ulong insn, struct sbi_trap_regs *regs) int do_write, rs1_num = (insn >> 15) & 0x1f; ulong rs1_val = GET_RS1(insn, regs); int csr_num = (u32)insn >> 20; + ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; ulong csr_val, new_csr_val; + if (prev_mode == PRV_M) { + sbi_printf("%s: Failed to access CSR %#x from M-mode", + __func__, csr_num); + return SBI_EFAIL; + } + /* TODO: Ensure that we got CSR read/write instruction */ if (sbi_emulate_csr_read(csr_num, regs, &csr_val))