From nobody Fri May 17 19:17:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612196666; cv=none; d=zohomail.com; s=zohoarc; b=fmtP5FfytaHr6eFX5MkB61nl4RW56PDYIU+mlx8a0bgqJB1YWOlUZZx7HVQZ/6MQwC7tCzW0YdKape3B1gqTgcr4b5loF4HnpRcdokIjCK8SD1En0fr3pcSzN/ZKJ1tYPf011fbWqkEu/rUhbmRJb1A2YrhoTpIzFZG8ad2wMVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612196666; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ytDjdpmBImCbd01djVUeTFcpVxJ73yZSgduuGPqSE9o=; b=aYybLM/cZdyYLSLtqRBdV89uPGPlhWqD4EHY7BXxvYnvcU4R1vKA9CCAP85K9kGe1rr/AtSHhOV30wIgbjJVxfushscMYaYbIxTsV6yDqOvlnOEN3rKvhKEK/Gh3S1XEW/Sx/cqSKAgGcciWojmplqtN9BoT+v6o2Su4VI00nvI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612196666333481.30476524438177; Mon, 1 Feb 2021 08:24:26 -0800 (PST) Received: from localhost ([::1]:35260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6c01-0001UU-9D for importer@patchew.org; Mon, 01 Feb 2021 11:24:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6brR-0003iv-Kh for qemu-devel@nongnu.org; Mon, 01 Feb 2021 11:15:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6br7-0003Mr-V1 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 11:15:25 -0500 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-406-86GmM3ivNqiaF8FdYCVULw-1; Mon, 01 Feb 2021 11:15:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C4508030A7 for ; Mon, 1 Feb 2021 16:15:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-51.ams2.redhat.com [10.36.115.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBE7F5D756; Mon, 1 Feb 2021 16:15:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 433EC113861E; Mon, 1 Feb 2021 17:15:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612196111; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ytDjdpmBImCbd01djVUeTFcpVxJ73yZSgduuGPqSE9o=; b=MyH04B7y8xV7ljaKlf/Tt7Aky0xzkVW3i7RiH00lGNsnuB+mUxd1yWhjE5Q/bODiejue9Z ISM9SYV8JV5d12mUiMDtj7nsasMYEZjL5suhvcUZ1odAj8TPz2OqfPUHVX6HhMkNWtYg9j 4y5rfxppwOdh1enLugirIpT/VoXdsM0= X-MC-Unique: 86GmM3ivNqiaF8FdYCVULw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/3] qmp: Fix up comments after commit 9ce44e2ce2 Date: Mon, 1 Feb 2021 17:15:02 +0100 Message-Id: <20210201161504.1976989-2-armbru@redhat.com> In-Reply-To: <20210201161504.1976989-1-armbru@redhat.com> References: <20210201161504.1976989-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, 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: kwolf@redhat.com, jsnow@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit 9ce44e2ce2 "qmp: Move dispatcher to a coroutine" replaced monitor_qmp_bh_dispatcher() by monitor_qmp_dispatcher_co(), but neglected to update comments. Do that now. Signed-off-by: Markus Armbruster --- monitor/qmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index 8f91af32be..f6a1e7783b 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -79,7 +79,7 @@ static void monitor_qmp_cleanup_queue_and_resume(MonitorQ= MP *mon) qemu_mutex_lock(&mon->qmp_queue_lock); =20 /* - * Same condition as in monitor_qmp_bh_dispatcher(), but before + * Same condition as in monitor_qmp_dispatcher_co(), but before * removing an element from the queue (hence no `- 1`). * Also, the queue should not be empty either, otherwise the * monitor hasn't been suspended yet (or was already resumed). @@ -349,7 +349,7 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) =20 /* * Suspend the monitor when we can't queue more requests after - * this one. Dequeuing in monitor_qmp_bh_dispatcher() or + * this one. Dequeuing in monitor_qmp_dispatcher_co() or * monitor_qmp_cleanup_queue_and_resume() will resume it. * Note that when OOB is disabled, we queue at most one command, * for backward compatibility. --=20 2.26.2 From nobody Fri May 17 19:17:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612196305; cv=none; d=zohomail.com; s=zohoarc; b=JYWWaa8QSnYNcx/Yab8kZVlx8sVTkdBJFZGMFU06keHgLZ0ISCjdjXIsrMK1bES6yiyoWH661h0onKvBSN+GGEdwkCgVWEvOsGMu77WqL/ZGGT0GCkfTVkdvGj5Um8OUiKjefHDlmHuZDpfQGz1/DcAuwVrOR27G3bH/YIZrvRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612196305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XVmegMPuhoq8IGCeJ0ybKSEiiWt/X1+46J/ZKUF93wc=; b=Lyu4z9NZYrJp9K3NWvZj8j2xIFZ3UNAs4mbReCoLp/NSA8ALoAa370TxztdpOv7Tb7CScEr2AuQTP5vcHWewoMwF93xw7Z4ditoADh5Nii6BtPpJsDT3Thadf/zasV2Cvm0Kpkf5a/2evlhHOktiAHthcpUxCh47YY5xrh/Ac/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612196305824799.3255168706648; Mon, 1 Feb 2021 08:18:25 -0800 (PST) Received: from localhost ([::1]:52588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6buC-00050V-FE for importer@patchew.org; Mon, 01 Feb 2021 11:18:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6brV-0003jJ-EG for qemu-devel@nongnu.org; Mon, 01 Feb 2021 11:15:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6brC-0003My-K8 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 11:15:32 -0500 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-426-SyL4ICNTOpmJanfOiQx-dQ-1; Mon, 01 Feb 2021 11:15:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C644195D567 for ; Mon, 1 Feb 2021 16:15:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-51.ams2.redhat.com [10.36.115.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC1C462460; Mon, 1 Feb 2021 16:15:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 461A31138461; Mon, 1 Feb 2021 17:15:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612196111; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XVmegMPuhoq8IGCeJ0ybKSEiiWt/X1+46J/ZKUF93wc=; b=P869HlNPm6+KnMz8QL89nyP9P6BdKEpgHWwGoSrzhmH6gCOHgJ8PqutS7Pg141OqsKKsyw DjPAukf0Lzt00uSMu9jc3ClNZnqCO2QBE52jNVFfckcssxvL7+5eslDG3AZaTwmMOfukDo if6mm/Jn+KAZ7BNd7LCSz/SHs6SmIdc= X-MC-Unique: SyL4ICNTOpmJanfOiQx-dQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/3] qmp: Add more tracepoints Date: Mon, 1 Feb 2021 17:15:03 +0100 Message-Id: <20210201161504.1976989-3-armbru@redhat.com> In-Reply-To: <20210201161504.1976989-1-armbru@redhat.com> References: <20210201161504.1976989-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, 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=unavailable 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: kwolf@redhat.com, jsnow@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add tracepoints for in-band request enqueue and dequeue, processing of queued in-band errors, and responses. Signed-off-by: Markus Armbruster --- monitor/qmp.c | 7 +++++++ monitor/trace-events | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/monitor/qmp.c b/monitor/qmp.c index f6a1e7783b..e37b047c8a 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -113,6 +113,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rs= p) =20 json =3D qobject_to_json_pretty(data, mon->pretty); assert(json !=3D NULL); + trace_monitor_qmp_respond(mon, json->str); =20 g_string_append_c(json, '\n'); monitor_puts(&mon->common, json->str); @@ -251,6 +252,9 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) } } =20 + trace_monitor_qmp_in_band_dequeue(req_obj, + req_obj->mon->qmp_requests->leng= th); + if (qatomic_xchg(&qmp_dispatcher_co_busy, true) =3D=3D true) { /* * Someone rescheduled us (probably because a new requests @@ -287,6 +291,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) monitor_qmp_dispatch(mon, req_obj->req); } else { assert(req_obj->err); + trace_monitor_qmp_err_in_band(error_get_pretty(req_obj->err)); rsp =3D qmp_error_response(req_obj->err); req_obj->err =3D NULL; monitor_qmp_respond(mon, rsp); @@ -364,6 +369,8 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) * handled in time order. Ownership for req_obj, req, * etc. will be delivered to the handler side. */ + trace_monitor_qmp_in_band_enqueue(req_obj, mon, + mon->qmp_requests->length); assert(mon->qmp_requests->length < QMP_REQ_QUEUE_LEN_MAX); g_queue_push_tail(mon->qmp_requests, req_obj); qemu_mutex_unlock(&mon->qmp_queue_lock); diff --git a/monitor/trace-events b/monitor/trace-events index 0365ac4d99..348dcfca9b 100644 --- a/monitor/trace-events +++ b/monitor/trace-events @@ -10,6 +10,10 @@ monitor_protocol_event_queue(uint32_t event, void *qdict= , uint64_t rate) "event=3D monitor_suspend(void *ptr, int cnt) "mon %p: %d" =20 # qmp.c +monitor_qmp_in_band_enqueue(void *req, void *mon, unsigned len) "%p mon %p= len %u" +monitor_qmp_in_band_dequeue(void *req, unsigned len) "%p len %u" monitor_qmp_cmd_in_band(const char *id) "%s" +monitor_qmp_err_in_band(const char *desc) "%s" monitor_qmp_cmd_out_of_band(const char *id) "%s" +monitor_qmp_respond(void *mon, const char *json) "mon %p resp: %s" handle_qmp_command(void *mon, const char *req) "mon %p req: %s" --=20 2.26.2 From nobody Fri May 17 19:17:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612196486; cv=none; d=zohomail.com; s=zohoarc; b=gNqFnQwsQYO9CuHNhkjWkZWke8TTJSo636DGto/1OiE70j9/J3VB818BxA4e9y9YsLYttc22m8hIBK1EqctUlkIoq2z6rRssK8RbSW1TOadSt0m8CNSYz12F0Q6DdzgW8zwav5HRFPQaAopNbj1cdmmYdthbQ6ryCvRcyFgokps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612196486; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ww5CzWnh3SoioG5+dSXSHtjkLezq2WsdXm/RYk/7yZs=; b=ISiyowD6dLm5ex49qA5LWp9SirM8LKVe0npcRSzhdA2sCXfcKJiTlPDVHLxbwqZhAv+yuRfmQ/szOlR5t203wjNqKiEJZ22dePMfXd8TukqH/Q0ib0FsXmCmakzMXQSebEy4/8+WutVxl7Ixrk/aajISGicFIa5vivc8C03Iz+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612196486157478.5004167242772; Mon, 1 Feb 2021 08:21:26 -0800 (PST) Received: from localhost ([::1]:56900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6bx7-0006xn-0U for importer@patchew.org; Mon, 01 Feb 2021 11:21:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6brJ-0003ge-7j for qemu-devel@nongnu.org; Mon, 01 Feb 2021 11:15:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6br9-0003N6-NX for qemu-devel@nongnu.org; Mon, 01 Feb 2021 11:15:23 -0500 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-462-KDt0KrDXPhys1dD_r4Q4Mg-1; Mon, 01 Feb 2021 11:15:10 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 486618030AA for ; Mon, 1 Feb 2021 16:15:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-51.ams2.redhat.com [10.36.115.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBC352C154; Mon, 1 Feb 2021 16:15:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4976A1138468; Mon, 1 Feb 2021 17:15:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612196112; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ww5CzWnh3SoioG5+dSXSHtjkLezq2WsdXm/RYk/7yZs=; b=TRSIklVK711vFd6VxvMovOzDL2dgMLKadYgvEGa6B5yR3Hsp18bGQV4hrPwFJQoJrFPQQB c09rHekFn51t5kksborPUDqioOf/5x1oH84qZpY4Tr2YXfxJyHLA44AgAeatcvpvmmz4HQ 0x42wYZdsvjCPt/k/bPzpjZ44pb50hw= X-MC-Unique: KDt0KrDXPhys1dD_r4Q4Mg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/3] qmp: Resume OOB-enabled monitor before processing the request Date: Mon, 1 Feb 2021 17:15:04 +0100 Message-Id: <20210201161504.1976989-4-armbru@redhat.com> In-Reply-To: <20210201161504.1976989-1-armbru@redhat.com> References: <20210201161504.1976989-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, 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: kwolf@redhat.com, jsnow@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" monitor_qmp_dispatcher_co() needs to resume the monitor if handle_qmp_command() suspended it. Two cases: 1. OOB enabled: suspended if mon->qmp_requests has no more space 2. OOB disabled: suspended always We resume only after we processed the request. Which can take a long time. Resume the monitor right when the queue has space to keep the monitor available for out-of-band commands even in this corner case. Leave the "OOB disabled" case alone. Signed-off-by: Markus Armbruster Reviewed-by: Kevin Wolf --- monitor/qmp.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index e37b047c8a..d164b9f744 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -214,7 +214,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) { QMPRequest *req_obj =3D NULL; QDict *rsp; - bool need_resume; + bool oob_enabled; MonitorQMP *mon; =20 while (true) { @@ -273,11 +273,32 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *dat= a) aio_co_schedule(qemu_get_aio_context(), qmp_dispatcher_co); qemu_coroutine_yield(); =20 + /* + * @req_obj has a request, we hold req_obj->mon->qmp_queue_lock + */ + mon =3D req_obj->mon; - /* qmp_oob_enabled() might change after "qmp_capabilities" */ - need_resume =3D !qmp_oob_enabled(mon) || - mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1; + + /* + * We need to resume the monitor if handle_qmp_command() + * suspended it. Two cases: + * 1. OOB enabled: mon->qmp_requests has no more space + * Resume right away, so that OOB commands can get executed whi= le + * this request is being processed. + * 2. OOB disabled: always + * Resume only after we're done processing the request,=20 + * We need to save qmp_oob_enabled() for later, because + * qmp_qmp_capabilities() can change it. + */ + oob_enabled =3D qmp_oob_enabled(mon); + if (oob_enabled + && mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1)= { + monitor_resume(&mon->common); + } + qemu_mutex_unlock(&mon->qmp_queue_lock); + + /* Process request */ if (req_obj->req) { if (trace_event_get_state(TRACE_MONITOR_QMP_CMD_IN_BAND)) { QDict *qdict =3D qobject_to(QDict, req_obj->req); @@ -298,10 +319,10 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *dat= a) qobject_unref(rsp); } =20 - if (need_resume) { - /* Pairs with the monitor_suspend() in handle_qmp_command() */ + if (!oob_enabled) { monitor_resume(&mon->common); } + qmp_request_free(req_obj); =20 /* --=20 2.26.2