From patchwork Mon Mar 15 17:06:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 1453382 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uTy2lCD1; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DzjsD6PhQz9sRN for ; Tue, 16 Mar 2021 04:22:08 +1100 (AEDT) Received: from localhost ([::1]:60468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLqur-0005GM-CE for incoming@patchwork.ozlabs.org; Mon, 15 Mar 2021 13:22:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLqgP-0002Eo-2D for qemu-devel@nongnu.org; Mon, 15 Mar 2021 13:07:09 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:34884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLqgJ-00020b-1C for qemu-devel@nongnu.org; Mon, 15 Mar 2021 13:07:08 -0400 Received: by mail-ej1-x62c.google.com with SMTP id dx17so67560490ejb.2 for ; Mon, 15 Mar 2021 10:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pylLHJgAinjqlE5sLHdTsAWxspsO0C5etrtQxMg+F3E=; b=uTy2lCD1y9mRhCwJtNw7s0kLJI/rSe+JAm5x9WwxR4VkSbe3GBDcbZsg2NZJIN3K+C bqjj0hGKAPhm/BlLGl/3JhLwK3l+Ofs98Xu+RKXJaD3jaoN1tOuZ0U9wDzyU9NWsneJs dNmxks+voRWER1b5Y1Dsghct6Fq4OKgwk6bZOMnZdkSwgW3BUKneQItujAt4j1vm/TLU g3rDkxtFne0EJtbz1pbq03+qxizvVjnhAneUV4y2XBZyvRPn5ad+ClZsZSTl+QfV01zd 9kwqXCZnM8MCwk3L0QvYy0H57p0B977wZyDl11tWeyx0bF+ykCuf4T0aIrHrIAe2KDLz WqGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pylLHJgAinjqlE5sLHdTsAWxspsO0C5etrtQxMg+F3E=; b=mCXbvzuiGG7GkXwUb8Rbn/1qcw4V/PPOQ/lMVAYzMoRirWWk7FJvZqAD4ksxd0/6I1 L1EaMofjCEx5ivGdJ3qb2laaCTXHNnqCemdAM7Hca8VEh6En6zkrap8csCSxogtXXr/y RgTZNd9q5Nt4AICtPv4QFFzHWfYJ+ksakovUEBp3UByJqZ9/JF7cCqDTdKUHGzYx5dvz Pqhuonv/d2Dg4XgrZ8PQsQ2xgYPh8g6zor8E3ecR3jQ23UXTm0XrViPrds+mKyUJoKYM +3mAq1NuiP3q8eqzMYQiEPgDLwKmzk62fmd/xaio01ui9uTZnV31IUAiC+FHmqI+FXzH Y8AQ== X-Gm-Message-State: AOAM532CFnQYjj16A398ffJVqglyjq7wkhaK9SzHC2GgsitYmCewX6TO 2f4UqkERn54iC0m7K+xBPHo= X-Google-Smtp-Source: ABdhPJwgkM1Vnzd/k0rlBAaZI0bp4Lwee3QKoKzIuxTs/3R+UlVccBsOEv4gWEbGEXdMvAiAdBaHxw== X-Received: by 2002:a17:906:81d5:: with SMTP id e21mr24488633ejx.102.1615828019076; Mon, 15 Mar 2021 10:06:59 -0700 (PDT) Received: from lb01556.speedport.ip (p200300f1170e2e5189750ed020d14fdf.dip0.t-ipconnect.de. [2003:f1:170e:2e51:8975:ed0:20d1:4fdf]) by smtp.gmail.com with ESMTPSA id u15sm8728412eds.6.2021.03.15.10.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 10:06:58 -0700 (PDT) From: Li Zhang To: marcandre.lureau@redhat.com, lukasstraub2@web.de, armbru@redhat.com Subject: [PATCH 1/2] Fix the segment fault when calling yank_register_instance Date: Mon, 15 Mar 2021 18:06:35 +0100 Message-Id: <20210315170636.704201-1-zhlcindy@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=zhlcindy@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Li Zhang , pankaj.gupta@cloud.ionos.com, alexandr.iarygin@profitbricks.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Zhang When executing the QMP commands "chardev-change" to change the backend device to socket, it will cause a segment fault because it assumes chr->label as non-NULL in function yank_register_instance. The function qmp_chardev_change calls chardev_new, which label is NULL when creating a new chardev. The label will be passed to yank_register_instance which causes a segment fault. The callchain is as the following: chardev_new -> qemu_char_open -> cc->open -> qmp_chardev_open_socket -> yank_register_instance Signed-off-by: Li Zhang --- chardev/char-socket.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index c8bced76b7..26d5172682 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1421,10 +1421,12 @@ static void qmp_chardev_open_socket(Chardev *chr, qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS); } - if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) { - return; + if (chr->label) { + if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) { + return; + } + s->registered_yank = true; } - s->registered_yank = true; /* be isn't opened until we get a connection */ *be_opened = false; From patchwork Mon Mar 15 17:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 1453378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YaPNQZWh; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Dzjjj3Sw9z9s1l for ; Tue, 16 Mar 2021 04:15:37 +1100 (AEDT) Received: from localhost ([::1]:50286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLqoX-0000EC-Tq for incoming@patchwork.ozlabs.org; Mon, 15 Mar 2021 13:15:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLqgM-0002CI-8c for qemu-devel@nongnu.org; Mon, 15 Mar 2021 13:07:07 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:34889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLqgI-00021G-BV for qemu-devel@nongnu.org; Mon, 15 Mar 2021 13:07:05 -0400 Received: by mail-ej1-x631.google.com with SMTP id dx17so67560636ejb.2 for ; Mon, 15 Mar 2021 10:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tnziLdCBQtJ/628clFAL2ayBOtafozkqcw8DQQJiZPQ=; b=YaPNQZWhwS/B2GkT9OVwGirBo8iHRChKHfSRXs/SWugCPC2ojlOAQ05HyM91lvEkW+ gNkGA4e5/yYZVypj+r1UksHJgzEbt87fSpEHZgqbFt0tFWABj34Nz8ImIKk1zGuxlFwc /kbdvzy2s8N4ms3hMNwUjA4PljP67XnYKwggkq6CIiG/utd6tg4Hv91nOwUy/GCQz74K f/oUM5Ta8ywokVdwdBmDls9275WYN8VYGOyG+DvOskCOssfUDgqsucS+kLo1zFOkc9Io mgOLjbIXVCyGvyPv7mGqzObMTe9hqrWYfUzNApljrmwQiQecPJGckUpjMMTiQ3DDBwCc lShg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tnziLdCBQtJ/628clFAL2ayBOtafozkqcw8DQQJiZPQ=; b=m/A/nHFifIu+nIw4eL3/o5rXJ0chqwMIziBiR2UxPBghabJOgCkfxQO3X2yy8gDKV8 FUssIaj0d+uHOclEja//rrJG/vfTqjsOZiyvgS+FxWcJg2EZgsnqlANCnOiA3TAl1ZAB QHWchIj2e43OlWOuCatzDru5i+Yi7VQQNP6Zp5PLWle+MuwJq4bRgFswT+5PS1a7eQ0k qfVRTO3tEhgbo0a9WMjHa8d6U5FK06L9s74mKnBgtDp9n4yE6Xt3b9J21mooJTM8c255 EKnWzV1gnZEMBO+4ZH+3aBbmA+od3ZRSIQygVyDqsB45T+yaswOu+LAXn1qcH/128PuH cPmg== X-Gm-Message-State: AOAM532anuTC1UtqYk6EP4N2J9KBr15wEdbb8DiVCQ0YiQv12uykNAdA TYulv8RX1qqvx1V5ve0zgHI= X-Google-Smtp-Source: ABdhPJyDlCHHqSDOQVeVFokvsiEIPR5bDTYbXln/eBiqe6gowxzIIh0XKP3DzSM/mxi2HXAzrcBPdA== X-Received: by 2002:a17:906:fcc7:: with SMTP id qx7mr24835062ejb.486.1615828020101; Mon, 15 Mar 2021 10:07:00 -0700 (PDT) Received: from lb01556.speedport.ip (p200300f1170e2e5189750ed020d14fdf.dip0.t-ipconnect.de. [2003:f1:170e:2e51:8975:ed0:20d1:4fdf]) by smtp.gmail.com with ESMTPSA id u15sm8728412eds.6.2021.03.15.10.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 10:06:59 -0700 (PDT) From: Li Zhang To: marcandre.lureau@redhat.com, lukasstraub2@web.de, armbru@redhat.com Subject: [PATCH 2/2] Support monitor chardev hotswap with QMP Date: Mon, 15 Mar 2021 18:06:36 +0100 Message-Id: <20210315170636.704201-2-zhlcindy@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315170636.704201-1-zhlcindy@gmail.com> References: <20210315170636.704201-1-zhlcindy@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=zhlcindy@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Li Zhang , pankaj.gupta@cloud.ionos.com, alexandr.iarygin@profitbricks.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Zhang For some scenarios, it needs to hot-add a monitor device. But QEMU doesn't support hotplug yet. It also works by adding a monitor with null backend by default and then change its backend to socket by QMP command "chardev-change". So this patch is to support monitor chardev hotswap with QMP. Signed-off-by: Li Zhang Reviewed-by: Pankaj Gupta --- monitor/monitor-internal.h | 3 +++ monitor/monitor.c | 2 +- monitor/qmp.c | 42 +++++++++++++++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 40903d6386..2df6dd21de 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -186,4 +186,7 @@ int hmp_compare_cmd(const char *name, const char *list); void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data, Error **errp); +gboolean monitor_unblocked(GIOChannel *chan, GIOCondition cond, + void *opaque); + #endif diff --git a/monitor/monitor.c b/monitor/monitor.c index e94f532cf5..2d255bab18 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -157,7 +157,7 @@ static inline bool monitor_is_hmp_non_interactive(const Monitor *mon) static void monitor_flush_locked(Monitor *mon); -static gboolean monitor_unblocked(GIOChannel *chan, GIOCondition cond, +gboolean monitor_unblocked(GIOChannel *chan, GIOCondition cond, void *opaque) { Monitor *mon = opaque; diff --git a/monitor/qmp.c b/monitor/qmp.c index 2326bd7f9b..55cfb230d9 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -44,6 +44,7 @@ struct QMPRequest { Error *err; }; typedef struct QMPRequest QMPRequest; +static void monitor_qmp_set_handlers_bh(void *opaque); QmpCommandList qmp_commands, qmp_cap_negotiation_commands; @@ -480,7 +481,35 @@ void monitor_data_destroy_qmp(MonitorQMP *mon) g_queue_free(mon->qmp_requests); } -static void monitor_qmp_setup_handlers_bh(void *opaque) +static int monitor_qmp_change(void *opaque) +{ + MonitorQMP *mon = opaque; + + mon->common.use_io_thread = + qemu_chr_has_feature(mon->common.chr.chr, QEMU_CHAR_FEATURE_GCONTEXT); + + if (mon->common.use_io_thread) { + aio_bh_schedule_oneshot(iothread_get_aio_context(mon_iothread), + monitor_qmp_set_handlers_bh, mon); + } else { + qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, + monitor_qmp_read, monitor_qmp_event, + monitor_qmp_change, &mon->common, NULL, true); + } + + if (mon->common.out_watch) { + g_source_remove(mon->common.out_watch); + qemu_mutex_lock(&mon->common.mon_lock); + mon->common.out_watch = + qemu_chr_fe_add_watch(&mon->common.chr, G_IO_OUT | G_IO_HUP, + monitor_unblocked, &mon->common); + qemu_mutex_unlock(&mon->common.mon_lock); + } + + return 0; +} + +static void monitor_qmp_set_handlers_bh(void *opaque) { MonitorQMP *mon = opaque; GMainContext *context; @@ -490,7 +519,14 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) assert(context); qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &mon->common, context, true); + monitor_qmp_change, &mon->common, context, true); + +} + +static void monitor_qmp_setup_handlers_bh(void *opaque) +{ + MonitorQMP *mon = opaque; + monitor_qmp_set_handlers_bh(mon); monitor_list_append(&mon->common); } @@ -531,7 +567,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) } else { qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &mon->common, NULL, true); + monitor_qmp_change, &mon->common, NULL, true); monitor_list_append(&mon->common); } }