APPLIED: [SRU][Q][PATCH 0/2] UBUNTU: [Config] Enable ARCH_HAVE_NMI_SAFE_CMPXCHG for riscv64

[Stefan Bader]

On 14/01/2026 14:19, Sarah Emery wrote:
> BugLink: https://bugs.launchpad.net/bugs/2124276
> 
> SRU Justification:
> 
> [Impact]
> 
> ftrace/kprobes tests are failing on riscv64, because of an upstream issue
> that was fixed in 6.18. A configuration key was missing, that allows
> the ftrace/kprobes subsystem to work correctly on riscv64.
> 
> [Fix]
> 
> Cherry picked commit 205cbc714842478df4239b5be205b9b459fd9fbc from upstream,
> and added relevant config annotations bringing back feature
> parity between riscv64 and other architectures around tracing subsystem.
> 
> [Test Plan]
> 
> Tested on local Q/N:linux-riscv VMs.
> linux-riscv is based on Questing linux for Questing and Noble.
> 
> Executed ftrace/kprobes full test suite.
> 
> [Where problems could occur]
> 
> The now re-enabled ftrace/kprobes subsystem could have wrong behaviour. This would be low
> impact as it was previously completely disabled, and now the tests are passing.
> 
> The configuration key could also affect other subsystems.
> 
> [Other Info]
> 
> This work was part of the shutdown squad effort to fix hinted tests.
> 
> Pu Lehui (1):
>    riscv: Enable ARCH_HAVE_NMI_SAFE_CMPXCHG
> 
> Sarah Emery (1):
>    UBUNTU: [Config] Enable ARCH_HAVE_NMI_SAFE_CMPXCHG for riscv64
> 
>   arch/riscv/Kconfig               | 1 +
>   debian.master/config/annotations | 8 ++++----
>   2 files changed, 5 insertions(+), 4 deletions(-)
> 


Applied to questing:linux/master-next. Thanks.

-Stefan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0xE8675DEECBEECEA3.asc
Type: application/pgp-keys
Size: 52669 bytes
Desc: OpenPGP public key
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20260123/d2ecafd0/attachment-0001.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20260123/d2ecafd0/attachment-0001.sig>