From nobody Wed Apr 16 12:21:32 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 1544622073326274.29228093513734; Wed, 12 Dec 2018 05:41:13 -0800 (PST) Received: from localhost ([::1]:44971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4lE-0004Ut-6N for importer@patchew.org; Wed, 12 Dec 2018 08:41:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4Ym-0002vF-Ck 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 1gX4Yl-0001Mi-HD for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gX4Yj-0001KO-GS; Wed, 12 Dec 2018 08:28:17 -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 C75973082A34; Wed, 12 Dec 2018 13:28:16 +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 B47A060C44; Wed, 12 Dec 2018 13:28:15 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 12 Dec 2018 14:27:10 +0100 Message-Id: <20181212132735.16080-17-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.45]); Wed, 12 Dec 2018 13:28:16 +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 16/41] file-posix: Avoid aio_worker() for QEMU_AIO_TRUNCATE 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 27be94cfe5..7c5121efc9 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1645,8 +1645,9 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *= aiocb) return ret; } =20 -static int handle_aiocb_truncate(RawPosixAIOData *aiocb) +static int handle_aiocb_truncate(void *opaque) { + RawPosixAIOData *aiocb =3D opaque; int result =3D 0; int64_t current_length =3D 0; char *buf =3D NULL; @@ -1812,8 +1813,7 @@ static int aio_worker(void *arg) ret =3D handle_aiocb_copy_range(aiocb); break; case QEMU_AIO_TRUNCATE: - ret =3D handle_aiocb_truncate(aiocb); - break; + g_assert_not_reached(); default: error_report("invalid aio request (0x%x)", aiocb->aio_type); ret =3D -EINVAL; @@ -1981,9 +1981,9 @@ static int coroutine_fn raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset, PreallocMode prealloc, Error **errp) { - RawPosixAIOData *acb =3D g_new(RawPosixAIOData, 1); + RawPosixAIOData acb; =20 - *acb =3D (RawPosixAIOData) { + acb =3D (RawPosixAIOData) { .bs =3D bs, .aio_fildes =3D fd, .aio_type =3D QEMU_AIO_TRUNCATE, @@ -1994,7 +1994,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, in= t64_t offset, }, }; =20 - return raw_thread_pool_submit(bs, aio_worker, acb); + return raw_thread_pool_submit(bs, handle_aiocb_truncate, &acb); } =20 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offs= et, --=20 2.19.2