Hey Greg, On 21/08/2022 14:43, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > The patch below does not apply to the 5.19-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. I don't think this needs backporting. The original/fixed commit only showed up in Palmer's first "5.20" PR & is a feature addition: https://lore.kernel.org/linux-riscv/mhng-1cbba637-6dd2-456a-859b-9d3f8be6bab7@palmer-mbp2014/ Thanks, Conor. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From eb6354e116305afbfde196be5120bfa8669fdc6a Mon Sep 17 00:00:00 2001 > From: Andrew Jones <ajones@xxxxxxxxxxxxxxxx> > Date: Tue, 16 Aug 2022 18:30:58 +0200 > Subject: [PATCH] riscv: Ensure isa-ext static keys are writable > > riscv_isa_ext_keys[] is an array of static keys used in the unified > ISA extension framework. The keys added to this array may be used > anywhere, including in modules. Ensure the keys remain writable by > placing them in the data section. > > The need to change riscv_isa_ext_keys[]'s section was found when the > kvm module started failing to load. Commit 8eb060e10185 ("arch/riscv: > add Zihintpause support") adds a static branch check for a newly > added isa-ext key to cpu_relax(), which kvm uses. > > Fixes: c360cbec3511 ("riscv: introduce unified static key mechanism for ISA extensions") > Signed-off-by: Andrew Jones <ajones@xxxxxxxxxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > Reported-by: Ron Economos <re@xxxxxxxx> > Reported-by: Anup Patel <apatel@xxxxxxxxxxxxxxxx> > Reported-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx> > Tested-by: Atish Patra <atishp@xxxxxxxxxxxx> > Link: https://lore.kernel.org/r/20220816163058.3004536-1-ajones@xxxxxxxxxxxxxxxx > Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx> > > diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c > index 553d755483ed..3b5583db9d80 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -28,7 +28,7 @@ unsigned long elf_hwcap __read_mostly; > /* Host ISA bitmap */ > static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; > > -__ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE(riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX); > +DEFINE_STATIC_KEY_ARRAY_FALSE(riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX); > EXPORT_SYMBOL(riscv_isa_ext_keys); > > /** >
