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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 4F6AAC433DB for ; Mon, 15 Feb 2021 12:29:40 +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 DE91964DAF for ; Mon, 15 Feb 2021 12:29:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE91964DAF 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]:45968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBd0V-0007t3-2m for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 07:29:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBcha-0004nN-Cy for qemu-devel@nongnu.org; Mon, 15 Feb 2021 07:10:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44588) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lBchY-0002lD-RJ for qemu-devel@nongnu.org; Mon, 15 Feb 2021 07:10:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613391003; 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=DAhTFM0GVLEkUMSwyhcaOCqPxs7MQVRV3CADkzqRqfM=; b=OJAjDZqy5FPttQl1BXzcbF7oOHZ+X+upBHw9Vbd8DKOHuDcPqxYp1+oIe3frwn8JDLEhVp dRnXwmXWoXZBH+lOMHD2f04ACov5/UAX42oLhIi7L05JwMuI9eW5HW0h7Q0k3TLj9IYq6P uwgvce2OVy1vV68U27grCcWSl8vEmP0= 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-310-oxKdgVSXNEeSKZJMd5OHsw-1; Mon, 15 Feb 2021 07:10:01 -0500 X-MC-Unique: oxKdgVSXNEeSKZJMd5OHsw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 927C5803F4F for ; Mon, 15 Feb 2021 12:10:00 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-100.ams2.redhat.com [10.36.114.100]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 655B75D9CA; Mon, 15 Feb 2021 12:10:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C0C56113865F; Mon, 15 Feb 2021 13:09:58 +0100 (CET) From: Markus Armbruster To: Kevin Wolf Subject: Re: [PATCH 2/2] monitor/qmp: Stop processing requests when shutdown is requested References: <20210212172028.288825-1-kwolf@redhat.com> <20210212172028.288825-3-kwolf@redhat.com> Date: Mon, 15 Feb 2021 13:09:58 +0100 In-Reply-To: <20210212172028.288825-3-kwolf@redhat.com> (Kevin Wolf's message of "Fri, 12 Feb 2021 18:20:28 +0100") Message-ID: <87blclzg4p.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Kevin Wolf writes: > monitor_qmp_dispatcher_co() used to check whether shutdown is requested "used to": until when? > only when it would have to wait for new requests. If there were still > some queued requests, it would try to execute all of them before > shutting down. > > This can be surprising when the queued QMP commands take long or hang > because Ctrl-C may not actually exit QEMU as soon as possible. > > Change monitor_qmp_dispatcher_co() so that it additionally checks > whether shutdown is request before it gets a new request from the queue. > > Signed-off-by: Kevin Wolf > --- > monitor/qmp.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/monitor/qmp.c b/monitor/qmp.c > index 43880fa623..2326bd7f9b 100644 > --- a/monitor/qmp.c > +++ b/monitor/qmp.c > @@ -227,6 +227,11 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) > */ > qatomic_mb_set(&qmp_dispatcher_co_busy, false); > > + /* On shutdown, don't take any more requests from the queue */ > + if (qmp_dispatcher_co_shutdown) { > + return; > + } > + > while (!(req_obj = monitor_qmp_requests_pop_any_with_lock())) { > /* > * No more requests to process. Wait to be reentered from