Re: [PATCH 1/2] mailbox: zynqmp-ipi: Fix CPU hotplug state cleanup
From: Srivatsa S. Bhat
Date: Wed Nov 18 2026 - 01:20:37 EST
On Wed, Nov 04, 2026 at 11:23:33AM +0530, Pandey, Radhey Shyam wrote:
> On 11/3/2026 11:50 AM, Prasanna Kumar T S M wrote:
> > On driver removal, the CPUHP_AP_ONLINE_DYN CPU hotplug state is removed
> > instead of the its actual state. This can leave the mailbox driver
> > callbacks dangling. Use the actual CPU hotplug state during driver
> > removal.
> >
> > Hotplug registration failures are also ignored, allowing probe to
> > succeed without the callbacks needed to enable interrupts on CPUs
> > brought online later.
> >
> > Fixes: 6ffb1635341be ("mailbox: zynqmp: handle SGI for shared IPI")
>
[...]
>
> > + xlnx_mbox_cpuhp_down);
> > + if (pdata->hp_state < 0) {
> > + irq_clear_status_flags(pdata->virq_sgi, IRQ_PER_CPU);
> > + free_percpu_irq(pdata->virq_sgi, &per_cpu_pdata);
> > + irq_dispose_mapping(pdata->virq_sgi);
> > + return pdata->hp_state;
>
> 1. The new error path double-frees and then hits BUG().
> Please reconfirm.
>
> zynqmp_ipi_probe() sets pdata->irq_type before calling xlnx_mbox_init_sgi(),
> and its only error label runs
> zynqmp_ipi_free_mboxes() → xlnx_mbox_cleanup_sgi() whenever irq_type ==
> IPI_IRQ_TYPE_SGI. So the new unwind runs, then the caller's unwind repeats
> irq_clear_status_flags(), free_percpu_irq() and irq_dispose_mapping().
Good catch!
> Before any of that, cleanup calls cpuhp_remove_state(pdata->hp_state) with
> the negative errno still in the field, and _cpuhp_remove_state_cpuslocked()
> opens with BUG_ON(cpuhp_cb_check(state)), which rejects anything <=
> CPUHP_OFFLINE. A failed hotplug registration now panics instead of failing
> probe.
>
So, xlnx_mbox_init_sgi() should simply return an error upon CPU
hotplug registration failure and let the caller handle the cleanup;
and in xlnx_mbox_cleanup_sgi(), a check for pdata->hp_state > 0 should
be added like this:
if (pdata->hp_state > 0)
cpuhp_remove_state(pdata->hp_state);
I think that ought to fix both the issues pointed out above.
>
> > + }
> > return ret;
> > }
> > static void xlnx_mbox_cleanup_sgi(struct zynqmp_ipi_pdata *pdata)
> > {
> > - cpuhp_remove_state(CPUHP_AP_ONLINE_DYN);
> > + cpuhp_remove_state(pdata->hp_state);
> > on_each_cpu(xlnx_disable_percpu_irq, NULL, 1);
>
Regards,
Srivatsa