[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] spapr: Don't request to unplug the same core twice
From: |
David Gibson |
Subject: |
Re: [PATCH] spapr: Don't request to unplug the same core twice |
Date: |
Thu, 24 Oct 2019 09:38:17 +1100 |
User-agent: |
Mutt/1.12.1 (2019-06-15) |
On Wed, Oct 23, 2019 at 09:17:40PM +0200, Greg Kurz wrote:
> We must not call spapr_drc_detach() on a detached DRC otherwise bad things
> can happen, ie. QEMU hangs or crashes. This is easily demonstrated with
> a CPU hotplug/unplug loop using QMP.
>
> Signed-off-by: Greg Kurz <address@hidden>
Ouch, good catch. Applied.
I wonder if we have the same problem with other DRC types.
> ---
> hw/ppc/spapr.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index f9410d390a07..94f9d27096af 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3741,9 +3741,10 @@ void spapr_core_unplug_request(HotplugHandler
> *hotplug_dev, DeviceState *dev,
> spapr_vcpu_id(spapr, cc->core_id));
> g_assert(drc);
>
> - spapr_drc_detach(drc);
> -
> - spapr_hotplug_req_remove_by_index(drc);
> + if (!spapr_drc_unplug_requested(drc)) {
> + spapr_drc_detach(drc);
> + spapr_hotplug_req_remove_by_index(drc);
> + }
> }
>
> int spapr_core_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr,
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature