From nobody Wed Dec 17 21:47:44 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657650366; cv=none; d=zohomail.com; s=zohoarc; b=Uaxy9fNFm2OPCyZAGxQMvlIlNu/CrwmCJXLLyACY2KZWwCYtxYFT1CfjUsNKd3Lk4oghYmYZ6cy8SPapY4G/+sesvjC7darlBrUYmCWq3e4co1IuvJ0oYzzg2m1RfXqG/zVubQJxaZ5MDenmW8/w4zNBFV8TDp1B1cmEmlQt4z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657650366; 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=P056BZmmNOHG+TMosCuQH52pQUmFgn+uwy3KD7uAvfE=; b=ntbwSrMP6zuBLTIQqZRNi9b7M0zcxca7rJWVOc8Q2PNw366qKWs+rU2aN3ZGvMp2X1t/uF1h29nvqFvWNHaPLk5Mc+/BIIWTT/7GvHdhP75a6jIn7UUvDIg+q9QqsBwquAfE1YiDKylM9F5QU5elFl1CDXgr+/XZse7nTzqzZ0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657650366026968.9215968740672; Tue, 12 Jul 2022 11:26:06 -0700 (PDT) Received: from localhost ([::1]:51142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBKaC-0005qt-Rc for importer@patchew.org; Tue, 12 Jul 2022 14:26:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBKHm-0003Vr-3W for qemu-devel@nongnu.org; Tue, 12 Jul 2022 14:07:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:34936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBKHh-0006dn-DY for qemu-devel@nongnu.org; Tue, 12 Jul 2022 14:07:01 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-aBnp996zNl2XRrCsH_rEQw-1; Tue, 12 Jul 2022 14:06:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9A273C02B66; Tue, 12 Jul 2022 18:06:54 +0000 (UTC) Received: from localhost (unknown [10.39.193.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 651492026D64; Tue, 12 Jul 2022 18:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657649216; 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=P056BZmmNOHG+TMosCuQH52pQUmFgn+uwy3KD7uAvfE=; b=iUfBDYaa77P6Zmn2AUn/hcRVll4PYrfqLbUX9QNI2lxA7TE4+vXUmISjESi0Vt35yVI9kh WqHLmn+3oPbbhIvpYnhxMcyQ1XHp44r8dc8X5d9b68q1TY5trBSqV6x9aW6yeLOPD1bz3U mVhmNwhIBhet0LYNBGoUBjQMWK0zKaw= X-MC-Unique: aBnp996zNl2XRrCsH_rEQw-1 From: Hanna Reitz To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Hanna Reitz Subject: [PULL 20/35] block: Add blk_[co_]preadv_part() Date: Tue, 12 Jul 2022 20:06:02 +0200 Message-Id: <20220712180617.1362407-21-hreitz@redhat.com> In-Reply-To: <20220712180617.1362407-1-hreitz@redhat.com> References: <20220712180617.1362407-1-hreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=170.10.129.124; envelope-from=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657650367342100001 Content-Type: text/plain; charset="utf-8" From: Alberto Faria Implement blk_preadv_part() using generated_co_wrapper. Signed-off-by: Alberto Faria Reviewed-by: Paolo Bonzini Reviewed-by: Hanna Reitz Message-Id: <20220705161527.1054072-9-afaria@redhat.com> Signed-off-by: Hanna Reitz --- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 7 +++++++ block/block-backend.c | 30 +++++++++++++++++++++++------- tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/block/coroutines.h b/block/coroutines.h index 443ef2f2e6..85423f8db6 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -63,11 +63,6 @@ nbd_co_do_establish_connection(BlockDriverState *bs, boo= l blocking, Error **errp); =20 =20 -int coroutine_fn -blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, BdrvRequestFlags flags); - - int coroutine_fn blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backe= nd-io.h index cbf4422ea1..877274a999 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -107,6 +107,13 @@ int generated_co_wrapper blk_pread(BlockBackend *blk, = int64_t offset, int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes, const void *buf, BdrvRequestFlags flags); +int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset, + int64_t bytes, QEMUIOVector *qiov, + size_t qiov_offset, + BdrvRequestFlags flags); +int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, + int64_t bytes, QEMUIOVector *qiov, + size_t qiov_offset, BdrvRequestFlags f= lags); int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags); diff --git a/block/block-backend.c b/block/block-backend.c index 4d6c18bc39..49db3f63fb 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1280,9 +1280,10 @@ static void coroutine_fn blk_wait_while_drained(Bloc= kBackend *blk) } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn -blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, BdrvRequestFlags flags) +static int coroutine_fn +blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset, + BdrvRequestFlags flags) { int ret; BlockDriverState *bs; @@ -1307,7 +1308,8 @@ blk_co_do_preadv(BlockBackend *blk, int64_t offset, i= nt64_t bytes, bytes, false); } =20 - ret =3D bdrv_co_preadv(blk->root, offset, bytes, qiov, flags); + ret =3D bdrv_co_preadv_part(blk->root, offset, bytes, qiov, qiov_offse= t, + flags); bdrv_dec_in_flight(bs); return ret; } @@ -1320,7 +1322,21 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, in= t64_t offset, IO_OR_GS_CODE(); =20 blk_inc_in_flight(blk); - ret =3D blk_co_do_preadv(blk, offset, bytes, qiov, flags); + ret =3D blk_co_do_preadv_part(blk, offset, bytes, qiov, 0, flags); + blk_dec_in_flight(blk); + + return ret; +} + +int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, + int64_t bytes, QEMUIOVector *qiov, + size_t qiov_offset, BdrvRequestFlags f= lags) +{ + int ret; + IO_OR_GS_CODE(); + + blk_inc_in_flight(blk); + ret =3D blk_co_do_preadv_part(blk, offset, bytes, qiov, qiov_offset, f= lags); blk_dec_in_flight(blk); =20 return ret; @@ -1537,8 +1553,8 @@ static void blk_aio_read_entry(void *opaque) QEMUIOVector *qiov =3D rwco->iobuf; =20 assert(qiov->size =3D=3D acb->bytes); - rwco->ret =3D blk_co_do_preadv(rwco->blk, rwco->offset, acb->bytes, - qiov, rwco->flags); + rwco->ret =3D blk_co_do_preadv_part(rwco->blk, rwco->offset, acb->byte= s, qiov, + 0, rwco->flags); blk_aio_complete(acb); } =20 diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothr= ead.c index b9c5da3a87..2fa1248445 100644 --- a/tests/unit/test-block-iothread.c +++ b/tests/unit/test-block-iothread.c @@ -168,6 +168,21 @@ static void test_sync_op_blk_pwritev(BlockBackend *blk) g_assert_cmpint(ret, =3D=3D, -EIO); } =20 +static void test_sync_op_blk_preadv_part(BlockBackend *blk) +{ + uint8_t buf[512]; + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, sizeof(buf)); + int ret; + + /* Success */ + ret =3D blk_preadv_part(blk, 0, sizeof(buf), &qiov, 0, 0); + g_assert_cmpint(ret, =3D=3D, 0); + + /* Early error: Negative offset */ + ret =3D blk_preadv_part(blk, -2, sizeof(buf), &qiov, 0, 0); + g_assert_cmpint(ret, =3D=3D, -EIO); +} + static void test_sync_op_load_vmstate(BdrvChild *c) { uint8_t buf[512]; @@ -339,6 +354,10 @@ const SyncOpTest sync_op_tests[] =3D { .name =3D "/sync-op/pwritev", .fn =3D NULL, .blkfn =3D test_sync_op_blk_pwritev, + }, { + .name =3D "/sync-op/preadv_part", + .fn =3D NULL, + .blkfn =3D test_sync_op_blk_preadv_part, }, { .name =3D "/sync-op/load_vmstate", .fn =3D test_sync_op_load_vmstate, --=20 2.35.3