From nobody Fri May 10 07:43:35 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=1602362885; cv=none; d=zohomail.com; s=zohoarc; b=VD5QtFS2BJ54MQZiP4Hq/J/zsRpQJT0JrH53dD9gaq1/wvLBU9sZ0tmpuDrWpb26LSPwQhBuN0fN4NOuHQXVX6e3R6NwqGa2afpceaN6wSO/v3lz6kHZuQng7BQXDpuJummpVKr08puBgqEPmtv12MYDkFy102yzHSxiFt0RugI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362885; 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=jfyUSzLpMg0aVhpMIGqjnBnWhwQ55mwb9u9gWmSSZ1k=; b=Aj6j3zYrF9D7ko7hAhawLk4SDwdjeK7w8bIO9+nbD9vtbvuOr2A3X0dCbN6D3ZwwGxKx7wNN1qSsGEbMdhzhubfGvUeCVBldzrgf/KaLEP6DwfwmTsgfB0BCglM+IIvD5gqLoS4/Uw6eIgKK855vAFEIqVZ9jBlyfQxXNkNXpcQ= 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 1602362885836397.2290652821815; Sat, 10 Oct 2020 13:48:05 -0700 (PDT) Received: from localhost ([::1]:41850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRLme-000472-9e for importer@patchew.org; Sat, 10 Oct 2020 16:48:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRLgQ-00072q-4g for qemu-devel@nongnu.org; Sat, 10 Oct 2020 16:41:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRLgO-00075Y-Lf for qemu-devel@nongnu.org; Sat, 10 Oct 2020 16:41:37 -0400 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-544-dThHvkfUM-e2UfrXsOEUVA-1; Sat, 10 Oct 2020 16:41:33 -0400 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 A24081868423 for ; Sat, 10 Oct 2020 20:41:32 +0000 (UTC) Received: from localhost (unknown [10.36.110.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B9C210013C4; Sat, 10 Oct 2020 20:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602362495; 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=jfyUSzLpMg0aVhpMIGqjnBnWhwQ55mwb9u9gWmSSZ1k=; b=YPWJN8JCdxWpGHUfICfutBsAPKd+e0HpMXFeT3gbjbTNo6bToX0R7WBAJ1Of0ZrzUz71OJ NYxfFx//QjN+wj6UQOK6/8BO+VThoA3Y2XF5scuRkNr5f6qBxg74mt6KhcJF2a5H7JvLok Afcfj5Sk8DxA5zd3/Q7jvEwkwjwGs9M= X-MC-Unique: dThHvkfUM-e2UfrXsOEUVA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 1/3] coroutine: let CoQueue wake up outside a coroutine Date: Sun, 11 Oct 2020 00:41:04 +0400 Message-Id: <20201010204106.1368710-2-marcandre.lureau@redhat.com> In-Reply-To: <20201010204106.1368710-1-marcandre.lureau@redhat.com> References: <20201010204106.1368710-1-marcandre.lureau@redhat.com> 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=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/10 16:30:21 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Kevin Wolf , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau The assert() was added in commit b681a1c73e15 ("block: Repair the throttling code."), when the qemu_co_queue_do_restart() function required to be running in a coroutine. It was later made unnecessary in commit a9d9235567e7 ("coroutine-lock: reschedule coroutine on the AioContext it was running on"). Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Gerd Hoffmann Reviewed-by: Kevin Wolf --- util/qemu-coroutine-lock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c index 36927b5f88..5816bf8900 100644 --- a/util/qemu-coroutine-lock.c +++ b/util/qemu-coroutine-lock.c @@ -85,15 +85,13 @@ static bool qemu_co_queue_do_restart(CoQueue *queue, bo= ol single) return true; } =20 -bool coroutine_fn qemu_co_queue_next(CoQueue *queue) +bool qemu_co_queue_next(CoQueue *queue) { - assert(qemu_in_coroutine()); return qemu_co_queue_do_restart(queue, true); } =20 -void coroutine_fn qemu_co_queue_restart_all(CoQueue *queue) +void qemu_co_queue_restart_all(CoQueue *queue) { - assert(qemu_in_coroutine()); qemu_co_queue_do_restart(queue, false); } =20 --=20 2.28.0 From nobody Fri May 10 07:43:35 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=1602362669; cv=none; d=zohomail.com; s=zohoarc; b=YypeRA4nHUd07bBM11K5Jy0vC9QFKaQOAfElraY7LjXwkNudzEGHNfaQ283AgKH+9scS0drbSXrXnQKA4k4DQR49iEg+A+jl56r/OvnIyKqYJ3lMqW/dDMd6+/qfVUovh7o3n6RynadxVOU0K+VaAw+iArnW5TGOHslhW1JrzIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362669; 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=2lZpMa6xjU/KAtKaQQ9+A7orLKgxzHKmxpQRLMy4ubs=; b=VSW0/KKaF1vffeHwOcH9dM0xl7AQsLeW/1DZvQdUrNHaldfnlkNGETfOEuzO2Ps95Ul6vgbYb39s/hYhCo/h5N5KvWvx8LOcOiAuHVz9OntsCU1tSb+sxf7lo/acmpNOmx81+y4529B3QhjnuM1ko/nEDyNx7ORNP0OWwGzGcb4= 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 1602362669914220.7299008393844; Sat, 10 Oct 2020 13:44:29 -0700 (PDT) Received: from localhost ([::1]:33852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRLj7-0000ZX-Ey for importer@patchew.org; Sat, 10 Oct 2020 16:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRLgd-0007H9-6b for qemu-devel@nongnu.org; Sat, 10 Oct 2020 16:41:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRLgb-00075p-6F for qemu-devel@nongnu.org; Sat, 10 Oct 2020 16:41:50 -0400 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-441-X7aei5ofOamsw0wpOllCHg-1; Sat, 10 Oct 2020 16:41:46 -0400 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 91134107AD28 for ; Sat, 10 Oct 2020 20:41:45 +0000 (UTC) Received: from localhost (unknown [10.36.110.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 564C176665; Sat, 10 Oct 2020 20:41:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602362508; 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=2lZpMa6xjU/KAtKaQQ9+A7orLKgxzHKmxpQRLMy4ubs=; b=HVH3yD78YSKK/jF7KqXghLHY43lR6DFVKIupr2VgkUdu0Qhgud5f4PtMk6N4oich35r52a pk312FolvCyT2BC9NWrksQLSyT88jFMWPJzQvHovuMSB75JX8w+hyKdjbCbGoZ3ksNXlYT eYe1M/4j3v6+HMhhEnQw3TPn0kntPpA= X-MC-Unique: X7aei5ofOamsw0wpOllCHg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 2/3] console: modify ppm_save to take a pixman image ref Date: Sun, 11 Oct 2020 00:41:05 +0400 Message-Id: <20201010204106.1368710-3-marcandre.lureau@redhat.com> In-Reply-To: <20201010204106.1368710-1-marcandre.lureau@redhat.com> References: <20201010204106.1368710-1-marcandre.lureau@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=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/10 16:41:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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_NONE=-0.0001, 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: Kevin Wolf , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau The function is going to be called from a coroutine, and may yields. Let's ensure our image reference doesn't change over time (due to resize etc) by keeping a ref. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Gerd Hoffmann Reviewed-by: Markus Armbruster --- ui/console.c | 15 ++++++++------- ui/trace-events | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ui/console.c b/ui/console.c index 54a74c0b16..a56fe0dd26 100644 --- a/ui/console.c +++ b/ui/console.c @@ -195,7 +195,6 @@ static void dpy_refresh(DisplayState *s); static DisplayState *get_alloc_displaystate(void); static void text_console_update_cursor_timer(void); static void text_console_update_cursor(void *opaque); -static bool ppm_save(int fd, DisplaySurface *ds, Error **errp); =20 static void gui_update(void *opaque) { @@ -311,16 +310,16 @@ void graphic_hw_invalidate(QemuConsole *con) } } =20 -static bool ppm_save(int fd, DisplaySurface *ds, Error **errp) +static bool ppm_save(int fd, pixman_image_t *image, Error **errp) { - int width =3D pixman_image_get_width(ds->image); - int height =3D pixman_image_get_height(ds->image); + int width =3D pixman_image_get_width(image); + int height =3D pixman_image_get_height(image); g_autoptr(Object) ioc =3D OBJECT(qio_channel_file_new_fd(fd)); g_autofree char *header =3D NULL; g_autoptr(pixman_image_t) linebuf =3D NULL; int y; =20 - trace_ppm_save(fd, ds); + trace_ppm_save(fd, image); =20 header =3D g_strdup_printf("P6\n%d %d\n%d\n", width, height, 255); if (qio_channel_write_all(QIO_CHANNEL(ioc), @@ -330,7 +329,7 @@ static bool ppm_save(int fd, DisplaySurface *ds, Error = **errp) =20 linebuf =3D qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, width); for (y =3D 0; y < height; y++) { - qemu_pixman_linebuf_fill(linebuf, ds->image, width, 0, y); + qemu_pixman_linebuf_fill(linebuf, image, width, 0, y); if (qio_channel_write_all(QIO_CHANNEL(ioc), (char *)pixman_image_get_data(linebuf), pixman_image_get_stride(linebuf), errp) = < 0) { @@ -344,6 +343,7 @@ static bool ppm_save(int fd, DisplaySurface *ds, Error = **errp) void qmp_screendump(const char *filename, bool has_device, const char *dev= ice, bool has_head, int64_t head, Error **errp) { + g_autoptr(pixman_image_t) image =3D NULL; QemuConsole *con; DisplaySurface *surface; int fd; @@ -372,6 +372,7 @@ void qmp_screendump(const char *filename, bool has_devi= ce, const char *device, error_setg(errp, "no surface"); return; } + image =3D pixman_image_ref(surface->image); =20 fd =3D qemu_open_old(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY= , 0666); if (fd =3D=3D -1) { @@ -380,7 +381,7 @@ void qmp_screendump(const char *filename, bool has_devi= ce, const char *device, return; } =20 - if (!ppm_save(fd, surface, errp)) { + if (!ppm_save(fd, image, errp)) { qemu_unlink(filename); } } diff --git a/ui/trace-events b/ui/trace-events index b7d7270c02..0ffcdb4408 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -15,7 +15,7 @@ displaysurface_create_pixman(void *display_surface) "surf= ace=3D%p" displaysurface_free(void *display_surface) "surface=3D%p" displaychangelistener_register(void *dcl, const char *name) "%p [ %s ]" displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]" -ppm_save(int fd, void *display_surface) "fd=3D%d surface=3D%p" +ppm_save(int fd, void *image) "fd=3D%d image=3D%p" =20 # gtk-egl.c # gtk-gl-area.c --=20 2.28.0 From nobody Fri May 10 07:43:35 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=1602363040; cv=none; d=zohomail.com; s=zohoarc; b=FG8pB5JWZ2NipBMIoJr9VYsV9kB2aK32gIchG8FjRYP47bf41ZAL7jO+eDKoe3ZHWA26tuJiwDhbEwYG2TpaqYqOhlWq2/ADp+pYMKTK0ZoWoFHQez9oblviWTavY31TtHZoMPYwgweadUF1VZPo/edHKpp2yfWfh4phXNyFSRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602363040; 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=R81R33Ib68eNCgLZeHZeBVsKMvrOc3EQF+Kl6MO1nEY=; b=n3SLvmXrJ2oOzbwHXgdGLhx5+p4o+wW87vDGIi6IclUQQdNLFiWUQGlr1CFjocy0mT3BeVmFSNWNk6MTmRzvySbciyNjoTNwrdG2sWGzqL9P2u5OWIpw3bcKMcpaqnzqhQubzZSghJsc/xnj7b6kR+g4ezaY+GmvLdmXqmNlaJs= 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 1602363040145101.49698994929997; Sat, 10 Oct 2020 13:50:40 -0700 (PDT) Received: from localhost ([::1]:50288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRLp8-0007dG-S0 for importer@patchew.org; Sat, 10 Oct 2020 16:50:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRLgt-0007JV-KF for qemu-devel@nongnu.org; Sat, 10 Oct 2020 16:42:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRLgr-00076W-4K for qemu-devel@nongnu.org; Sat, 10 Oct 2020 16:42:07 -0400 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-454-VEaQBX43M6eA1BGUp6Aspw-1; Sat, 10 Oct 2020 16:42:00 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 130B0107ACF8 for ; Sat, 10 Oct 2020 20:41:59 +0000 (UTC) Received: from localhost (unknown [10.36.110.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 280115C1D7; Sat, 10 Oct 2020 20:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602362521; 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=R81R33Ib68eNCgLZeHZeBVsKMvrOc3EQF+Kl6MO1nEY=; b=giZ8f4LfAzAtCQXpTbZZc055XsFeDzAIX6Pj2oU/oI+fPlgpsug+f2GCq74qPbVVOEqsY1 USewsbYddpGw0mhZx3aAohgAi70bEYclLY+1YkcgiEg9G4AcD0E5KFhPkMJ/sduo9JbM6Y FBGFf6aYFdfkpBUiFXqQUzjPZfDogjw= X-MC-Unique: VEaQBX43M6eA1BGUp6Aspw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 3/3] console: make QMP/HMP screendump run in coroutine Date: Sun, 11 Oct 2020 00:41:06 +0400 Message-Id: <20201010204106.1368710-4-marcandre.lureau@redhat.com> In-Reply-To: <20201010204106.1368710-1-marcandre.lureau@redhat.com> References: <20201010204106.1368710-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/10 16:30:21 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Kevin Wolf , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Thanks to the monitors coroutine support, the screendump handler can trigger a graphic_hw_update(), yield and let the main loop run until update is done. Then the handler is resumed, and ppm_save() will write the screen image to disk in the coroutine context (thus non-blocking). Potentially, during non-blocking write, some new graphic update could happen, and thus the image may have some glitches. Whether that behaviour is acceptable is discutable. Allocating new memory may not be a good idea, as framebuffers can be quite large. Even then, QEMU may become less responsive as it requires paging in etc. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=3D1230527 Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Gerd Hoffmann --- hmp-commands.hx | 1 + monitor/hmp-cmds.c | 3 ++- qapi/ui.json | 3 ++- ui/console.c | 27 ++++++++++++++++++++++++--- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index cd068389de..ff2d7aa8f3 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -254,6 +254,7 @@ ERST .help =3D "save screen from head 'head' of display device 'd= evice' " "into PPM image 'filename'", .cmd =3D hmp_screendump, + .coroutine =3D true, }, =20 SRST diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 9789f4277f..91608bac6d 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1756,7 +1756,8 @@ err_out: goto out; } =20 -void hmp_screendump(Monitor *mon, const QDict *qdict) +void coroutine_fn +hmp_screendump(Monitor *mon, const QDict *qdict) { const char *filename =3D qdict_get_str(qdict, "filename"); const char *id =3D qdict_get_try_str(qdict, "device"); diff --git a/qapi/ui.json b/qapi/ui.json index 9d6721037f..6c7b33cb72 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -98,7 +98,8 @@ # ## { 'command': 'screendump', - 'data': {'filename': 'str', '*device': 'str', '*head': 'int'} } + 'data': {'filename': 'str', '*device': 'str', '*head': 'int'}, + 'coroutine': true } =20 ## # =3D=3D Spice diff --git a/ui/console.c b/ui/console.c index a56fe0dd26..0118f70d9a 100644 --- a/ui/console.c +++ b/ui/console.c @@ -168,6 +168,7 @@ struct QemuConsole { QEMUFIFO out_fifo; uint8_t out_fifo_buf[16]; QEMUTimer *kbd_timer; + CoQueue dump_queue; =20 QTAILQ_ENTRY(QemuConsole) next; }; @@ -263,6 +264,7 @@ static void gui_setup_refresh(DisplayState *ds) =20 void graphic_hw_update_done(QemuConsole *con) { + qemu_co_queue_restart_all(&con->dump_queue); } =20 void graphic_hw_update(QemuConsole *con) @@ -340,8 +342,15 @@ static bool ppm_save(int fd, pixman_image_t *image, Er= ror **errp) return true; } =20 -void qmp_screendump(const char *filename, bool has_device, const char *dev= ice, - bool has_head, int64_t head, Error **errp) +static void graphic_hw_update_bh(void *con) +{ + graphic_hw_update(con); +} + +/* Safety: coroutine-only, concurrent-coroutine safe, main thread only */ +void coroutine_fn +qmp_screendump(const char *filename, bool has_device, const char *device, + bool has_head, int64_t head, Error **errp) { g_autoptr(pixman_image_t) image =3D NULL; QemuConsole *con; @@ -366,7 +375,15 @@ void qmp_screendump(const char *filename, bool has_dev= ice, const char *device, } } =20 - graphic_hw_update(con); + if (qemu_co_queue_empty(&con->dump_queue)) { + /* Defer the update, it will restart the pending coroutines */ + aio_bh_schedule_oneshot(qemu_get_aio_context(), + graphic_hw_update_bh, con); + } + qemu_co_queue_wait(&con->dump_queue, NULL); + + /* All pending coroutines are woken up, while BQL taken, no further gr= aphic + * update are possible until it is released, take an image ref before = that. */ surface =3D qemu_console_surface(con); if (!surface) { error_setg(errp, "no surface"); @@ -381,6 +398,9 @@ void qmp_screendump(const char *filename, bool has_devi= ce, const char *device, return; } =20 + /* The image content could potentially be updated as the coroutine yie= lds + * and releases the BQL. It could produce corrupted dump, but it shoul= d be + * otherwise safe. */ if (!ppm_save(fd, image, errp)) { qemu_unlink(filename); } @@ -1297,6 +1317,7 @@ static QemuConsole *new_console(DisplayState *ds, con= sole_type_t console_type, =20 obj =3D object_new(TYPE_QEMU_CONSOLE); s =3D QEMU_CONSOLE(obj); + qemu_co_queue_init(&s->dump_queue); s->head =3D head; object_property_add_link(obj, "device", TYPE_DEVICE, (Object **)&s->device, --=20 2.28.0