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,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2E73DC07E99 for ; Thu, 8 Jul 2021 13:19:09 +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 B9CD361476 for ; Thu, 8 Jul 2021 13:19:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9CD361476 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Tvn-0004kM-O4 for qemu-devel@archiver.kernel.org; Thu, 08 Jul 2021 09:19:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1TlS-0005w8-0C for qemu-devel@nongnu.org; Thu, 08 Jul 2021 09:08:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1TlK-0008Rx-Ok for qemu-devel@nongnu.org; Thu, 08 Jul 2021 09:08:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625749697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wP92sXKXLxnQpVJ+LknyKWGNevAG+16AcK28kcEVYLY=; b=YiIx4WuyY8QUV46GDmJt35+JUw4Bkasc4dYlrLnEQ5Bkys/L97JTXA5pq+u4vhwmoougoH REvg0UGfQ6z07Gl9+yd7LJaYCoR33S/DQt7KgBIPlTlXZpHQGMNYkJCG69q6sdmKHuhAvp T/ZBB//IFc5N2nuO49SnqfDejQJvdvw= 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-594-FvXmY0PmMA63-7GnDpfqmg-1; Thu, 08 Jul 2021 09:08:16 -0400 X-MC-Unique: FvXmY0PmMA63-7GnDpfqmg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 62006A0CAB; Thu, 8 Jul 2021 13:08:15 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-104.ams2.redhat.com [10.36.112.104]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1CC1810074FC; Thu, 8 Jul 2021 13:08:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AB1C31132B52; Thu, 8 Jul 2021 15:08:13 +0200 (CEST) From: Markus Armbruster To: Daniel Henrique Barboza Subject: Re: [PATCH v4 2/3] spapr: use DEVICE_UNPLUG_ERROR to report unplug errors References: <20210707003314.37110-1-danielhb413@gmail.com> <20210707003314.37110-3-danielhb413@gmail.com> Date: Thu, 08 Jul 2021 15:08:13 +0200 In-Reply-To: <20210707003314.37110-3-danielhb413@gmail.com> (Daniel Henrique Barboza's message of "Tue, 6 Jul 2021 21:33:13 -0300") Message-ID: <87lf6h6jia.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.45, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: eblake@redhat.com, groug@kaod.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Daniel Henrique Barboza writes: > 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. > > 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. > > Reviewed-by: David Gibson > Signed-off-by: Daniel Henrique Barboza > --- > hw/ppc/spapr.c | 8 ++++++++ > hw/ppc/spapr_drc.c | 15 +++++++++------ > 2 files changed, 17 insertions(+), 6 deletions(-) > > 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(SpaprMachineState *spapr, DeviceState *dev) > */ > qapi_error = g_strdup_printf("Memory hotunplug rejected by the guest " > "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); Can dev->id be null here? Such devices exist, but maybe not here. If dev->id can be null, we pass null to qapi_event_send_device_unplug_error(), which is not okay. The output visitor papers over by replacing with "". Let's not rely on this misfeature. > } > > /* 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[] = "Device hotunplug rejected by the " > + "guest for device %s"; > + g_autofree char *qapi_error = NULL; > + > if (spapr_drc_type(drc) == SPAPR_DR_CONNECTOR_TYPE_LMB) { > spapr = SPAPR_MACHINE(qdev_get_machine()); > > @@ -167,13 +173,10 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc) > } > > drc->unplug_requested = false; > - error_report("Device hotunplug rejected by the guest " > - "for device %s", drc->dev->id); > + error_report(qapi_error_fmt, drc->dev->id); > > - /* > - * TODO: send a QAPI DEVICE_UNPLUG_ERROR event when > - * it is implemented. > - */ > + qapi_error = g_strdup_printf(qapi_error_fmt, drc->dev->id); > + qapi_event_send_device_unplug_error(drc->dev->id, qapi_error); > } > > return RTAS_OUT_SUCCESS; /* Nothing to do */ Likewise, only here we also pass it to g_strdup_printf() and possibly vprintf() via error_report(). Null arguments to %s crash on some systems. The issue predates your patch. I'm not sure reporting failed unplug with error_report() is a good idea, but it's not your patch's idea.