From patchwork Mon Jul 15 20:19:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 11044929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4851513B1 for ; Mon, 15 Jul 2019 20:20:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 345A728553 for ; Mon, 15 Jul 2019 20:20:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 224A528560; Mon, 15 Jul 2019 20:20:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B952428553 for ; Mon, 15 Jul 2019 20:20:28 +0000 (UTC) Received: from localhost ([::1]:42610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn7SQ-0005uB-Bb for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Jul 2019 16:20:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55260) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn7SB-0004sD-G4 for qemu-devel@nongnu.org; Mon, 15 Jul 2019 16:20:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn7SA-0007RY-FJ for qemu-devel@nongnu.org; Mon, 15 Jul 2019 16:20:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47034) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn7S8-0007Pm-AU; Mon, 15 Jul 2019 16:20:04 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A463CC00C7DD; Mon, 15 Jul 2019 20:20:03 +0000 (UTC) Received: from localhost (ovpn-117-120.ams2.redhat.com [10.36.117.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7590A1001B35; Mon, 15 Jul 2019 20:19:58 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 21:19:48 +0100 Message-Id: <20190715201950.9444-2-stefanha@redhat.com> In-Reply-To: <20190715201950.9444-1-stefanha@redhat.com> References: <20190715201950.9444-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 15 Jul 2019 20:20:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] block/io_uring: add submission and completion trace events X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP It is useful to follow individual requests as they are submitted. Add trace events that show details of each request. Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé --- block/io_uring.c | 5 +++++ block/trace-events | 3 +++ 2 files changed, 8 insertions(+) diff --git a/block/io_uring.c b/block/io_uring.c index 22e8d3d9ca..19919da4c9 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -128,6 +128,8 @@ static void luring_process_completions(LuringState *s) LuringAIOCB *luringcb = io_uring_cqe_get_data(cqes); ret = cqes->res; + trace_luring_process_completion(s, luringcb, ret); + if (ret == luringcb->qiov->size) { ret = 0; } else if (ret >= 0) { @@ -233,6 +235,7 @@ static int ioq_submit(LuringState *s) QSIMPLEQ_REMOVE_HEAD(&s->io_q.sq_overflow, next); } ret = io_uring_submit(&s->ring); + trace_luring_io_uring_submit(s, ret); /* Prevent infinite loop if submission is refused */ if (ret <= 0) { if (ret == -EAGAIN) { @@ -339,6 +342,8 @@ int coroutine_fn luring_co_submit(BlockDriverState *bs, LuringState *s, int fd, .is_read = (type == QEMU_AIO_READ), }; + trace_luring_co_submit(bs, s, &luringcb, fd, offset, qiov ? qiov->size : 0, type); + ret = luring_do_submit(fd, &luringcb, s, offset, type); if (ret < 0) { return ret; diff --git a/block/trace-events b/block/trace-events index 069779773b..02952fe4cb 100644 --- a/block/trace-events +++ b/block/trace-events @@ -67,6 +67,9 @@ luring_io_plug(void *s) "LuringState %p plug" luring_io_unplug(void *s, int blocked, int plugged, int queued, int inflight) "LuringState %p blocked %d plugged %d queued %d inflight %d" luring_do_submit(void *s, int blocked, int plugged, int queued, int inflight) "LuringState %p blocked %d plugged %d queued %d inflight %d" luring_do_submit_done(void *s, int ret) "LuringState %p submitted to kernel %d" +luring_co_submit(void *bs, void *s, void *luringcb, int fd, uint64_t offset, size_t nbytes, int type) "bs %p s %p luringcb %p fd %d offset %" PRId64 " nbytes %zd type %d" +luring_process_completion(void *s, void *aiocb, int ret) "LuringState %p luringcb %p ret %d" +luring_io_uring_submit(void *s, int ret) "LuringState %p ret %d" # qcow2.c qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d" From patchwork Mon Jul 15 20:19:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 11044953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 50D9E14F6 for ; Mon, 15 Jul 2019 20:20:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41716205A8 for ; Mon, 15 Jul 2019 20:20:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35573262FF; Mon, 15 Jul 2019 20:20:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA5C8205A8 for ; Mon, 15 Jul 2019 20:20:43 +0000 (UTC) Received: from localhost ([::1]:42628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn7Sk-0007RQ-Tg for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Jul 2019 16:20:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55317) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn7SK-0005Wa-Sf for qemu-devel@nongnu.org; Mon, 15 Jul 2019 16:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn7SJ-0007ax-GW for qemu-devel@nongnu.org; Mon, 15 Jul 2019 16:20:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn7SG-0007Xn-Sk; Mon, 15 Jul 2019 16:20:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D39EB85360; Mon, 15 Jul 2019 20:20:10 +0000 (UTC) Received: from localhost (ovpn-117-120.ams2.redhat.com [10.36.117.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDCE819C59; Mon, 15 Jul 2019 20:20:04 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 21:19:49 +0100 Message-Id: <20190715201950.9444-3-stefanha@redhat.com> In-Reply-To: <20190715201950.9444-1-stefanha@redhat.com> References: <20190715201950.9444-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 15 Jul 2019 20:20:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] block/io_uring: fix EINTR request resubmission X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Adding the request to sq_overflow isn't enough: 1. luringcb->sqeq is uninitialized if there was space in the sq ring at submission time. 2. Not all code paths invoke ioq_submit() after processing completions, so the request could hang. Additional bugs include checking for EINTR instead of -EINTR and forgetting to skip the completion callback when a request is resubmitted. Fix this by always initializing luringcb->sqeq and ensuring that all code paths invoke ioq_submit() after appending to sq_overflow. Ensure that luring_process_completions() marks the cqe seen and decrements in_flight before resubmitting the request. Signed-off-by: Stefan Hajnoczi --- block/io_uring.c | 64 ++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/block/io_uring.c b/block/io_uring.c index 19919da4c9..97e4f876d7 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -87,6 +87,18 @@ int luring_register_fd(LuringState *s, unsigned int fd) s->fd.head, s->fd.size); } +/** + * luring_resubmit: + * + * Resubmit a request by appending it to sq_overflow. The caller must ensure + * that ioq_submit() is called later so that sq_overflow requests are started. + */ +static void luring_resubmit(LuringState *s, LuringAIOCB *luringcb) +{ + QSIMPLEQ_INSERT_TAIL(&s->io_q.sq_overflow, luringcb, next); + s->io_q.in_queue++; +} + /** * luring_process_completions: * @s: AIO state @@ -102,7 +114,6 @@ int luring_register_fd(LuringState *s, unsigned int fd) static void luring_process_completions(LuringState *s) { struct io_uring_cqe *cqes; - int ret; /* * Request completion callbacks can run the nested event loop. @@ -122,11 +133,20 @@ static void luring_process_completions(LuringState *s) qemu_bh_schedule(s->completion_bh); while (io_uring_peek_cqe(&s->ring, &cqes) == 0) { + LuringAIOCB *luringcb; + int ret; + if (!cqes) { break; } - LuringAIOCB *luringcb = io_uring_cqe_get_data(cqes); + + luringcb = io_uring_cqe_get_data(cqes); ret = cqes->res; + io_uring_cqe_seen(&s->ring, cqes); + cqes = NULL; + + /* Change counters one-by-one because we can be nested. */ + s->io_q.in_flight--; trace_luring_process_completion(s, luringcb, ret); @@ -143,17 +163,12 @@ static void luring_process_completions(LuringState *s) ret = -ENOSPC;; } /* Add to overflow queue to be resubmitted later */ - } else if (ret == EINTR) { - QSIMPLEQ_INSERT_TAIL(&s->io_q.sq_overflow, luringcb, next); + } else if (ret == -EINTR) { + luring_resubmit(s, luringcb); + continue; } luringcb->ret = ret; - - io_uring_cqe_seen(&s->ring, cqes); - cqes = NULL; - /* Change counters one-by-one because we can be nested. */ - s->io_q.in_flight--; - /* * If the coroutine is already entered it must be in ioq_submit() * and will notice luringcb->ret has been filled in when it @@ -245,16 +260,16 @@ static int ioq_submit(LuringState *s) } s->io_q.in_flight += ret; s->io_q.in_queue -= ret; + + if (s->io_q.in_flight) { + /* + * We can try to complete something just right away if there are + * still requests in-flight. + */ + luring_process_completions(s); + } } s->io_q.blocked = (s->io_q.in_queue > 0); - - if (s->io_q.in_flight) { - /* - * We can try to complete something just right away if there are - * still requests in-flight. - */ - luring_process_completions(s); - } return ret; } @@ -290,15 +305,7 @@ static int luring_do_submit(int fd, LuringAIOCB *luringcb, LuringState *s, uint64_t offset, int type) { int ret; - struct io_uring_sqe *sqes = io_uring_get_sqe(&s->ring); - /* - *If the ring is full and cannot fetch new sqes, add the request to - * to an overflow queue to be submitted later - */ - if (!sqes) { - sqes = &luringcb->sqeq; - QSIMPLEQ_INSERT_TAIL(&s->io_q.sq_overflow, luringcb, next); - } + struct io_uring_sqe *sqes = &luringcb->sqeq; switch (type) { case QEMU_AIO_WRITE: @@ -318,7 +325,10 @@ static int luring_do_submit(int fd, LuringAIOCB *luringcb, LuringState *s, abort(); } io_uring_sqe_set_data(sqes, luringcb); + + QSIMPLEQ_INSERT_TAIL(&s->io_q.sq_overflow, luringcb, next); s->io_q.in_queue++; + trace_luring_do_submit(s, s->io_q.blocked, s->io_q.plugged, s->io_q.in_queue, s->io_q.in_flight); if (!s->io_q.blocked && From patchwork Mon Jul 15 20:19:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 11044951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D116613B1 for ; Mon, 15 Jul 2019 20:20:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C192F26246 for ; Mon, 15 Jul 2019 20:20:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5BAB262FF; Mon, 15 Jul 2019 20:20:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 374B6205A8 for ; Mon, 15 Jul 2019 20:20:43 +0000 (UTC) Received: from localhost ([::1]:42626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn7Sk-0007NR-Ab for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Jul 2019 16:20:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55350) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn7SQ-0005yH-ND for qemu-devel@nongnu.org; Mon, 15 Jul 2019 16:20:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn7SP-0007hz-BJ for qemu-devel@nongnu.org; Mon, 15 Jul 2019 16:20:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44642) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn7SM-0007co-93; Mon, 15 Jul 2019 16:20:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9514983E; Mon, 15 Jul 2019 20:20:17 +0000 (UTC) Received: from localhost (ovpn-117-120.ams2.redhat.com [10.36.117.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A9DF5B681; Mon, 15 Jul 2019 20:20:12 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 21:19:50 +0100 Message-Id: <20190715201950.9444-4-stefanha@redhat.com> In-Reply-To: <20190715201950.9444-1-stefanha@redhat.com> References: <20190715201950.9444-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 15 Jul 2019 20:20:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] block/io_uring: resubmit short buffered reads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The io_uring API had unusual read behavior up until recently, where short reads could occur when the start of the file range was in the page cache and a later portion was not in the page cache. Normally read(2) does not expose this detail to applications and this behavior has been fixed in Linux commit 9d93a3f5a0c ("io_uring: punt short reads to async * context"). In the meantime Linux distros have shipped kernels where io_uring exhibits the old behavior and there is no simple way to detect it. Add a slow path for resubmitting short read requests. The idea is simple: shorten the iovecs and increment the file offset each time a short read occurs and then resubmit the request. The implementation requires adding additional fields to LuringAIOCB to keep track of where we were. Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé --- block/io_uring.c | 75 +++++++++++++++++++++++++++++++++++++++------- block/trace-events | 3 +- 2 files changed, 67 insertions(+), 11 deletions(-) diff --git a/block/io_uring.c b/block/io_uring.c index 97e4f876d7..12cef71175 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -28,6 +28,12 @@ typedef struct LuringAIOCB { QEMUIOVector *qiov; bool is_read; QSIMPLEQ_ENTRY(LuringAIOCB) next; + + /* Buffered reads may require resubmission, see + * luring_resubmit_short_read(). + */ + int total_read; + QEMUIOVector resubmit_qiov; } LuringAIOCB; typedef struct LuringQueue { @@ -99,6 +105,43 @@ static void luring_resubmit(LuringState *s, LuringAIOCB *luringcb) s->io_q.in_queue++; } +/* Before Linux commit 9d93a3f5a0c ("io_uring: punt short reads to async + * context") a buffered I/O request with the start of the file range in the + * page cache could result in a short read. Applications need to resubmit the + * remaining read request. + * + * This is a slow path but recent kernels never take it. + */ +static void luring_resubmit_short_read(LuringState *s, LuringAIOCB *luringcb, + int nread) +{ + QEMUIOVector *resubmit_qiov; + size_t remaining; + + trace_luring_resubmit_short_read(s, luringcb, nread); + + /* Update read position */ + luringcb->total_read += nread; + remaining = luringcb->qiov->size - luringcb->total_read; + + /* Shorten qiov */ + resubmit_qiov = &luringcb->resubmit_qiov; + if (resubmit_qiov->iov == NULL) { + qemu_iovec_init(resubmit_qiov, luringcb->qiov->niov); + } else { + qemu_iovec_reset(resubmit_qiov); + } + qemu_iovec_concat(resubmit_qiov, luringcb->qiov, luringcb->total_read, + remaining); + + /* Update sqe */ + luringcb->sqeq.off += nread; + luringcb->sqeq.addr = (__u64)(uintptr_t)luringcb->resubmit_qiov.iov; + luringcb->sqeq.len = luringcb->resubmit_qiov.niov; + + luring_resubmit(s, luringcb); +} + /** * luring_process_completions: * @s: AIO state @@ -135,6 +178,7 @@ static void luring_process_completions(LuringState *s) while (io_uring_peek_cqe(&s->ring, &cqes) == 0) { LuringAIOCB *luringcb; int ret; + int total_bytes; if (!cqes) { break; @@ -150,25 +194,36 @@ static void luring_process_completions(LuringState *s) trace_luring_process_completion(s, luringcb, ret); - if (ret == luringcb->qiov->size) { + /* total_read is non-zero only for resubmitted read requests */ + total_bytes = ret + luringcb->total_read; + + if (ret < 0) { + if (ret == -EINTR) { + luring_resubmit(s, luringcb); + continue; + } + } else if (total_bytes == luringcb->qiov->size) { ret = 0; - } else if (ret >= 0) { + } else { /* Short Read/Write */ if (luringcb->is_read) { - /* Read, pad with zeroes */ - qemu_iovec_memset(luringcb->qiov, ret, 0, - luringcb->qiov->size - ret); - ret = 0; + if (ret > 0) { + luring_resubmit_short_read(s, luringcb, ret); + continue; + } else { + /* Pad with zeroes */ + qemu_iovec_memset(luringcb->qiov, total_bytes, 0, + luringcb->qiov->size - total_bytes); + ret = 0; + } } else { ret = -ENOSPC;; } - /* Add to overflow queue to be resubmitted later */ - } else if (ret == -EINTR) { - luring_resubmit(s, luringcb); - continue; } luringcb->ret = ret; + qemu_iovec_destroy(&luringcb->resubmit_qiov); + /* * If the coroutine is already entered it must be in ioq_submit() * and will notice luringcb->ret has been filled in when it diff --git a/block/trace-events b/block/trace-events index 02952fe4cb..f434cac634 100644 --- a/block/trace-events +++ b/block/trace-events @@ -60,7 +60,7 @@ qmp_block_stream(void *bs) "bs %p" file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int type) "acb %p opaque %p offset %"PRId64" count %d type %d" file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"PRIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64 -#io_uring.c +# io_uring.c luring_init_state(void *s, size_t size) "s %p size %zu" luring_cleanup_state(void *s) "%p freed" luring_io_plug(void *s) "LuringState %p plug" @@ -70,6 +70,7 @@ luring_do_submit_done(void *s, int ret) "LuringState %p submitted to kernel %d" luring_co_submit(void *bs, void *s, void *luringcb, int fd, uint64_t offset, size_t nbytes, int type) "bs %p s %p luringcb %p fd %d offset %" PRId64 " nbytes %zd type %d" luring_process_completion(void *s, void *aiocb, int ret) "LuringState %p luringcb %p ret %d" luring_io_uring_submit(void *s, int ret) "LuringState %p ret %d" +luring_resubmit_short_read(void *s, void *luringcb, int nread) "LuringState %p luringcb %p nread %d" # qcow2.c qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"