From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F109C07E95 for ; Wed, 7 Jul 2021 09:29:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5F0D61C6C for ; Wed, 7 Jul 2021 09:29:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C5F0D61C6C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m13sO-000471-UY for qemu-devel@archiver.kernel.org; Wed, 07 Jul 2021 05:29:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m13r1-0002RA-4Y for qemu-devel@nongnu.org; Wed, 07 Jul 2021 05:28:27 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:40593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m13qz-0002wy-KA for qemu-devel@nongnu.org; Wed, 07 Jul 2021 05:28:26 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-PySvKolqMOe9cZaqtkVJhQ-1; Wed, 07 Jul 2021 05:28:21 -0400 X-MC-Unique: PySvKolqMOe9cZaqtkVJhQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1DE76100D11F; Wed, 7 Jul 2021 09:28:20 +0000 (UTC) Received: from bahia.lan (ovpn-113-94.ams2.redhat.com [10.36.113.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id C00ED60843; Wed, 7 Jul 2021 09:28:18 +0000 (UTC) Date: Wed, 7 Jul 2021 11:28:17 +0200 From: Greg Kurz To: Daniel Henrique Barboza Subject: Re: [PATCH v4 2/3] spapr: use DEVICE_UNPLUG_ERROR to report unplug errors Message-ID: <20210707112817.6efffe0e@bahia.lan> In-Reply-To: <20210707003314.37110-3-danielhb413@gmail.com> References: <20210707003314.37110-1-danielhb413@gmail.com> <20210707003314.37110-3-danielhb413@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: armbru@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, eblake@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 6 Jul 2021 21:33:13 -0300 Daniel Henrique Barboza wrote: > Linux Kernel 5.12 is now unisolating CPU DRCs in the device_removal > error path, signalling that the hotunplug process wasn't successful. > This allow us to send a DEVICE_UNPLUG_ERROR in drc_unisolate_logical() > to signal this error to the management layer. >=20 > We also have another error path in spapr_memory_unplug_rollback() for > configured LMB DRCs. Kernels older than 5.13 will not unisolate the LMBs > in the hotunplug error path, but it will reconfigure them. Let's send > the DEVICE_UNPLUG_ERROR event in that code path as well to cover the > case of older kernels. >=20 > Reviewed-by: David Gibson > Signed-off-by: Daniel Henrique Barboza > --- Reviewed-by: Greg Kurz > hw/ppc/spapr.c | 8 ++++++++ > hw/ppc/spapr_drc.c | 15 +++++++++------ > 2 files changed, 17 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4dd90b75cc..fc071a1767 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -29,6 +29,7 @@ > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "qapi/qapi-events-machine.h" > +#include "qapi/qapi-events-qdev.h" > #include "qapi/visitor.h" > #include "sysemu/sysemu.h" > #include "sysemu/hostmem.h" > @@ -3641,7 +3642,14 @@ void spapr_memory_unplug_rollback(SpaprMachineStat= e *spapr, DeviceState *dev) > */ > qapi_error =3D g_strdup_printf("Memory hotunplug rejected by the gue= st " > "for device %s", dev->id); > + > + /* > + * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_ERROR > + * while the deprecation of MEM_UNPLUG_ERROR is > + * pending. > + */ > qapi_event_send_mem_unplug_error(dev->id, qapi_error); > + qapi_event_send_device_unplug_error(dev->id, qapi_error); > } > =20 > /* Callback to be called during DRC release. */ > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c > index a2f2634601..45a7b1aa16 100644 > --- a/hw/ppc/spapr_drc.c > +++ b/hw/ppc/spapr_drc.c > @@ -17,6 +17,8 @@ > #include "hw/ppc/spapr_drc.h" > #include "qom/object.h" > #include "migration/vmstate.h" > +#include "qapi/error.h" > +#include "qapi/qapi-events-qdev.h" > #include "qapi/visitor.h" > #include "qemu/error-report.h" > #include "hw/ppc/spapr.h" /* for RTAS return codes */ > @@ -160,6 +162,10 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc) > * means that the kernel is refusing the removal. > */ > if (drc->unplug_requested && drc->dev) { > + const char qapi_error_fmt[] =3D "Device hotunplug rejected b= y the " > + "guest for device %s"; > + g_autofree char *qapi_error =3D NULL; > + > if (spapr_drc_type(drc) =3D=3D SPAPR_DR_CONNECTOR_TYPE_LMB) = { > spapr =3D SPAPR_MACHINE(qdev_get_machine()); > =20 > @@ -167,13 +173,10 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc= ) > } > =20 > drc->unplug_requested =3D false; > - error_report("Device hotunplug rejected by the guest " > - "for device %s", drc->dev->id); > + error_report(qapi_error_fmt, drc->dev->id); > =20 > - /* > - * TODO: send a QAPI DEVICE_UNPLUG_ERROR event when > - * it is implemented. > - */ > + qapi_error =3D g_strdup_printf(qapi_error_fmt, drc->dev->id)= ; > + qapi_event_send_device_unplug_error(drc->dev->id, qapi_error= ); > } > =20 > return RTAS_OUT_SUCCESS; /* Nothing to do */