From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15520641918601014.4852969052826; Fri, 8 Mar 2019 08:56:31 -0800 (PST) Received: from localhost ([127.0.0.1]:46837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2InH-0004q3-4x for importer@patchew.org; Fri, 08 Mar 2019 11:56:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Il0-0003KO-Ba for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Ikz-0005su-Dy for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48946) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2Ikx-0005rQ-Od; Fri, 08 Mar 2019 11:53:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08A5630EBE71; Fri, 8 Mar 2019 16:53:59 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id C08FD60F86; Fri, 8 Mar 2019 16:53:51 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:38 +0000 Message-Id: <20190308165344.10685-2-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 08 Mar 2019 16:53:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/7] MAINTAINERS: add missing support status fields X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , Stefan Hajnoczi , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch adds the "S:" line for areas of the codebase that currently lack a support status field. Note that there are a few more areas that are more abstract and do not correspond to a specific set of files. They have not been modified. Cc: Alex Benn=C3=A9e Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190301163518.20702-1-stefanha@redhat.com Message-Id: <20190301163518.20702-1-stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 074ad46d47..1ed8cf7ee7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -338,6 +338,7 @@ F: include/hw/tricore/ =20 Multiarch Linux User Tests M: Alex Benn=C3=A9e +S: Maintained F: tests/tcg/multiarch/ =20 Guest CPU Cores (KVM): @@ -2094,6 +2095,7 @@ F: qemu.sasl Coroutines M: Stefan Hajnoczi M: Kevin Wolf +S: Maintained F: util/*coroutine* F: include/qemu/coroutine* F: tests/test-coroutine.c @@ -2540,6 +2542,7 @@ F: .gitlab-ci.yml Guest Test Compilation Support M: Alex Benn=C3=A9e R: Philippe Mathieu-Daud=C3=A9 +S: Maintained F: tests/tcg/Makefile F: tests/tcg/Makefile.include L: qemu-devel@nongnu.org --=20 2.20.1 From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552064365933284.1688287839453; Fri, 8 Mar 2019 08:59:25 -0800 (PST) Received: from localhost ([127.0.0.1]:46865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Iq9-0007Nz-Sp for importer@patchew.org; Fri, 08 Mar 2019 11:59:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2IlE-0003Uw-8s for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2IlA-00060x-IW for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2Il4-0005vy-Tl; Fri, 08 Mar 2019 11:54:08 -0500 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 mx1.redhat.com (Postfix) with ESMTPS id 7A063C058CC0; Fri, 8 Mar 2019 16:54:05 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BBC31001E72; Fri, 8 Mar 2019 16:54:00 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:39 +0000 Message-Id: <20190308165344.10685-3-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 08 Mar 2019 16:54:05 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/7] hw/block/virtio-blk: Clean req->dev repetitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, "Michael S. Tsirkin" , Max Reitz , Stefan Hajnoczi , Anastasiia Rusakova Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Anastasiia Rusakova Some functions sometimes uses req->dev even though a local variable VirtIOBlock* s =3D req->dev has already been defined. Updated places to use s everywhere in the file. Signed-off-by: Anastasiia Rusakova Message-id: 20190307161925.4158-1-rusakova.nastasia@icloud.com Message-Id: <20190307161925.4158-1-rusakova.nastasia@icloud.com> Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 0cc3c590b9..06e57a4d39 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -127,7 +127,7 @@ static void virtio_blk_rw_complete(void *opaque, int re= t) } =20 if (ret) { - int p =3D virtio_ldl_p(VIRTIO_DEVICE(req->dev), &req->out.type= ); + int p =3D virtio_ldl_p(VIRTIO_DEVICE(s), &req->out.type); bool is_read =3D !(p & VIRTIO_BLK_T_OUT); /* Note that memory may be dirtied on read failure. If the * virtio request is not completed here, as is the case for @@ -143,7 +143,7 @@ static void virtio_blk_rw_complete(void *opaque, int re= t) } =20 virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); - block_acct_done(blk_get_stats(req->dev->blk), &req->acct); + block_acct_done(blk_get_stats(s->blk), &req->acct); virtio_blk_free_request(req); } aio_context_release(blk_get_aio_context(s->conf.conf.blk)); @@ -260,9 +260,9 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *r= eq) { int status =3D VIRTIO_BLK_S_OK; struct virtio_scsi_inhdr *scsi =3D NULL; - VirtIODevice *vdev =3D VIRTIO_DEVICE(req->dev); - VirtQueueElement *elem =3D &req->elem; VirtIOBlock *blk =3D req->dev; + VirtIODevice *vdev =3D VIRTIO_DEVICE(blk); + VirtQueueElement *elem =3D &req->elem; =20 #ifdef __linux__ int i; @@ -492,16 +492,18 @@ static void virtio_blk_submit_multireq(BlockBackend *= blk, MultiReqBuffer *mrb) =20 static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *m= rb) { - block_acct_start(blk_get_stats(req->dev->blk), &req->acct, 0, + VirtIOBlock *s =3D req->dev; + + block_acct_start(blk_get_stats(s->blk), &req->acct, 0, BLOCK_ACCT_FLUSH); =20 /* * Make sure all outstanding writes are posted to the backing device. */ if (mrb->is_write && mrb->num_reqs > 0) { - virtio_blk_submit_multireq(req->dev->blk, mrb); + virtio_blk_submit_multireq(s->blk, mrb); } - blk_aio_flush(req->dev->blk, virtio_blk_flush_complete, req); + blk_aio_flush(s->blk, virtio_blk_flush_complete, req); } =20 static bool virtio_blk_sect_range_ok(VirtIOBlock *dev, --=20 2.20.1 From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552064545793253.63793003196736; Fri, 8 Mar 2019 09:02:25 -0800 (PST) Received: from localhost ([127.0.0.1]:47008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2It4-0001Si-CN for importer@patchew.org; Fri, 08 Mar 2019 12:02:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2IlG-0003XD-DQ for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2IlE-00063d-BF for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33622) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2Il8-0005zF-M5; Fri, 08 Mar 2019 11:54:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5CC0D821F3; Fri, 8 Mar 2019 16:54:09 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id D97CD60F86; Fri, 8 Mar 2019 16:54:06 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:40 +0000 Message-Id: <20190308165344.10685-4-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 08 Mar 2019 16:54:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/7] iothread: replace init_done_cond with a semaphore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, "Michael S. Tsirkin" , Peter Xu , Max Reitz , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Peter Xu Only sending an init-done message using lock+cond seems an overkill to me. Replacing it with a simpler semaphore. Meanwhile, init the semaphore unconditionally, then we can destroy it unconditionally too in finalize which seems cleaner. Signed-off-by: Peter Xu Message-id: 20190306115532.23025-2-peterx@redhat.com Message-Id: <20190306115532.23025-2-peterx@redhat.com> Signed-off-by: Stefan Hajnoczi --- include/sysemu/iothread.h | 3 +-- iothread.c | 17 ++++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 8a7ac2c528..50411ba54a 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -27,8 +27,7 @@ typedef struct { GMainContext *worker_context; GMainLoop *main_loop; GOnce once; - QemuMutex init_done_lock; - QemuCond init_done_cond; /* is thread initialization done? */ + QemuSemaphore init_done_sem; /* is thread init done? */ bool stopping; /* has iothread_stop() been called? */ bool running; /* should iothread_run() continue? */ int thread_id; diff --git a/iothread.c b/iothread.c index e615b7ae52..6e297e9ef1 100644 --- a/iothread.c +++ b/iothread.c @@ -55,10 +55,8 @@ static void *iothread_run(void *opaque) rcu_register_thread(); =20 my_iothread =3D iothread; - qemu_mutex_lock(&iothread->init_done_lock); iothread->thread_id =3D qemu_get_thread_id(); - qemu_cond_signal(&iothread->init_done_cond); - qemu_mutex_unlock(&iothread->init_done_lock); + qemu_sem_post(&iothread->init_done_sem); =20 while (iothread->running) { aio_poll(iothread->ctx, true); @@ -115,6 +113,7 @@ static void iothread_instance_init(Object *obj) =20 iothread->poll_max_ns =3D IOTHREAD_POLL_MAX_NS_DEFAULT; iothread->thread_id =3D -1; + qemu_sem_init(&iothread->init_done_sem, 0); } =20 static void iothread_instance_finalize(Object *obj) @@ -123,10 +122,6 @@ static void iothread_instance_finalize(Object *obj) =20 iothread_stop(iothread); =20 - if (iothread->thread_id !=3D -1) { - qemu_cond_destroy(&iothread->init_done_cond); - qemu_mutex_destroy(&iothread->init_done_lock); - } /* * Before glib2 2.33.10, there is a glib2 bug that GSource context * pointer may not be cleared even if the context has already been @@ -145,6 +140,7 @@ static void iothread_instance_finalize(Object *obj) g_main_context_unref(iothread->worker_context); iothread->worker_context =3D NULL; } + qemu_sem_destroy(&iothread->init_done_sem); } =20 static void iothread_complete(UserCreatable *obj, Error **errp) @@ -173,8 +169,6 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) return; } =20 - qemu_mutex_init(&iothread->init_done_lock); - qemu_cond_init(&iothread->init_done_cond); iothread->once =3D (GOnce) G_ONCE_INIT; =20 /* This assumes we are called from a thread with useful CPU affinity f= or us @@ -188,12 +182,9 @@ static void iothread_complete(UserCreatable *obj, Erro= r **errp) g_free(name); =20 /* Wait for initialization to complete */ - qemu_mutex_lock(&iothread->init_done_lock); while (iothread->thread_id =3D=3D -1) { - qemu_cond_wait(&iothread->init_done_cond, - &iothread->init_done_lock); + qemu_sem_wait(&iothread->init_done_sem); } - qemu_mutex_unlock(&iothread->init_done_lock); } =20 typedef struct { --=20 2.20.1 From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155206420298311.263668156469066; Fri, 8 Mar 2019 08:56:42 -0800 (PST) Received: from localhost ([127.0.0.1]:46839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2InY-00051h-0v for importer@patchew.org; Fri, 08 Mar 2019 11:56:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2IlQ-0003fx-4j for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2IlO-0006AV-9P for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1042) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2IlK-000669-7K; Fri, 08 Mar 2019 11:54:22 -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 mx1.redhat.com (Postfix) with ESMTPS id 9C3683092656; Fri, 8 Mar 2019 16:54:19 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEF4D5D704; Fri, 8 Mar 2019 16:54:10 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:41 +0000 Message-Id: <20190308165344.10685-5-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 08 Mar 2019 16:54:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/7] iothread: create the gcontext unconditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, "Michael S. Tsirkin" , Peter Xu , Max Reitz , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Peter Xu In existing code we create the gcontext dynamically at the first access of the gcontext from caller. That can bring some complexity and potential races during using iothread. Since the context itself is not that big a resource, and we won't have millions of iothread, let's simply create the gcontext unconditionally. This will also be a preparation work further to move the thread context push operation earlier than before (now it's only pushed right before we want to start running the gmainloop). Removing the g_once since it's not necessary, while introducing a new run_gcontext boolean to show whether we want to run the gcontext. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Peter Xu Message-id: 20190306115532.23025-3-peterx@redhat.com Message-Id: <20190306115532.23025-3-peterx@redhat.com> Signed-off-by: Stefan Hajnoczi --- include/sysemu/iothread.h | 2 +- iothread.c | 43 +++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 50411ba54a..5f6240d5cb 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -24,9 +24,9 @@ typedef struct { =20 QemuThread thread; AioContext *ctx; + bool run_gcontext; /* whether we should run gcontext */ GMainContext *worker_context; GMainLoop *main_loop; - GOnce once; QemuSemaphore init_done_sem; /* is thread init done? */ bool stopping; /* has iothread_stop() been called? */ bool running; /* should iothread_run() continue? */ diff --git a/iothread.c b/iothread.c index 6e297e9ef1..6fa87876e0 100644 --- a/iothread.c +++ b/iothread.c @@ -65,7 +65,7 @@ static void *iothread_run(void *opaque) * We must check the running state again in case it was * changed in previous aio_poll() */ - if (iothread->running && atomic_read(&iothread->worker_context)) { + if (iothread->running && atomic_read(&iothread->run_gcontext)) { GMainLoop *loop; =20 g_main_context_push_thread_default(iothread->worker_context); @@ -114,6 +114,8 @@ static void iothread_instance_init(Object *obj) iothread->poll_max_ns =3D IOTHREAD_POLL_MAX_NS_DEFAULT; iothread->thread_id =3D -1; qemu_sem_init(&iothread->init_done_sem, 0); + /* By default, we don't run gcontext */ + atomic_set(&iothread->run_gcontext, 0); } =20 static void iothread_instance_finalize(Object *obj) @@ -143,6 +145,16 @@ static void iothread_instance_finalize(Object *obj) qemu_sem_destroy(&iothread->init_done_sem); } =20 +static void iothread_init_gcontext(IOThread *iothread) +{ + GSource *source; + + iothread->worker_context =3D g_main_context_new(); + source =3D aio_get_g_source(iothread_get_aio_context(iothread)); + g_source_attach(source, iothread->worker_context); + g_source_unref(source); +} + static void iothread_complete(UserCreatable *obj, Error **errp) { Error *local_error =3D NULL; @@ -157,6 +169,12 @@ static void iothread_complete(UserCreatable *obj, Erro= r **errp) return; } =20 + /* + * Init one GMainContext for the iothread unconditionally, even if + * it's not used + */ + iothread_init_gcontext(iothread); + aio_context_set_poll_params(iothread->ctx, iothread->poll_max_ns, iothread->poll_grow, @@ -169,8 +187,6 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) return; } =20 - iothread->once =3D (GOnce) G_ONCE_INIT; - /* This assumes we are called from a thread with useful CPU affinity f= or us * to inherit. */ @@ -333,27 +349,10 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp) return head; } =20 -static gpointer iothread_g_main_context_init(gpointer opaque) -{ - AioContext *ctx; - IOThread *iothread =3D opaque; - GSource *source; - - iothread->worker_context =3D g_main_context_new(); - - ctx =3D iothread_get_aio_context(iothread); - source =3D aio_get_g_source(ctx); - g_source_attach(source, iothread->worker_context); - g_source_unref(source); - - aio_notify(iothread->ctx); - return NULL; -} - GMainContext *iothread_get_g_main_context(IOThread *iothread) { - g_once(&iothread->once, iothread_g_main_context_init, iothread); - + atomic_set(&iothread->run_gcontext, 1); + aio_notify(iothread->ctx); return iothread->worker_context; } =20 --=20 2.20.1 From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552064370676317.6983807410137; Fri, 8 Mar 2019 08:59:30 -0800 (PST) Received: from localhost ([127.0.0.1]:46867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2IqF-0007S2-Mt for importer@patchew.org; Fri, 08 Mar 2019 11:59:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Ila-0003pX-C8 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2IlZ-0006IP-Jg for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2IlU-0006DQ-5X; Fri, 08 Mar 2019 11:54:32 -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 mx1.redhat.com (Postfix) with ESMTPS id 44BFC8765E; Fri, 8 Mar 2019 16:54:30 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id 050A3600CD; Fri, 8 Mar 2019 16:54:20 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:42 +0000 Message-Id: <20190308165344.10685-6-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 08 Mar 2019 16:54:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/7] iothread: create main loop unconditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, "Michael S. Tsirkin" , Peter Xu , Max Reitz , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Peter Xu Since we've have the gcontext always there, create the main loop altogether. The iothread_run() is even cleaner. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Peter Xu Message-id: 20190306115532.23025-4-peterx@redhat.com Message-Id: <20190306115532.23025-4-peterx@redhat.com> Signed-off-by: Stefan Hajnoczi --- iothread.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/iothread.c b/iothread.c index 6fa87876e0..9abdbace66 100644 --- a/iothread.c +++ b/iothread.c @@ -66,17 +66,8 @@ static void *iothread_run(void *opaque) * changed in previous aio_poll() */ if (iothread->running && atomic_read(&iothread->run_gcontext)) { - GMainLoop *loop; - g_main_context_push_thread_default(iothread->worker_context); - iothread->main_loop =3D - g_main_loop_new(iothread->worker_context, TRUE); - loop =3D iothread->main_loop; - g_main_loop_run(iothread->main_loop); - iothread->main_loop =3D NULL; - g_main_loop_unref(loop); - g_main_context_pop_thread_default(iothread->worker_context); } } @@ -141,6 +132,8 @@ static void iothread_instance_finalize(Object *obj) if (iothread->worker_context) { g_main_context_unref(iothread->worker_context); iothread->worker_context =3D NULL; + g_main_loop_unref(iothread->main_loop); + iothread->main_loop =3D NULL; } qemu_sem_destroy(&iothread->init_done_sem); } @@ -153,6 +146,7 @@ static void iothread_init_gcontext(IOThread *iothread) source =3D aio_get_g_source(iothread_get_aio_context(iothread)); g_source_attach(source, iothread->worker_context); g_source_unref(source); + iothread->main_loop =3D g_main_loop_new(iothread->worker_context, TRUE= ); } =20 static void iothread_complete(UserCreatable *obj, Error **errp) --=20 2.20.1 From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552064353742604.1478121792529; Fri, 8 Mar 2019 08:59:13 -0800 (PST) Received: from localhost ([127.0.0.1]:46863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Ipz-0007Cx-6T for importer@patchew.org; Fri, 08 Mar 2019 11:59:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Ild-0003sg-Fh for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Ilb-0006Ko-Fe for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34726) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2IlV-0006Em-QN; Fri, 08 Mar 2019 11:54:34 -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 mx1.redhat.com (Postfix) with ESMTPS id 1F827883CA; Fri, 8 Mar 2019 16:54:32 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4296600CD; Fri, 8 Mar 2019 16:54:31 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:43 +0000 Message-Id: <20190308165344.10685-7-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 08 Mar 2019 16:54:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/7] iothread: push gcontext earlier in the thread_fn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, "Michael S. Tsirkin" , Peter Xu , Max Reitz , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Peter Xu We were pushing the context until right before running the gmainloop. Now since we have everything unconditionally, we can move this earlier. One benefit is that now it's done even before init_done_sem, so as long as the iothread user calls iothread_create() and completes, we know that the thread stack is ready. Signed-off-by: Peter Xu Message-id: 20190306115532.23025-5-peterx@redhat.com Message-Id: <20190306115532.23025-5-peterx@redhat.com> [Tweaked comment wording as discussed with Peter Xu. --Stefan] Signed-off-by: Stefan Hajnoczi --- iothread.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/iothread.c b/iothread.c index 9abdbace66..ad64c757ac 100644 --- a/iothread.c +++ b/iothread.c @@ -53,7 +53,11 @@ static void *iothread_run(void *opaque) IOThread *iothread =3D opaque; =20 rcu_register_thread(); - + /* + * g_main_context_push_thread_default() must be called before anything + * in this new thread uses glib. + */ + g_main_context_push_thread_default(iothread->worker_context); my_iothread =3D iothread; iothread->thread_id =3D qemu_get_thread_id(); qemu_sem_post(&iothread->init_done_sem); @@ -66,12 +70,11 @@ static void *iothread_run(void *opaque) * changed in previous aio_poll() */ if (iothread->running && atomic_read(&iothread->run_gcontext)) { - g_main_context_push_thread_default(iothread->worker_context); g_main_loop_run(iothread->main_loop); - g_main_context_pop_thread_default(iothread->worker_context); } } =20 + g_main_context_pop_thread_default(iothread->worker_context); rcu_unregister_thread(); return NULL; } --=20 2.20.1 From nobody Mon Apr 14 05:07:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552064547058886.9538048023941; Fri, 8 Mar 2019 09:02:27 -0800 (PST) Received: from localhost ([127.0.0.1]:47012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2It4-0001Uf-V2 for importer@patchew.org; Fri, 08 Mar 2019 12:02:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Ili-0003wG-JM for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Ilh-0006Q1-S4 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 11:54:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2Ilf-0006MU-2M; Fri, 08 Mar 2019 11:54:43 -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 mx1.redhat.com (Postfix) with ESMTPS id 5732E70D67; Fri, 8 Mar 2019 16:54:42 +0000 (UTC) Received: from localhost (ovpn-117-209.ams2.redhat.com [10.36.117.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D6535D786; Fri, 8 Mar 2019 16:54:33 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 16:53:44 +0000 Message-Id: <20190308165344.10685-8-stefanha@redhat.com> In-Reply-To: <20190308165344.10685-1-stefanha@redhat.com> References: <20190308165344.10685-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 08 Mar 2019 16:54:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 7/7] iothread: document about why we need explicit aio_poll() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, "Michael S. Tsirkin" , Peter Xu , Max Reitz , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Peter Xu After consulting Paolo I know why we'd better keep the explicit aio_poll() in iothread_run(). Document it directly into the code so that future readers will know the answer from day one. Signed-off-by: Peter Xu Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 20190306115532.23025-6-peterx@redhat.com Message-Id: <20190306115532.23025-6-peterx@redhat.com> Signed-off-by: Stefan Hajnoczi --- iothread.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/iothread.c b/iothread.c index ad64c757ac..7130be58e3 100644 --- a/iothread.c +++ b/iothread.c @@ -63,6 +63,15 @@ static void *iothread_run(void *opaque) qemu_sem_post(&iothread->init_done_sem); =20 while (iothread->running) { + /* + * Note: from functional-wise the g_main_loop_run() below can + * already cover the aio_poll() events, but we can't run the + * main loop unconditionally because explicit aio_poll() here + * is faster than g_main_loop_run() when we do not need the + * gcontext at all (e.g., pure block layer iothreads). In + * other words, when we want to run the gcontext with the + * iothread we need to pay some performance for functionality. + */ aio_poll(iothread->ctx, true); =20 /* --=20 2.20.1