From: <Conor.Dooley@microchip.com>
To: <gregkh@linuxfoundation.org>, <ajones@ventanamicro.com>,
<apatel@ventanamicro.com>, <atishp@rivosinc.com>,
<palmer@rivosinc.com>, <re@w6rz.net>
Cc: <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] riscv: Ensure isa-ext static keys are writable" failed to apply to 5.19-stable tree
Date: Sun, 21 Aug 2022 15:54:34 +0000 [thread overview]
Message-ID: <edafce2a-a42e-9c85-115e-4dffd4b70466@microchip.com> (raw)
In-Reply-To: <166108940135238@kroah.com>
Hey Greg,
On 21/08/2022 14:43, gregkh@linuxfoundation.org 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@vger.kernel.org>.
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@ventanamicro.com>
> 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@ventanamicro.com>
> Cc: stable@vger.kernel.org
> Reported-by: Ron Economos <re@w6rz.net>
> Reported-by: Anup Patel <apatel@ventanamicro.com>
> Reported-by: Conor Dooley <conor.dooley@microchip.com>
> Tested-by: Atish Patra <atishp@rivosinc.com>
> Link: https://lore.kernel.org/r/20220816163058.3004536-1-ajones@ventanamicro.com
> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
>
> 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);
>
> /**
>
prev parent reply other threads:[~2022-08-21 15:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-21 13:43 FAILED: patch "[PATCH] riscv: Ensure isa-ext static keys are writable" failed to apply to 5.19-stable tree gregkh
2022-08-21 15:54 ` Conor.Dooley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=edafce2a-a42e-9c85-115e-4dffd4b70466@microchip.com \
--to=conor.dooley@microchip.com \
--cc=ajones@ventanamicro.com \
--cc=apatel@ventanamicro.com \
--cc=atishp@rivosinc.com \
--cc=gregkh@linuxfoundation.org \
--cc=palmer@rivosinc.com \
--cc=re@w6rz.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox