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 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F880C43327 for ; Thu, 2 Jul 2026 16:07:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfJvY-0002fo-Fv; Thu, 02 Jul 2026 12:06:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfJv0-0001t6-Sf for qemu-devel@nongnu.org; Thu, 02 Jul 2026 12:05:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfJuy-00077c-Oc for qemu-devel@nongnu.org; Thu, 02 Jul 2026 12:05:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783008335; 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=MTxzVwjUkhKVffJJ9RINTUjz9v8uRwRyzo7/vJqp2Uk=; b=erndkYrkmPEKyN8qeLbhoU9GEO/jWBDhhZtpAWuOPQCMuQyHIWmscZyfsy8lOsRtz0dqZa EYNgGOYgnrHtBInVm7wWWqN0liItZvG6h9eOH9gb58dtPZdXVb9gt++Wyt4M1fl/ro/lZb dINunFoGAHeE6dm39h7DIHFhSAin4AA= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612--J6CMP_4P1e8AABWZRKwzw-1; Thu, 02 Jul 2026 12:05:32 -0400 X-MC-Unique: -J6CMP_4P1e8AABWZRKwzw-1 X-Mimecast-MFC-AGG-ID: -J6CMP_4P1e8AABWZRKwzw_1783008331 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA98A19792F4; Thu, 2 Jul 2026 16:05:30 +0000 (UTC) Received: from berrange.com (unknown [10.44.33.186]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6F24C1945110; Thu, 2 Jul 2026 16:05:27 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Brauner , devel@lists.libvirt.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Krempa Subject: [PATCH v6 25/34] monitor: protect qemu_chr_fe_accept_input with monitor lock Date: Thu, 2 Jul 2026 17:03:28 +0100 Message-ID: <20260702160337.1910921-26-berrange@redhat.com> In-Reply-To: <20260702160337.1910921-1-berrange@redhat.com> References: <20260702160337.1910921-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Christian Brauner The monitor_accept_input API is called from a bottom half, and will invoke qemu_chr_fe_accept_input(). When a following patch introduces the ability to delete monitors, it will be neccesary to delete the bottom half. Protecting the call to qemu_chr_fe_accept_input with the monitor lock will allow for synchronization with the deletion process. Signed-off-by: Christian Brauner (Amutable) [DB: extracted from a larger commit and refactored to apply to the new monitor class structure] Reviewed-by: Marc-André Lureau Tested-by: Peter Krempa Signed-off-by: Daniel P. Berrangé --- monitor/hmp.c | 2 ++ monitor/monitor.c | 6 +----- monitor/qmp.c | 9 +++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index d0d298c5d3..375f65eff4 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -116,9 +116,11 @@ static void monitor_hmp_accept_input(Monitor *mon) MonitorHMP *hmp = MONITOR_HMP(mon); assert(hmp->rs); readline_restart(hmp->rs); + qemu_chr_fe_accept_input(&mon->chr); qemu_mutex_unlock(&mon->mon_lock); readline_show_prompt(hmp->rs); } else { + qemu_chr_fe_accept_input(&mon->chr); qemu_mutex_unlock(&mon->mon_lock); } } diff --git a/monitor/monitor.c b/monitor/monitor.c index de1f761041..4a45c15a36 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -562,11 +562,7 @@ static void monitor_accept_input(void *opaque) Monitor *mon = opaque; MonitorClass *cls = MONITOR_GET_CLASS(mon); - if (cls->accept_input) { - cls->accept_input(mon); - } - - qemu_chr_fe_accept_input(&mon->chr); + cls->accept_input(mon); } void monitor_resume(Monitor *mon) diff --git a/monitor/qmp.c b/monitor/qmp.c index 1c67f40e4a..dc15809145 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -107,6 +107,7 @@ static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *qdict); static bool monitor_qmp_requires_iothread(const Monitor *mon); static void monitor_qmp_complete(UserCreatable *uc, Error **errp); static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp); +static void monitor_qmp_accept_input(Monitor *mon); static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { @@ -119,6 +120,7 @@ static void monitor_qmp_class_init(ObjectClass *cls, const void *data) moncls->emit_event = monitor_qmp_emit_event; moncls->requires_iothread = monitor_qmp_requires_iothread; + moncls->accept_input = monitor_qmp_accept_input; ucc->complete = monitor_qmp_complete; ucc->prepare_delete = monitor_qmp_prepare_delete; @@ -665,3 +667,10 @@ static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp) error_setg(errp, "Deleting QMP monitors is not supported"); return false; } + +static void monitor_qmp_accept_input(Monitor *mon) +{ + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + qemu_chr_fe_accept_input(&mon->chr); + } +} -- 2.54.0