| Message ID | 20220127195554.15705-1-palmer@rivosinc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | RISC-V: Prevent sbi_ecall() from being inlined | expand |
On Thu, 27 Jan 2022 11:55:55 PST (-0800), Palmer Dabbelt wrote: > From: Palmer Dabbelt <palmer@rivosinc.com> > > The SBI spec defines SBI calls as following the standard calling > convention, but we don't actually inform GCC of that when making an As per some discussion on the SBI spec, this definition isn't internally consistent. I've got some WIP to make proper inline SBI macros -- that'll be necessary either way the spec goes (ie, to get rid of all the zeros), but I'm going to leave this alone until the spec gets sorted out. > ecall. Unfortunately this does actually manifest for the more complex > SBI call wrappers, for example sbi_s, for example sbi_send_ipi_v02() > uses t1. > > This patch just marks sbi_ecall() as noinline, which implicitly enforces > the standard calling convention. > > Fixes : b9dcd9e41587 ("RISC-V: Add basic support for SBI v0.2") > Cc: stable@vger.kernel.org > Reported-by: Atish Patra <atishp@rivosinc.com> > Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> > --- > This is more of a stop-gap fix than anything else, but it's small enough > that it should be straight-forward to back port to stable. This bug has > existed forever, in theory, but none of this was specified in SBI-0.1 > so the backport to the introduction of 0.2 should be sufficient. > No extant versions OpenSBI or BBL will manifest issues here, as they > save all registers, but the spec is quite explicit so we're better off > getting back in line sooner rather than later. > > There'll be some marginal performance impact here. I'll send a > follow-on to clean up the SBI call wrappers in a way that allows > inlining without violating the spec, but that'll be a bigger change and > thus isn't really suitable for stable. > --- > arch/riscv/kernel/sbi.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c > index f72527fcb347..7be586f5dc69 100644 > --- a/arch/riscv/kernel/sbi.c > +++ b/arch/riscv/kernel/sbi.c > @@ -21,6 +21,11 @@ static int (*__sbi_rfence)(int fid, const struct cpumask *cpu_mask, > unsigned long start, unsigned long size, > unsigned long arg4, unsigned long arg5) __ro_after_init; > > +/* > + * This ecall stub can't be inlined because we're relying on the presence of a > + * function call to enforce the calling convention. > + */ > +noinline > struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, > unsigned long arg1, unsigned long arg2, > unsigned long arg3, unsigned long arg4,
diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index f72527fcb347..7be586f5dc69 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -21,6 +21,11 @@ static int (*__sbi_rfence)(int fid, const struct cpumask *cpu_mask, unsigned long start, unsigned long size, unsigned long arg4, unsigned long arg5) __ro_after_init; +/* + * This ecall stub can't be inlined because we're relying on the presence of a + * function call to enforce the calling convention. + */ +noinline struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4,