Skip to contentSkip to conversation

FAILED: patch "[PATCH] riscv: Ensure isa-ext static keys are writable" failed to apply to 5.19-stable tree

PATCH [email protected] 2 participants 2 messages Aug 21, 2022

Subsystems (2)
Stable branch RISC-V
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From eb6354e116305afbfde196be5120bfa8669fdc6a Mon Sep 17 00:00:00 2001
From: Andrew Jones <[email protected]>
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 <[email protected]>
Cc [email protected]
Reported-by Ron Economos <[email protected]>
Reported-by Anup Patel <[email protected]>
Reported-by Conor Dooley <[email protected]>
Tested-by Atish Patra <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Palmer Dabbelt <[email protected]>
arch/riscv/kernel/cpufeature.c +1 -1
index 553d755483ed..3b5583db9d80 100644
@@ -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);
 
 /**
#1 lore raw

Hey Greg,

Quoted 6 lines · On 21/08/2022 14:43, [email protected] 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 <[email protected]>.

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.

Quoted 46 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From eb6354e116305afbfde196be5120bfa8669fdc6a Mon Sep 17 00:00:00 2001
From: Andrew Jones <[email protected]>
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 <[email protected]>
Cc [email protected]
Reported-by Ron Economos <[email protected]>
Reported-by Anup Patel <[email protected]>
Reported-by Conor Dooley <[email protected]>
Tested-by Atish Patra <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Palmer Dabbelt <[email protected]>
arch/riscv/kernel/cpufeature.c +1 -1
index 553d755483ed..3b5583db9d80 100644
@@ -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);
 
 /**