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.6 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 55AF9C4338F for ; Sat, 7 Aug 2021 14:07: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 9030760EE4 for ; Sat, 7 Aug 2021 14:07:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9030760EE4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCMzQ-0004tw-C0 for qemu-devel@archiver.kernel.org; Sat, 07 Aug 2021 10:07:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCMyT-0004Dn-JC for qemu-devel@nongnu.org; Sat, 07 Aug 2021 10:06:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCMyQ-0003M0-2e for qemu-devel@nongnu.org; Sat, 07 Aug 2021 10:06:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628345208; 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=NEyy3JPGY2YEtzqUUMy7SgD5o+fkBYb8Yr6Oeo+p40E=; b=fmzEcgA+GCNhkYI/Mby7bLmrvC/3toOj9sGMRPOQ3/kyjdIjhMDnvcWhdwDgg7H/TL7QfU +bAYGMiofor7oKMdWVb///2W+sY5BfQLYXVdJnG8iqLlc39sW2sGtlhVl0omwofhmagH6Y f94fCpxO2Gi94PQoGdP9PERbTgoCOLk= 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-573-H6iFMsK1PkmQhUQqjSA6eg-1; Sat, 07 Aug 2021 10:06:47 -0400 X-MC-Unique: H6iFMsK1PkmQhUQqjSA6eg-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 66924875047; Sat, 7 Aug 2021 14:06:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-12.ams2.redhat.com [10.36.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8E7A1017CE5; Sat, 7 Aug 2021 14:06:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6472E11380A0; Sat, 7 Aug 2021 16:06:43 +0200 (CEST) From: Markus Armbruster To: Daniel Henrique Barboza Subject: Re: [PATCH for-6.2 v6 6/7] spapr: use DEVICE_UNPLUG_ERROR to report unplug errors References: <20210719200827.1507276-1-danielhb413@gmail.com> <20210719200827.1507276-7-danielhb413@gmail.com> Date: Sat, 07 Aug 2021 16:06:43 +0200 In-Reply-To: <20210719200827.1507276-7-danielhb413@gmail.com> (Daniel Henrique Barboza's message of "Mon, 19 Jul 2021 17:08:26 -0300") Message-ID: <87a6ltbb7w.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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, 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_H2=-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: 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: Greg Kurz > Signed-off-by: Daniel Henrique Barboza > --- > hw/ppc/spapr.c | 9 ++++++++- > hw/ppc/spapr_drc.c | 18 ++++++++++++------ > 2 files changed, 20 insertions(+), 7 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1611d7ab05..5459f9a7e9 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" > @@ -3686,13 +3687,19 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev) > > /* > * Tell QAPI that something happened and the memory > - * hotunplug wasn't successful. > + * hotunplug wasn't successful. Keep sending > + * MEM_UNPLUG_ERROR even while sending DEVICE_UNPLUG_ERROR > + * until the deprecation MEM_UNPLUG_ERROR is due. > */ > if (dev->id) { > qapi_error = g_strdup_printf("Memory hotunplug rejected by the guest " > "for device %s", dev->id); > qapi_event_send_mem_unplug_error(dev->id, qapi_error); > } > + > + qapi_event_send_device_unplug_error(!!dev->id, dev->id, > + dev->canonical_path, > + qapi_error != NULL, qapi_error); > } > When dev->id is null, we send something like {"event": "DEVICE_UNPLUG_ERROR", "data": {"path": "/machine/..."}, "timestamp": ...} Unless I'm missing something, this is all the information the management application really needs. When dev->id is non-null, we add to "data": "device": "dev123", "msg": "Memory hotunplug rejected by the guest for device dev123", I'm fine with emitting the device ID when we have it. What's the intended use of "msg"? Could DEVICE_UNPLUG_ERROR ever be emitted for this device with a different "msg"? If "msg" is useful when dev->id is non-null, then it's likely useful when dev->id is null. Why not "msg": "Memory hotunplug rejected by the guest", always? If we do that here, we'll likely do it everywhere, and then member @msg isn't actually optional. > /* Callback to be called during DRC release. */ > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c > index a4d9496f76..8f0479631f 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,11 @@ 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[] = \ Drop the superfluous \ > +"Device hotunplug rejected by the guest for device %s"; Unusual indentation. > + > + g_autofree char *qapi_error = NULL; > + > if (spapr_drc_type(drc) == SPAPR_DR_CONNECTOR_TYPE_LMB) { > spapr = SPAPR_MACHINE(qdev_get_machine()); > > @@ -169,14 +176,13 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc) > drc->unplug_requested = false; > > if (drc->dev->id) { > - error_report("Device hotunplug rejected by the guest " > - "for device %s", drc->dev->id); > + qapi_error = g_strdup_printf(qapi_error_fmt, drc->dev->id); > + error_report(qapi_error_fmt, drc->dev->id); Simpler: qapi_error = ... error_report("%s", qapi_error); Matter of taste. Maintainer decides. > } > > - /* > - * TODO: send a QAPI DEVICE_UNPLUG_ERROR event when > - * it is implemented. > - */ > + qapi_event_send_device_unplug_error(!!drc->dev->id, drc->dev->id, > + drc->dev->canonical_path, > + qapi_error != NULL, qapi_error); My questions on "msg" apply. > } > > return RTAS_OUT_SUCCESS; /* Nothing to do */