{"id":2215516,"url":"http://patchwork.ozlabs.org/api/patches/2215516/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260324185619.296946-3-kwolf@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260324185619.296946-3-kwolf@redhat.com>","list_archive_url":null,"date":"2026-03-24T18:56:17","name":"[PULL,2/4] linux-aio: Put all parameters into qemu_laiocb","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5434a12c0d5b5eb4b7449d898f9f25bd5e7ca6f5","submitter":{"id":2714,"url":"http://patchwork.ozlabs.org/api/people/2714/?format=json","name":"Kevin Wolf","email":"kwolf@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260324185619.296946-3-kwolf@redhat.com/mbox/","series":[{"id":497329,"url":"http://patchwork.ozlabs.org/api/series/497329/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=497329","date":"2026-03-24T18:56:15","name":"[PULL,1/4] block/curl: free s->password in cleanup paths","version":1,"mbox":"http://patchwork.ozlabs.org/series/497329/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2215516/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2215516/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=DTjtbHXe;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgK5p2G17z1yFq\n\tfor ; Wed, 25 Mar 2026 05:57:02 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1w56vm-0004m0-Ic; Tue, 24 Mar 2026 14:56:46 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1w56vh-0004kT-Rd\n for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:44 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1w56vg-0006gF-CD\n for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:41 -0400","from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-172-tg1DVQbFN5OVu6kB5qrIlQ-1; Tue,\n 24 Mar 2026 14:56:35 -0400","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id CFDA919560A2; Tue, 24 Mar 2026 18:56:34 +0000 (UTC)","from merkur.fritz.box (unknown [10.44.33.246])\n by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id B3AF43000223; Tue, 24 Mar 2026 18:56:33 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1774378599;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=n/kz/EbBManwbwqOFr9w7wqzOWYTFtYaBHtqnJV1FiE=;\n b=DTjtbHXe0UYalSzS+t/pbZataDLyafkAqDQMEtkq5wO7K+ejtPYb69SS+/Bj1SkLmcMCyg\n rktMFq/2oRbHypfzH5PyP0vE8ftkQ3HqwZZJ8VMtPrQExOvxhDheJbFFM3DCOufT+6Akln\n 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,\n\tqemu-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":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com;\n 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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Hanna Czenczek \n\nPut all request parameters into the qemu_laiocb struct, which will allow\nre-submitting the tail of short reads/writes.\n\nReviewed-by: Kevin Wolf \nSigned-off-by: Hanna Czenczek \nMessage-ID: <20260324084338.37453-2-hreitz@redhat.com>\nSigned-off-by: Kevin Wolf \n---\n block/linux-aio.c | 34 ++++++++++++++++++++++------------\n 1 file changed, 22 insertions(+), 12 deletions(-)","diff":"diff --git a/block/linux-aio.c b/block/linux-aio.c\nindex 53c3e9af8ae..3843f45eac8 100644\n--- a/block/linux-aio.c\n+++ b/block/linux-aio.c\n@@ -41,9 +41,15 @@ struct qemu_laiocb {\n LinuxAioState *ctx;\n struct iocb iocb;\n ssize_t ret;\n+ off_t offset;\n size_t nbytes;\n QEMUIOVector *qiov;\n- bool is_read;\n+\n+ int fd;\n+ int type;\n+ BdrvRequestFlags flags;\n+\n+ uint64_t dev_max_batch;\n QSIMPLEQ_ENTRY(qemu_laiocb) next;\n };\n \n@@ -87,7 +93,7 @@ static void qemu_laio_process_completion(struct qemu_laiocb *laiocb)\n ret = 0;\n } else if (ret >= 0) {\n /* Short reads mean EOF, pad with zeros. */\n- if (laiocb->is_read) {\n+ if (laiocb->type == QEMU_AIO_READ) {\n qemu_iovec_memset(laiocb->qiov, ret, 0,\n laiocb->qiov->size - ret);\n } else {\n@@ -367,23 +373,23 @@ static void laio_deferred_fn(void *opaque)\n }\n }\n \n-static int laio_do_submit(int fd, struct qemu_laiocb *laiocb, off_t offset,\n- int type, BdrvRequestFlags flags,\n- uint64_t dev_max_batch)\n+static int laio_do_submit(struct qemu_laiocb *laiocb)\n {\n LinuxAioState *s = laiocb->ctx;\n struct iocb *iocbs = &laiocb->iocb;\n QEMUIOVector *qiov = laiocb->qiov;\n+ int fd = laiocb->fd;\n+ off_t offset = laiocb->offset;\n \n- switch (type) {\n+ switch (laiocb->type) {\n case QEMU_AIO_WRITE:\n #ifdef HAVE_IO_PREP_PWRITEV2\n {\n- int laio_flags = (flags & BDRV_REQ_FUA) ? RWF_DSYNC : 0;\n+ int laio_flags = (laiocb->flags & BDRV_REQ_FUA) ? RWF_DSYNC : 0;\n io_prep_pwritev2(iocbs, fd, qiov->iov, qiov->niov, offset, laio_flags);\n }\n #else\n- assert(flags == 0);\n+ assert(laiocb->flags == 0);\n io_prep_pwritev(iocbs, fd, qiov->iov, qiov->niov, offset);\n #endif\n break;\n@@ -399,7 +405,7 @@ static int laio_do_submit(int fd, struct qemu_laiocb *laiocb, off_t offset,\n /* Currently Linux kernel does not support other operations */\n default:\n fprintf(stderr, \"%s: invalid AIO request type 0x%x.\\n\",\n- __func__, type);\n+ __func__, laiocb->type);\n return -EIO;\n }\n io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e));\n@@ -407,7 +413,7 @@ static int laio_do_submit(int fd, struct qemu_laiocb *laiocb, off_t offset,\n QSIMPLEQ_INSERT_TAIL(&s->io_q.pending, laiocb, next);\n s->io_q.in_queue++;\n if (!s->io_q.blocked) {\n- if (s->io_q.in_queue >= laio_max_batch(s, dev_max_batch)) {\n+ if (s->io_q.in_queue >= laio_max_batch(s, laiocb->dev_max_batch)) {\n ioq_submit(s);\n } else {\n defer_call(laio_deferred_fn, s);\n@@ -425,14 +431,18 @@ int coroutine_fn laio_co_submit(int fd, uint64_t offset, QEMUIOVector *qiov,\n AioContext *ctx = qemu_get_current_aio_context();\n struct qemu_laiocb laiocb = {\n .co = qemu_coroutine_self(),\n+ .offset = offset,\n .nbytes = qiov ? qiov->size : 0,\n .ctx = aio_get_linux_aio(ctx),\n .ret = -EINPROGRESS,\n- .is_read = (type == QEMU_AIO_READ),\n .qiov = qiov,\n+ .fd = fd,\n+ .type = type,\n+ .flags = flags,\n+ .dev_max_batch = dev_max_batch,\n };\n \n- ret = laio_do_submit(fd, &laiocb, offset, type, flags, dev_max_batch);\n+ ret = laio_do_submit(&laiocb);\n if (ret < 0) {\n return ret;\n }\n","prefixes":["PULL","2/4"]}