powerpc/rtas: retry when cpu offline races with suspend/migration
The protocol for suspending or migrating an LPAR requires all present processor threads to enter H_JOIN. So if we have threads offline, we have to temporarily bring them up. This can race with administrator actions such as SMT state changes. As ofdfd718a2ed
("powerpc/rtas: Fix a potential race between CPU-Offline & Migration"), rtas_ibm_suspend_me() accounts for this, but errors out with -EBUSY for what almost certainly is a transient condition in any reasonable scenario. Callers of rtas_ibm_suspend_me() already retry when -EAGAIN is returned, and it is typical during a migration for that to happen repeatedly for several minutes polling the H_VASI_STATE hcall result before proceeding to the next stage. So return -EAGAIN instead of -EBUSY when this race is encountered. Additionally: logging this event is still appropriate but use pr_info instead of pr_err; and remove use of unlikely() while here as this is not a hot path at all. Fixes:dfd718a2ed
("powerpc/rtas: Fix a potential race between CPU-Offline & Migration") Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Родитель
ba45cff610
Коммит
9fb603050f
|
@ -984,10 +984,9 @@ int rtas_ibm_suspend_me(u64 handle)
|
||||||
cpu_hotplug_disable();
|
cpu_hotplug_disable();
|
||||||
|
|
||||||
/* Check if we raced with a CPU-Offline Operation */
|
/* Check if we raced with a CPU-Offline Operation */
|
||||||
if (unlikely(!cpumask_equal(cpu_present_mask, cpu_online_mask))) {
|
if (!cpumask_equal(cpu_present_mask, cpu_online_mask)) {
|
||||||
pr_err("%s: Raced against a concurrent CPU-Offline\n",
|
pr_info("%s: Raced against a concurrent CPU-Offline\n", __func__);
|
||||||
__func__);
|
atomic_set(&data.error, -EAGAIN);
|
||||||
atomic_set(&data.error, -EBUSY);
|
|
||||||
goto out_hotplug_enable;
|
goto out_hotplug_enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче