[PATCH v19 5/7] firmware: arm_rmm: Activate the RMM

[Suzuki K Poulose]

Hi Catalin

On 28/09/2026 19:01, Catalin Marinas wrote:
> On Mon, Sep 28, 2026 at 02:55:11PM +0100, Suzuki K Poulose wrote:
>> firmware: rmm: Deactivate RMM at reboot
>>
>> Deactivate the RMM at system shutdown. This would allow a normal kexec to
>> cleanup the state and boot into a new kernel gracefully.
>>
>> Kdump kernels need not worry about an active RMM, as long as it can
>> handle the GPF on access to the Delegated granules.
>>
>> Signed-off-by: Suzuki K Poulose <suzuki.poulose at arm.com>
>> ---
>>   arch/arm64/kernel/machine_kexec.c |  2 +
>>   drivers/firmware/arm_rmm/rmi.c    | 63 ++++++++++++++++++++++++++++++-
>>   include/linux/arm-rmi-cmds.h      | 10 +++++
>>   3 files changed, 73 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/kernel/machine_kexec.c
>> b/arch/arm64/kernel/machine_kexec.c
>> index 8f9bc2327dc85..8f16f92a5d389 100644
>> --- a/arch/arm64/kernel/machine_kexec.c
>> +++ b/arch/arm64/kernel/machine_kexec.c
>> @@ -6,6 +6,7 @@
>>    * Copyright (C) Huawei Futurewei Technologies.
>>    */
>>
>> +#include <linux/arm-rmi-cmds.h>
>>   #include <linux/interrupt.h>
>>   #include <linux/irq.h>
>>   #include <linux/kernel.h>
>> @@ -171,6 +172,7 @@ void machine_kexec(struct kimage *kimage)
>>   	BUG_ON(!in_kexec_crash && (stuck_cpus || (num_online_cpus() > 1)));
>>   	WARN(in_kexec_crash && (stuck_cpus || smp_crash_stop_failed()),
>>   		"Some CPUs may be stale, kdump will be unreliable.\n");
>> +	WARN(!in_kexec_crash && is_rmm_active(), "RMM is active, kexec will be
>> unreliable.\n");
>>
>>   	pr_info("Bye!\n");
>>
>> diff --git a/drivers/firmware/arm_rmm/rmi.c b/drivers/firmware/arm_rmm/rmi.c
>> index 51343e9d5c2a9..5b695f3155b1c 100644
>> --- a/drivers/firmware/arm_rmm/rmi.c
>> +++ b/drivers/firmware/arm_rmm/rmi.c
>> @@ -7,6 +7,7 @@
>>   #include <linux/memblock.h>
>>   #include <linux/memory.h>
>>   #include <linux/arm-rmi-cmds.h>
>> +#include <linux/reboot.h>
>>   #include <linux/slab.h>
>>
>>   #include <asm/memory.h>
>> @@ -15,6 +16,13 @@
>>   /* RMM v2.0 defines RmiFeatureRegister0 to RmiFeatureRegister4. */
>>   static unsigned long rmi_feat_reg_cache[5] __ro_after_init;
>>   static bool arm64_rmi_is_available;
>> +static bool arm64_rmm_active;
>> +
>> +bool is_rmm_active(void)
>> +{
>> +	return arm64_rmm_active;
>> +}
>> +EXPORT_SYMBOL_GPL(is_rmm_active);
>>
>>   /**
>>    * rmi_granule_range_undelegate() - Undelegate a range of granules
>> @@ -1017,6 +1025,53 @@ bool is_rmi_available(void)
>>   }
>>   EXPORT_SYMBOL_GPL(is_rmi_available);
>>
>> +static int rmi_rmm_deactivate(struct rmi_sro_state *sro)
>> +{
>> +	int ret;
>> +
>> +	if (!READ_ONCE(arm64_rmm_active))
>> +		return 0;
>> +
>> +	ret = WARN_ON(rmi_sro_memxfer_cmd(sro, GFP_KERNEL, SMC_RMI_RMM_DEACTIVATE));
>> +	if (ret)
>> +		return ret;
>> +
>> +	WRITE_ONCE(arm64_rmm_active, false);
>> +	WRITE_ONCE(arm64_rmi_is_available, false);
>> +
>> +	return ret;
>> +}
>> +
>> +static int rmi_reboot_notifier(struct notifier_block *nb,
>> +			       unsigned long action, void *data)
>> +{
>> +	int ret;
>> +
>> +	switch (action) {
>> +	case SYS_RESTART:
>> +	case SYS_HALT:
>> +	case SYS_POWER_OFF:
>> +		break;
>> +	default:
>> +		return NOTIFY_DONE;
>> +	}
>> +
>> +	struct rmi_sro_state *sro __free(kfree) = kmalloc_obj(*sro);
>> +
>> +	if (!sro)
>> +		return -ENOMEM;
> 
> Nit: it needs a NOTIFY_* value.

Thanks, Yep, I have fixed it locally based on codex review ;-)
> 
>> +
>> +	ret = rmi_rmm_deactivate(sro);
>> +	if (ret)
>> +		pr_emerg("RMM Deactivation failed: %d\n", ret);
>> +
>> +	return NOTIFY_DONE;
>> +}
>> +
>> +static struct notifier_block rmi_reboot_nb = {
>> +	.notifier_call = rmi_reboot_notifier,
>> +};
> 
> Thinking some more about this, it's a good aim but I think it only works
> if we do a systemctl kexec that tears down the processes (including the
> VMMs). For a direct kexec -e, we happily reboot with pages still
> delegated. Now, such tear-down in the kernel is painful, I think a lot
> more work to figure out the delegated pages.

nit: kexec -e uses normal reboot path, it is only the kexec -f which
skips shutdown path. But yes, forced kexec won't work and that would
probably never work reliably with RMM in place.

> 
> Also we don't cancel the kexec here even if we return an error, just
> warn and continue into the new kernel.

Correct, and that could fail with delegated granules in place.

> 
> So maybe blocking the kexec (e.g. machine_kexec_prepare()) in the first
> place would be a better option for the time being. But I'd like, if

Ack

> possible, to defer the RMM activation until the first user (still do the
> RMI probing as an initcall). If we run on RME-capable hardware and
> firmware but don't care about realms or TSM, we still get the normal OS
> functionality.

Would you prefer this in the first drop of the RMM ? Or is this
something we could add as a separate series ?

> 
> If this deferring works, I'd also make memory hotplug dependent on this
> (RMM activated => no hotplug; hotplug before activation => don't
> activate the RMM). Maybe later, if we have a request for hotplug in
> ZONE_MOVABLE and we can guarantee guest_memfd doesn't allocate from
> there, we can relax this requirement.

Right now guest_memfd doesn't allocate from the ZONE_MOVABLE. But that 
might change in the future and we would need RMM to support it.
Not supported with RMM v2.0 spec.

> 
> That said, we may have a problem with hibernation as well if it tries to
> read the delegated pages. I don't know how it interacts with guest_memfd
> and the non-gmem pages we delegate. Maybe cpus_are_stuck_in_kernel() is
> the right place, it prevents hibernation as well.

Ack.


Cheers
Suzuki