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 1544622229964929.0025109953609; Wed, 12 Dec 2018 05:43:49 -0800 (PST) Received: from localhost ([::1]:44984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4nk-0006wP-Qf for importer@patchew.org; Wed, 12 Dec 2018 08:43:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4Ys-00034s-5L for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX4Yr-0001Qc-7t for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13918) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gX4Yk-0001Lj-Ra; Wed, 12 Dec 2018 08:28:18 -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 2FE403084258; Wed, 12 Dec 2018 13:28:18 +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 2030560C44; Wed, 12 Dec 2018 13:28:16 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 12 Dec 2018 14:27:11 +0100 Message-Id: <20181212132735.16080-18-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:18 +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 17/41] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE 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" aio_worker() doesn't add anything interesting, it's only a useless indirection. Call the handler function directly instead. As we know that this handler function is only called from coroutine context and the coroutine stays around until the worker thread finishes, we can keep RawPosixAIOData on the stack. Signed-off-by: Kevin Wolf --- block/file-posix.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 7c5121efc9..e502ba7e15 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1572,8 +1572,9 @@ static off_t copy_file_range(int in_fd, off_t *in_off= , int out_fd, } #endif =20 -static ssize_t handle_aiocb_copy_range(RawPosixAIOData *aiocb) +static int handle_aiocb_copy_range(void *opaque) { + RawPosixAIOData *aiocb =3D opaque; uint64_t bytes =3D aiocb->aio_nbytes; off_t in_off =3D aiocb->aio_offset; off_t out_off =3D aiocb->copy_range.aio_offset2; @@ -1810,8 +1811,6 @@ static int aio_worker(void *arg) ret =3D handle_aiocb_write_zeroes_unmap(aiocb); break; case QEMU_AIO_COPY_RANGE: - ret =3D handle_aiocb_copy_range(aiocb); - break; case QEMU_AIO_TRUNCATE: g_assert_not_reached(); default: @@ -2714,6 +2713,7 @@ static int coroutine_fn raw_co_copy_range_to(BlockDri= verState *bs, BdrvRequestFlags read_flags, BdrvRequestFlags write_flags) { + RawPosixAIOData acb; BDRVRawState *s =3D bs->opaque; BDRVRawState *src_s; =20 @@ -2726,8 +2726,20 @@ static int coroutine_fn raw_co_copy_range_to(BlockDr= iverState *bs, if (fd_open(src->bs) < 0 || fd_open(dst->bs) < 0) { return -EIO; } - return paio_submit_co_full(bs, src_s->fd, src_offset, s->fd, dst_offse= t, - NULL, bytes, QEMU_AIO_COPY_RANGE); + + acb =3D (RawPosixAIOData) { + .bs =3D bs, + .aio_type =3D QEMU_AIO_COPY_RANGE, + .aio_fildes =3D src_s->fd, + .aio_offset =3D src_offset, + .aio_nbytes =3D bytes, + .copy_range =3D { + .aio_fd2 =3D s->fd, + .aio_offset2 =3D dst_offset, + }, + }; + + return raw_thread_pool_submit(bs, handle_aiocb_copy_range, &acb); } =20 BlockDriver bdrv_file =3D { --=20 2.19.2