From nobody Fri Apr 3 13:26:54 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1774378621; cv=none; d=zohomail.com; s=zohoarc; b=ZvPUvApfHWCJyy+cxyP0Pv4HzQuCB0rUvNPgpTE/3ShDCQqRrrnpbLwuow3Fioa/1Rke4K+tL96Pcji3/XaUjMuI4om0GMt9jtVFvm6UZ0emiCwx9+LSjJ4UsBWyGh7Taui0OghGWVtdAkD3rLBPYn6BsipDNmLIBn3zMZYnJOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774378621; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=n/kz/EbBManwbwqOFr9w7wqzOWYTFtYaBHtqnJV1FiE=; b=Me1FVIddxr6a1KASvy88vKo+LuBetoHdJlS+Ur2KjBoAxDRvPnbUHOLKhPb2VXTmlUgBz/NkWeZXM2lcwkFgVXSwNOpq4QEDk1LJZT0wnGzGWTr/s7yTA6ktL9VZH5HKcBtJ7ZtuGw7s+7WQ+Y77BB3+7Fysblh26CkPYf8Z0/g= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774378621371933.3823828673508; Tue, 24 Mar 2026 11:57:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w56vm-0004m0-Ic; Tue, 24 Mar 2026 14:56:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w56vh-0004kT-Rd for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w56vg-0006gF-CD for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:41 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-172-tg1DVQbFN5OVu6kB5qrIlQ-1; Tue, 24 Mar 2026 14:56:35 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CFDA919560A2; Tue, 24 Mar 2026 18:56:34 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.44.33.246]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B3AF43000223; Tue, 24 Mar 2026 18:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774378599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n/kz/EbBManwbwqOFr9w7wqzOWYTFtYaBHtqnJV1FiE=; b=DTjtbHXe0UYalSzS+t/pbZataDLyafkAqDQMEtkq5wO7K+ejtPYb69SS+/Bj1SkLmcMCyg rktMFq/2oRbHypfzH5PyP0vE8ftkQ3HqwZZJ8VMtPrQExOvxhDheJbFFM3DCOufT+6Akln OnAXhC2mnEJZta2z4H9TQ0gOjhjZAIs= X-MC-Unique: tg1DVQbFN5OVu6kB5qrIlQ-1 X-Mimecast-MFC-AGG-ID: tg1DVQbFN5OVu6kB5qrIlQ_1774378594 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 2/4] linux-aio: Put all parameters into qemu_laiocb Date: Tue, 24 Mar 2026 19:56:17 +0100 Message-ID: <20260324185619.296946-3-kwolf@redhat.com> In-Reply-To: <20260324185619.296946-1-kwolf@redhat.com> References: <20260324185619.296946-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.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.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1774378623713158500 Content-Type: text/plain; charset="utf-8" From: Hanna Czenczek Put all request parameters into the qemu_laiocb struct, which will allow re-submitting the tail of short reads/writes. Reviewed-by: Kevin Wolf Signed-off-by: Hanna Czenczek Message-ID: <20260324084338.37453-2-hreitz@redhat.com> Signed-off-by: Kevin Wolf --- block/linux-aio.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/block/linux-aio.c b/block/linux-aio.c index 53c3e9af8ae..3843f45eac8 100644 --- a/block/linux-aio.c +++ b/block/linux-aio.c @@ -41,9 +41,15 @@ struct qemu_laiocb { LinuxAioState *ctx; struct iocb iocb; ssize_t ret; + off_t offset; size_t nbytes; QEMUIOVector *qiov; - bool is_read; + + int fd; + int type; + BdrvRequestFlags flags; + + uint64_t dev_max_batch; QSIMPLEQ_ENTRY(qemu_laiocb) next; }; =20 @@ -87,7 +93,7 @@ static void qemu_laio_process_completion(struct qemu_laio= cb *laiocb) ret =3D 0; } else if (ret >=3D 0) { /* Short reads mean EOF, pad with zeros. */ - if (laiocb->is_read) { + if (laiocb->type =3D=3D QEMU_AIO_READ) { qemu_iovec_memset(laiocb->qiov, ret, 0, laiocb->qiov->size - ret); } else { @@ -367,23 +373,23 @@ static void laio_deferred_fn(void *opaque) } } =20 -static int laio_do_submit(int fd, struct qemu_laiocb *laiocb, off_t offset, - int type, BdrvRequestFlags flags, - uint64_t dev_max_batch) +static int laio_do_submit(struct qemu_laiocb *laiocb) { LinuxAioState *s =3D laiocb->ctx; struct iocb *iocbs =3D &laiocb->iocb; QEMUIOVector *qiov =3D laiocb->qiov; + int fd =3D laiocb->fd; + off_t offset =3D laiocb->offset; =20 - switch (type) { + switch (laiocb->type) { case QEMU_AIO_WRITE: #ifdef HAVE_IO_PREP_PWRITEV2 { - int laio_flags =3D (flags & BDRV_REQ_FUA) ? RWF_DSYNC : 0; + int laio_flags =3D (laiocb->flags & BDRV_REQ_FUA) ? RWF_DSYNC : 0; io_prep_pwritev2(iocbs, fd, qiov->iov, qiov->niov, offset, laio_fl= ags); } #else - assert(flags =3D=3D 0); + assert(laiocb->flags =3D=3D 0); io_prep_pwritev(iocbs, fd, qiov->iov, qiov->niov, offset); #endif break; @@ -399,7 +405,7 @@ static int laio_do_submit(int fd, struct qemu_laiocb *l= aiocb, off_t offset, /* Currently Linux kernel does not support other operations */ default: fprintf(stderr, "%s: invalid AIO request type 0x%x.\n", - __func__, type); + __func__, laiocb->type); return -EIO; } io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e)); @@ -407,7 +413,7 @@ static int laio_do_submit(int fd, struct qemu_laiocb *l= aiocb, off_t offset, QSIMPLEQ_INSERT_TAIL(&s->io_q.pending, laiocb, next); s->io_q.in_queue++; if (!s->io_q.blocked) { - if (s->io_q.in_queue >=3D laio_max_batch(s, dev_max_batch)) { + if (s->io_q.in_queue >=3D laio_max_batch(s, laiocb->dev_max_batch)= ) { ioq_submit(s); } else { defer_call(laio_deferred_fn, s); @@ -425,14 +431,18 @@ int coroutine_fn laio_co_submit(int fd, uint64_t offs= et, QEMUIOVector *qiov, AioContext *ctx =3D qemu_get_current_aio_context(); struct qemu_laiocb laiocb =3D { .co =3D qemu_coroutine_self(), + .offset =3D offset, .nbytes =3D qiov ? qiov->size : 0, .ctx =3D aio_get_linux_aio(ctx), .ret =3D -EINPROGRESS, - .is_read =3D (type =3D=3D QEMU_AIO_READ), .qiov =3D qiov, + .fd =3D fd, + .type =3D type, + .flags =3D flags, + .dev_max_batch =3D dev_max_batch, }; =20 - ret =3D laio_do_submit(fd, &laiocb, offset, type, flags, dev_max_batch= ); + ret =3D laio_do_submit(&laiocb); if (ret < 0) { return ret; } --=20 2.53.0