From nobody Wed Apr 16 11:38:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544622058331651.312318888021; Wed, 12 Dec 2018 05:40:58 -0800 (PST) Received: from localhost ([::1]:44967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4kz-0004Br-6h for importer@patchew.org; Wed, 12 Dec 2018 08:40:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4Yk-0002qR-VM for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX4Yk-0001LT-29 for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gX4Yi-0001GI-3j; Wed, 12 Dec 2018 08:28:16 -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 68DD03084218; Wed, 12 Dec 2018 13:28:15 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-245.ams2.redhat.com [10.36.117.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F80960C44; Wed, 12 Dec 2018 13:28:10 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 12 Dec 2018 14:27:09 +0100 Message-Id: <20181212132735.16080-16-kwolf@redhat.com> In-Reply-To: <20181212132735.16080-1-kwolf@redhat.com> References: <20181212132735.16080-1-kwolf@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.40]); Wed, 12 Dec 2018 13:28:15 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 15/41] file-posix: Factor out raw_thread_pool_submit() 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Getting the thread pool of the AioContext of a block node and scheduling some work in it is an operation that is already done twice, and we'll get more instances. Factor it out into a separate function. Signed-off-by: Kevin Wolf --- block/file-posix.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index d0102a7ec0..27be94cfe5 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1824,13 +1824,20 @@ static int aio_worker(void *arg) return ret; } =20 +static int coroutine_fn raw_thread_pool_submit(BlockDriverState *bs, + ThreadPoolFunc func, void *= arg) +{ + /* @bs can be NULL, bdrv_get_aio_context() returns the main context th= en */ + ThreadPool *pool =3D aio_get_thread_pool(bdrv_get_aio_context(bs)); + return thread_pool_submit_co(pool, func, arg); +} + static int paio_submit_co_full(BlockDriverState *bs, int fd, int64_t offset, int fd2, int64_t offset2, QEMUIOVector *qiov, int bytes, int type) { RawPosixAIOData *acb =3D g_new(RawPosixAIOData, 1); - ThreadPool *pool; =20 acb->bs =3D bs; acb->aio_type =3D type; @@ -1849,8 +1856,7 @@ static int paio_submit_co_full(BlockDriverState *bs, = int fd, } =20 trace_file_paio_submit_co(offset, bytes, type); - pool =3D aio_get_thread_pool(bdrv_get_aio_context(bs)); - return thread_pool_submit_co(pool, aio_worker, acb); + return raw_thread_pool_submit(bs, aio_worker, acb); } =20 static inline int paio_submit_co(BlockDriverState *bs, int fd, @@ -1976,7 +1982,6 @@ raw_regular_truncate(BlockDriverState *bs, int fd, in= t64_t offset, PreallocMode prealloc, Error **errp) { RawPosixAIOData *acb =3D g_new(RawPosixAIOData, 1); - ThreadPool *pool; =20 *acb =3D (RawPosixAIOData) { .bs =3D bs, @@ -1989,9 +1994,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, in= t64_t offset, }, }; =20 - /* @bs can be NULL, bdrv_get_aio_context() returns the main context th= en */ - pool =3D aio_get_thread_pool(bdrv_get_aio_context(bs)); - return thread_pool_submit_co(pool, aio_worker, acb); + return raw_thread_pool_submit(bs, aio_worker, acb); } =20 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offs= et, --=20 2.19.2