From nobody Fri Apr 3 10:19:01 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=1774378631; cv=none; d=zohomail.com; s=zohoarc; b=kCc+skGeWsH3iTTbjrzoJE0A6wdonB4NhJWrOEtPBWjD7ffdETRUfm2vCwDO1fFjU8fTCAZILD+vxAnmu73xPMA8/Kredfu4rl4VhAhw4QqIRGYJfgEe6igoax3PW8DaH+xty+FZt5LMdCsOjbhrhNq7oNUfiggUuIxCX/iJ8jQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774378631; 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=7bb1sau8Aoz4VRZKYzN8vn5yOtnyef9vGgg9AFx+GME=; b=j68YYVZ+f+c4YzuDpZL2j4a2TZP5PjrjMaD+JAIKhgQEnVzdJDdnfGl0ST/l5owdA+v31yv7WsrqGcl12mqG88dXAaKBb2T1bOoytUQHTpjXHLTRe0wr4vlNz1fOp1R5LK8BzJXh6gLIWy1GZ8VGYumN0kF+tm8dB0MnWhw7qFE= 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 177437863112817.30838552307307; Tue, 24 Mar 2026 11:57:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w56vh-0004ic-65; Tue, 24 Mar 2026 14:56:41 -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 1w56ve-0004gh-IU for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w56vc-0006fd-Qr for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:38 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-SPNMaiREM-2XmVvs3ZuUYw-1; Tue, 24 Mar 2026 14:56:34 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F81F18005B0; Tue, 24 Mar 2026 18:56:33 +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 9F09730002C3; Tue, 24 Mar 2026 18:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774378595; 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=7bb1sau8Aoz4VRZKYzN8vn5yOtnyef9vGgg9AFx+GME=; b=fFa5Vg2xlnLQwSTh3hZbNmGBnSXPCHaPEBZ2Xy2wRUqQsg2Vq9cWTRMLh2OsYmZ4Q7faDL 4sch9D9PqcyJASVFbRCSxNji8zakEPOUKQcD9vuJN+o8+UEBNz+u2yqQJRexdRiT/q4Mlj lb5IgDXBWok+FQQVl/BfcMjTPhVCZuo= X-MC-Unique: SPNMaiREM-2XmVvs3ZuUYw-1 X-Mimecast-MFC-AGG-ID: SPNMaiREM-2XmVvs3ZuUYw_1774378593 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 1/4] block/curl: free s->password in cleanup paths Date: Tue, 24 Mar 2026 19:56:16 +0100 Message-ID: <20260324185619.296946-2-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.129.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_H3=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=ham 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: 1774378631786158500 Content-Type: text/plain; charset="utf-8" From: GuoHan Zhao When password-secret is used, curl_open() resolves it with qcrypto_secret_lookup_as_utf8() and stores the returned buffer in s->password. Unlike s->proxypassword, s->password is not freed either in the open failure path or in curl_close(), so the resolved secret leaks once it has been allocated. Free s->password in both cleanup paths. Fixes: 1bff96064290 ('curl: add support for HTTP authentication parameters') Signed-off-by: GuoHan Zhao Message-ID: <20260320063016.262954-1-zhaoguohan_salmon@163.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/curl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/curl.c b/block/curl.c index 66aecfb20ec..419df78258b 100644 --- a/block/curl.c +++ b/block/curl.c @@ -903,6 +903,7 @@ out_noclean: g_free(s->cookie); g_free(s->url); g_free(s->username); + g_free(s->password); g_free(s->proxyusername); g_free(s->proxypassword); if (s->sockets) { @@ -1014,6 +1015,7 @@ static void curl_close(BlockDriverState *bs) g_free(s->cookie); g_free(s->url); g_free(s->username); + g_free(s->password); g_free(s->proxyusername); g_free(s->proxypassword); } --=20 2.53.0 From nobody Fri Apr 3 10:19:01 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 From nobody Fri Apr 3 10:19:01 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=1774378636; cv=none; d=zohomail.com; s=zohoarc; b=V3xBGN+Ke0tV3/LxRaXVqjB8C6mftjrpO/xUk8EWjVdI5iB0g6nTroayyC6DhaYklJeA85R+8vj7pY7ZRarZkz2txRkH7A7yjpxnJI5XHxXGefaBOlBW1pAuMURbtgJim212eRaEzShspicAApbvWdJcgOPhZZKaW8SwzZEqSig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774378636; 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=gQ8AtBpJCcmriLtHU5b0J/GoC8msMoDc+3xdWz4LnAs=; b=Vnp5p9w+iVYQvu2Pfolqy5SB3pE8jlzcXZhKsgQAmb7B4uT1BzHMYCOciY7BHmVukum/pWq1XNkdLL/qUkSSVu88FleUmEr5xrD/3UfqnidWW7C2gHFgIO/I4LHMQgnfjPHHYAUdBkRJt4aw4tl1/LBCt/ybpovMq3KbfPPnFCc= 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 1774378636918599.919840506736; Tue, 24 Mar 2026 11:57:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w56vp-0004ne-Ei; Tue, 24 Mar 2026 14:56:49 -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 1w56vk-0004kl-NI for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w56vi-0006ga-0p for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:43 -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-201-hEldPXqcPW2B0JOxpvPiOw-1; Tue, 24 Mar 2026 14:56:37 -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 9F9CC19560A7; Tue, 24 Mar 2026 18:56:36 +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 836A5300019F; Tue, 24 Mar 2026 18:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774378601; 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=gQ8AtBpJCcmriLtHU5b0J/GoC8msMoDc+3xdWz4LnAs=; b=BsMAW2zxNX6K1PxevMsy3KldhwgZu8RodYm3bpgrLFfEKCVECTvSjqmTf6V4co9ScqZ9J+ LhgRjhXmhsLKt6jXzK45TyhGV5MOwYdQcSTaSUPsZqleF8PiLStLQYGS07OggG9gyu1Rca kLeQtbnKtze87ynGwskvBTmquO8fxo4= X-MC-Unique: hEldPXqcPW2B0JOxpvPiOw-1 X-Mimecast-MFC-AGG-ID: hEldPXqcPW2B0JOxpvPiOw_1774378596 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 3/4] linux-aio: Resubmit tails of short reads/writes Date: Tue, 24 Mar 2026 19:56:18 +0100 Message-ID: <20260324185619.296946-4-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.129.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_H3=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: 1774378637998158500 Content-Type: text/plain; charset="utf-8" From: Hanna Czenczek Short reads/writes can happen. One way to reproduce them is via our FUSE export, with the following diff applied (%s/escaped // to apply -- if you put plain diffs in commit messages, git-am will apply them, and I would rather avoid breaking FUSE accidentally via this patch): escaped diff --git a/block/export/fuse.c b/block/export/fuse.c escaped index a2a478d293..67dc50a412 100644 escaped --- a/block/export/fuse.c escaped +++ b/block/export/fuse.c @@ -828,7 +828,7 @@ static ssize_t coroutine_fn GRAPH_RDLOCK fuse_co_init(FuseExport *exp, struct fuse_init_out *out, const struct fuse_init_in_compat *in) { - const uint32_t supported_flags =3D FUSE_ASYNC_READ | FUSE_ASYNC_DIO; + const uint32_t supported_flags =3D FUSE_ASYNC_READ; if (in->major !=3D 7) { error_report("FUSE major version mismatch: We have 7, but kernel h= as %" @@ -1060,6 +1060,8 @@ fuse_co_read(FuseExport *exp, void **bufptr, uint64_t= offset, uint32_t size) void *buf; int ret; + size =3D MIN(size, 4096); + /* Limited by max_read, should not happen */ if (size > FUSE_MAX_READ_BYTES) { return -EINVAL; @@ -1110,6 +1112,8 @@ fuse_co_write(FuseExport *exp, struct fuse_write_out = *out, int64_t blk_len; int ret; + size =3D MIN(size, 4096); + QEMU_BUILD_BUG_ON(FUSE_MAX_WRITE_BYTES > BDRV_REQUEST_MAX_BYTES); /* Limited by max_write, should not happen */ if (size > FUSE_MAX_WRITE_BYTES) { Then: $ ./qemu-img create -f raw test.raw 8k Formatting 'test.raw', fmt=3Draw size=3D8192 $ ./qemu-io -f raw -c 'write -P 42 0 8k' test.raw wrote 8192/8192 bytes at offset 0 8 KiB, 1 ops; 00.00 sec (64.804 MiB/sec and 8294.9003 ops/sec) $ hexdump -C test.raw 00000000 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a |**************= **| * 00002000 With aio=3Dthreads, short I/O works: $ storage-daemon/qemu-storage-daemon \ --blockdev file,node-name=3Dtest,filename=3Dtest.raw \ --export fuse,id=3Dexp,node-name=3Dtest,mountpoint=3Dtest.raw,writable= =3Dtrue Other shell: $ ./qemu-io --image-opts -c 'read -P 42 0 8k' \ driver=3Dfile,filename=3Dtest.raw,cache.direct=3Don,aio=3Dthreads read 8192/8192 bytes at offset 0 8 KiB, 1 ops; 00.00 sec (36.563 MiB/sec and 4680.0923 ops/sec) $ ./qemu-io --image-opts -c 'write -P 23 0 8k' \ driver=3Dfile,filename=3Dtest.raw,cache.direct=3Don,aio=3Dthreads wrote 8192/8192 bytes at offset 0 8 KiB, 1 ops; 00.00 sec (35.995 MiB/sec and 4607.2970 ops/sec) $ hexdump -C test.raw 00000000 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 |..............= ..| * 00002000 But with aio=3Dnative, it does not: $ ./qemu-io --image-opts -c 'read -P 23 0 8k' \ driver=3Dfile,filename=3Dtest.raw,cache.direct=3Don,aio=3Dnative Pattern verification failed at offset 0, 8192 bytes read 8192/8192 bytes at offset 0 8 KiB, 1 ops; 00.00 sec (86.155 MiB/sec and 11027.7900 ops/sec) $ ./qemu-io --image-opts -c 'write -P 42 0 8k' \ driver=3Dfile,filename=3Dtest.raw,cache.direct=3Don,aio=3Dnative write failed: No space left on device $ hexdump -C test.raw 00000000 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a |**************= **| * 00001000 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 |..............= ..| * 00002000 This patch fixes that. Reviewed-by: Kevin Wolf Signed-off-by: Hanna Czenczek Message-ID: <20260324084338.37453-3-hreitz@redhat.com> Signed-off-by: Kevin Wolf --- block/linux-aio.c | 56 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/block/linux-aio.c b/block/linux-aio.c index 3843f45eac8..0a7424fbb33 100644 --- a/block/linux-aio.c +++ b/block/linux-aio.c @@ -45,6 +45,10 @@ struct qemu_laiocb { size_t nbytes; QEMUIOVector *qiov; =20 + /* For handling short reads/writes */ + size_t total_done; + QEMUIOVector resubmit_qiov; + int fd; int type; BdrvRequestFlags flags; @@ -74,28 +78,61 @@ struct LinuxAioState { }; =20 static void ioq_submit(LinuxAioState *s); +static int laio_do_submit(struct qemu_laiocb *laiocb); =20 static inline ssize_t io_event_ret(struct io_event *ev) { return (ssize_t)(((uint64_t)ev->res2 << 32) | ev->res); } =20 +/** + * Retry tail of short requests. + */ +static int laio_resubmit_short_io(struct qemu_laiocb *laiocb, size_t done) +{ + QEMUIOVector *resubmit_qiov =3D &laiocb->resubmit_qiov; + + laiocb->total_done +=3D done; + + if (!resubmit_qiov->iov) { + qemu_iovec_init(resubmit_qiov, laiocb->qiov->niov); + } else { + qemu_iovec_reset(resubmit_qiov); + } + qemu_iovec_concat(resubmit_qiov, laiocb->qiov, + laiocb->total_done, laiocb->nbytes - laiocb->total_d= one); + + return laio_do_submit(laiocb); +} + /* * Completes an AIO request. */ static void qemu_laio_process_completion(struct qemu_laiocb *laiocb) { - int ret; + ssize_t ret; =20 ret =3D laiocb->ret; if (ret !=3D -ECANCELED) { - if (ret =3D=3D laiocb->nbytes) { + if (ret =3D=3D laiocb->nbytes - laiocb->total_done) { ret =3D 0; + } else if (ret > 0 && (laiocb->type =3D=3D QEMU_AIO_READ || + laiocb->type =3D=3D QEMU_AIO_WRITE)) { + ret =3D laio_resubmit_short_io(laiocb, ret); + if (!ret) { + return; + } } else if (ret >=3D 0) { - /* Short reads mean EOF, pad with zeros. */ + /* + * For normal reads and writes, we only get here if ret =3D=3D= 0, which + * means EOF for reads and ENOSPC for writes. + * For zone-append, we get here with any ret >=3D 0, which we = just + * treat as ENOSPC, too (safer than resubmitting, probably, bu= t not + * 100 % clear). + */ if (laiocb->type =3D=3D QEMU_AIO_READ) { - qemu_iovec_memset(laiocb->qiov, ret, 0, - laiocb->qiov->size - ret); + qemu_iovec_memset(laiocb->qiov, laiocb->total_done, 0, + laiocb->qiov->size - laiocb->total_done); } else { ret =3D -ENOSPC; } @@ -103,6 +140,9 @@ static void qemu_laio_process_completion(struct qemu_la= iocb *laiocb) } =20 laiocb->ret =3D ret; + if (laiocb->resubmit_qiov.iov) { + qemu_iovec_destroy(&laiocb->resubmit_qiov); + } =20 /* * If the coroutine is already entered it must be in ioq_submit() and @@ -379,7 +419,11 @@ static int laio_do_submit(struct qemu_laiocb *laiocb) struct iocb *iocbs =3D &laiocb->iocb; QEMUIOVector *qiov =3D laiocb->qiov; int fd =3D laiocb->fd; - off_t offset =3D laiocb->offset; + off_t offset =3D laiocb->offset + laiocb->total_done; + + if (laiocb->resubmit_qiov.iov) { + qiov =3D &laiocb->resubmit_qiov; + } =20 switch (laiocb->type) { case QEMU_AIO_WRITE: --=20 2.53.0 From nobody Fri Apr 3 10:19:01 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=1774378652; cv=none; d=zohomail.com; s=zohoarc; b=iBqQwm3Z1acxMiaAv9uuxRwadcgoo0ixWfpo86zSCEwKETdMEt/tWubNAy7mHxGStXTGFWVhQVjF8jc4P/30C6XkPKcOKtsRODn1We3Yy0ZpiiBpChhffKQJw84HMY+mSLRzBGTJ2ShSnkUPLBgaWUHlhQHozMsB6RTRWiR+uHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774378652; 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=vYLRVkEFu3u6NRtdyf4XOOl7vJtxtDskGaH7IviXuiY=; b=mok9ZJgI+LCWPv3DyftElNwh/vPzPyE0Xk8wwB9PPgvBeJHDOszU5RzzEuID+AgdV8xTn2qEooqip8SWG+/NsvWPLlMV9M6iQHgj3YOkfWVfvMxer0OfOeqlM5ec4aaClHNPnoSmNsVKFdhHYjuTqbBTDR9MCRIrcDOR3oqpswI= 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 1774378652468642.6762648190104; Tue, 24 Mar 2026 11:57:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w56vo-0004nG-1j; Tue, 24 Mar 2026 14:56:48 -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 1w56vl-0004lf-Gx for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:45 -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 1w56vi-0006gj-7o for qemu-devel@nongnu.org; Tue, 24 Mar 2026 14:56:44 -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-442-jx4g9OdBPEiQKKVwZr7gKw-1; Tue, 24 Mar 2026 14:56:39 -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 D60871955D84; Tue, 24 Mar 2026 18:56:38 +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 79F81300019F; Tue, 24 Mar 2026 18:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774378601; 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=vYLRVkEFu3u6NRtdyf4XOOl7vJtxtDskGaH7IviXuiY=; b=a1sEjUp7zcsNdIcKbA/9fq10o01xzNThTCGzUNQnWjgFa4Jhv9ecIy0pQLx3Q30yupdd/j AwjE1PkE5xS83d9WBZf78fHWlT2wCrr2SI6x6rsd4FptnrKkEVM4OGefTzEvMgF9jiIO5n vHizkKx0LpZB52Hc4SXSDRt/sDYJdDg= X-MC-Unique: jx4g9OdBPEiQKKVwZr7gKw-1 X-Mimecast-MFC-AGG-ID: jx4g9OdBPEiQKKVwZr7gKw_1774378599 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 4/4] io-uring: Resubmit tails of short writes Date: Tue, 24 Mar 2026 19:56:19 +0100 Message-ID: <20260324185619.296946-5-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=ham 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: 1774378654541154100 Content-Type: text/plain; charset="utf-8" From: Hanna Czenczek Short writes can happen, too, not just short reads. The difference to aio=3Dnative is that the kernel will actually retry the tail of short requests internally already -- so it is harder to reproduce. But if the tail of a short request returns an error to the kernel, we will see it in userspace still. To reproduce this, apply the following patch on top of the one shown in HEAD^ (again %s/escaped // to apply): escaped diff --git a/block/export/fuse.c b/block/export/fuse.c escaped index 67dc50a412..2b98489a32 100644 escaped --- a/block/export/fuse.c escaped +++ b/block/export/fuse.c @@ -1059,8 +1059,15 @@ fuse_co_read(FuseExport *exp, void **bufptr, uint64_= t offset, uint32_t size) int64_t blk_len; void *buf; int ret; + static uint32_t error_size; - size =3D MIN(size, 4096); + if (error_size =3D=3D size) { + error_size =3D 0; + return -EIO; + } else if (size > 4096) { + error_size =3D size - 4096; + size =3D 4096; + } /* Limited by max_read, should not happen */ if (size > FUSE_MAX_READ_BYTES) { @@ -1111,8 +1118,15 @@ fuse_co_write(FuseExport *exp, struct fuse_write_out= *out, { int64_t blk_len; int ret; + static uint32_t error_size; - size =3D MIN(size, 4096); + if (error_size =3D=3D size) { + error_size =3D 0; + return -EIO; + } else if (size > 4096) { + error_size =3D size - 4096; + size =3D 4096; + } QEMU_BUILD_BUG_ON(FUSE_MAX_WRITE_BYTES > BDRV_REQUEST_MAX_BYTES); /* Limited by max_write, should not happen */ I know this is a bit artificial because to produce this, there must be an I/O error somewhere anyway, but if it does happen, qemu will understand it to mean ENOSPC for short writes, which is incorrect. So I believe we need to resubmit the tail to maybe have it succeed now, or at least get the correct error code. Reproducer as before: $ ./qemu-img create -f raw test.raw 8k Formatting 'test.raw', fmt=3Draw size=3D8192 $ ./qemu-io -f raw -c 'write -P 42 0 8k' test.raw wrote 8192/8192 bytes at offset 0 8 KiB, 1 ops; 00.00 sec (64.804 MiB/sec and 8294.9003 ops/sec) $ hexdump -C test.raw 00000000 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a |**************= **| * 00002000 $ storage-daemon/qemu-storage-daemon \ --blockdev file,node-name=3Dtest,filename=3Dtest.raw \ --export fuse,id=3Dexp,node-name=3Dtest,mountpoint=3Dtest.raw,writable= =3Dtrue $ ./qemu-io --image-opts -c 'read -P 23 0 8k' \ driver=3Dfile,filename=3Dtest.raw,cache.direct=3Don,aio=3Dio_uring read 8192/8192 bytes at offset 0 8 KiB, 1 ops; 00.00 sec (58.481 MiB/sec and 7485.5342 ops/sec) $ ./qemu-io --image-opts -c 'write -P 23 0 8k' \ driver=3Dfile,filename=3Dtest.raw,cache.direct=3Don,aio=3Dio_uring write failed: No space left on device $ hexdump -C test.raw 00000000 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 |..............= ..| * 00001000 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a |**************= **| * 00002000 So short reads already work (because there is code for that), but short writes incorrectly produce ENOSPC. This patch fixes that by resubmitting not only the tail of short reads but short writes also. (And this patch uses the opportunity to make it so qemu_iovec_destroy() is called only if req->resubmit_qiov.iov is non-NULL. Functionally a non-op, but this is how the code generally checks whether the resubmit_qiov has been set up or not.) Reviewed-by: Kevin Wolf Signed-off-by: Hanna Czenczek Message-ID: <20260324084338.37453-4-hreitz@redhat.com> Signed-off-by: Kevin Wolf --- block/io_uring.c | 82 +++++++++++++++++++++++++--------------------- block/trace-events | 2 +- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/block/io_uring.c b/block/io_uring.c index cb131d3b8b5..c48a72d37eb 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -27,10 +27,10 @@ typedef struct { BdrvRequestFlags flags; =20 /* - * Buffered reads may require resubmission, see - * luring_resubmit_short_read(). + * Short reads/writes require resubmission, see + * luring_resubmit_short_io(). */ - int total_read; + int total_done; QEMUIOVector resubmit_qiov; =20 CqeHandler cqe_handler; @@ -40,10 +40,14 @@ static void luring_prep_sqe(struct io_uring_sqe *sqe, v= oid *opaque) { LuringRequest *req =3D opaque; QEMUIOVector *qiov =3D req->qiov; - uint64_t offset =3D req->offset; + uint64_t offset =3D req->offset + req->total_done; int fd =3D req->fd; BdrvRequestFlags flags =3D req->flags; =20 + if (req->resubmit_qiov.iov) { + qiov =3D &req->resubmit_qiov; + } + switch (req->type) { case QEMU_AIO_WRITE: { @@ -73,17 +77,12 @@ static void luring_prep_sqe(struct io_uring_sqe *sqe, v= oid *opaque) break; case QEMU_AIO_READ: { - if (req->resubmit_qiov.iov !=3D NULL) { - qiov =3D &req->resubmit_qiov; - } if (qiov->niov > 1) { - io_uring_prep_readv(sqe, fd, qiov->iov, qiov->niov, - offset + req->total_read); + io_uring_prep_readv(sqe, fd, qiov->iov, qiov->niov, offset); } else { /* The man page says non-vectored is faster than vectored */ struct iovec *iov =3D qiov->iov; - io_uring_prep_read(sqe, fd, iov->iov_base, iov->iov_len, - offset + req->total_read); + io_uring_prep_read(sqe, fd, iov->iov_base, iov->iov_len, offse= t); } break; } @@ -98,21 +97,26 @@ static void luring_prep_sqe(struct io_uring_sqe *sqe, v= oid *opaque) } =20 /** - * luring_resubmit_short_read: + * luring_resubmit_short_io: * - * Short reads are rare but may occur. The remaining read request needs to= be - * resubmitted. + * Short reads and writes are rare but may occur. The remaining request n= eeds + * to be resubmitted. + * + * For example, short reads can be reproduced by a FUSE export deliberately + * executing short reads. The tail of short writes is generally resubmitt= ed by + * io-uring in the kernel, but if that resubmission encounters an I/O erro= r, the + * already submitted portion will be returned as a short write. */ -static void luring_resubmit_short_read(LuringRequest *req, int nread) +static void luring_resubmit_short_io(LuringRequest *req, int ndone) { QEMUIOVector *resubmit_qiov; size_t remaining; =20 - trace_luring_resubmit_short_read(req, nread); + trace_luring_resubmit_short_io(req, ndone); =20 - /* Update read position */ - req->total_read +=3D nread; - remaining =3D req->qiov->size - req->total_read; + /* Update I/O position */ + req->total_done +=3D ndone; + remaining =3D req->qiov->size - req->total_done; =20 /* Shorten qiov */ resubmit_qiov =3D &req->resubmit_qiov; @@ -121,7 +125,7 @@ static void luring_resubmit_short_read(LuringRequest *r= eq, int nread) } else { qemu_iovec_reset(resubmit_qiov); } - qemu_iovec_concat(resubmit_qiov, req->qiov, req->total_read, remaining= ); + qemu_iovec_concat(resubmit_qiov, req->qiov, req->total_done, remaining= ); =20 aio_add_sqe(luring_prep_sqe, req, &req->cqe_handler); } @@ -153,31 +157,35 @@ static void luring_cqe_handler(CqeHandler *cqe_handle= r) return; } } else if (req->qiov) { - /* total_read is non-zero only for resubmitted read requests */ - int total_bytes =3D ret + req->total_read; + /* total_done is non-zero only for resubmitted requests */ + int total_bytes =3D ret + req->total_done; =20 if (total_bytes =3D=3D req->qiov->size) { ret =3D 0; - } else { + } else if (ret > 0 && (req->type =3D=3D QEMU_AIO_READ || + req->type =3D=3D QEMU_AIO_WRITE)) { /* Short Read/Write */ - if (req->type =3D=3D QEMU_AIO_READ) { - if (ret > 0) { - luring_resubmit_short_read(req, ret); - return; - } - - /* Pad with zeroes */ - qemu_iovec_memset(req->qiov, total_bytes, 0, - req->qiov->size - total_bytes); - ret =3D 0; - } else { - ret =3D -ENOSPC; - } + luring_resubmit_short_io(req, ret); + return; + } else if (req->type =3D=3D QEMU_AIO_READ) { + /* Read ret =3D=3D 0: EOF, pad with zeroes */ + qemu_iovec_memset(req->qiov, total_bytes, 0, + req->qiov->size - total_bytes); + ret =3D 0; + } else { + /* + * Normal write ret =3D=3D 0 means ENOSPC. + * For zone-append, we treat any 0 <=3D ret < qiov->size as EN= OSPC, + * too, because resubmitting the tail seems a little unsafe. + */ + ret =3D -ENOSPC; } } =20 req->ret =3D ret; - qemu_iovec_destroy(&req->resubmit_qiov); + if (req->resubmit_qiov.iov) { + qemu_iovec_destroy(&req->resubmit_qiov); + } =20 /* * If the coroutine is already entered it must be in luring_co_submit(= ) and diff --git a/block/trace-events b/block/trace-events index d170fc96f15..950c82d4b80 100644 --- a/block/trace-events +++ b/block/trace-events @@ -64,7 +64,7 @@ file_paio_submit(void *acb, void *opaque, int64_t offset,= int count, int type) " # io_uring.c luring_cqe_handler(void *req, int ret) "req %p ret %d" luring_co_submit(void *bs, void *req, int fd, uint64_t offset, size_t nbyt= es, int type) "bs %p req %p fd %d offset %" PRId64 " nbytes %zd type %d" -luring_resubmit_short_read(void *req, int nread) "req %p nread %d" +luring_resubmit_short_io(void *req, int ndone) "req %p ndone %d" =20 # qcow2.c qcow2_add_task(void *co, void *bs, void *pool, const char *action, int clu= ster_type, uint64_t host_offset, uint64_t offset, uint64_t bytes, void *qio= v, size_t qiov_offset) "co %p bs %p pool %p: %s: cluster_type %d file_clust= er_offset %" PRIu64 " offset %" PRIu64 " bytes %" PRIu64 " qiov %p qiov_off= set %zu" --=20 2.53.0