From: Andreas Gruenbacher <agruenba@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christoph Hellwig <hch@infradead.org>,
"Darrick J. Wong" <djwong@kernel.org>
Cc: Jan Kara <jack@suse.cz>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-kernel@vger.kernel.org, cluster-devel@redhat.com,
linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH v7 15/19] iomap: Support partial direct I/O on user copy failures
Date: Fri, 27 Aug 2021 18:49:22 +0200 [thread overview]
Message-ID: <20210827164926.1726765-16-agruenba@redhat.com> (raw)
In-Reply-To: <20210827164926.1726765-1-agruenba@redhat.com>
In iomap_dio_rw, when iomap_apply returns an -EFAULT error and the
IOMAP_DIO_PARTIAL flag is set, complete the request synchronously and
return a partial result. This allows the caller to deal with the page
fault and retry the remainder of the request.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/iomap/direct-io.c | 6 ++++++
include/linux/iomap.h | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 8054f5d6c273..ba88fe51b77a 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -561,6 +561,12 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
ret = iomap_apply(inode, pos, count, iomap_flags, ops, dio,
iomap_dio_actor);
if (ret <= 0) {
+ if (ret == -EFAULT && dio->size &&
+ (dio_flags & IOMAP_DIO_PARTIAL)) {
+ wait_for_completion = true;
+ ret = 0;
+ }
+
/* magic error code to fall back to buffered I/O */
if (ret == -ENOTBLK) {
wait_for_completion = true;
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 479c1da3e221..bcae4814b8e3 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -267,6 +267,13 @@ struct iomap_dio_ops {
*/
#define IOMAP_DIO_OVERWRITE_ONLY (1 << 1)
+/*
+ * When a page fault occurs, return a partial synchronous result and allow
+ * the caller to retry the rest of the operation after dealing with the page
+ * fault.
+ */
+#define IOMAP_DIO_PARTIAL (1 << 2)
+
ssize_t iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
const struct iomap_ops *ops, const struct iomap_dio_ops *dops,
unsigned int dio_flags);
--
2.26.3
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2021-08-27 16:54 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 16:49 [Ocfs2-devel] [PATCH v7 00/19] gfs2: Fix mmap + page fault deadlocks Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 01/19] iov_iter: Fix iov_iter_get_pages{, _alloc} page fault return value Andreas Gruenbacher
2021-09-09 11:09 ` Christoph Hellwig
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 02/19] powerpc/kvm: Fix kvm_use_magic_page Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 03/19] gup: Turn fault_in_pages_{readable, writeable} into fault_in_{readable, writeable} Andreas Gruenbacher
2021-08-27 19:08 ` Al Viro
2021-09-03 14:56 ` Filipe Manana
2021-09-28 15:02 ` Andreas Gruenbacher
2021-09-28 16:37 ` Matthew Wilcox
2021-09-28 20:41 ` Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 04/19] iov_iter: Turn iov_iter_fault_in_readable into fault_in_iov_iter_readable Andreas Gruenbacher
2021-08-27 18:53 ` Al Viro
2021-08-27 18:57 ` Linus Torvalds
2021-08-27 19:16 ` Al Viro
2021-08-27 20:56 ` Kari Argillander
2021-08-28 17:13 ` Linus Torvalds
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 05/19] iov_iter: Introduce fault_in_iov_iter_writeable Andreas Gruenbacher
2021-08-27 18:49 ` Al Viro
2021-08-27 19:05 ` Linus Torvalds
2021-08-27 19:23 ` Al Viro
2021-08-27 19:33 ` Linus Torvalds
2021-08-27 19:37 ` Al Viro
2021-08-27 21:48 ` Al Viro
2021-08-27 21:57 ` Al Viro
2021-08-27 23:22 ` Luck, Tony
2021-08-28 2:20 ` Luck, Tony
2021-08-28 21:47 ` Thomas Gleixner
2021-08-28 22:04 ` Al Viro
2021-08-28 22:11 ` Al Viro
2021-08-28 22:19 ` Al Viro
2021-08-28 22:51 ` Al Viro
2021-08-29 18:44 ` Thomas Gleixner
2021-08-29 19:46 ` Al Viro
2021-08-29 19:51 ` Thomas Gleixner
2021-08-28 22:20 ` Tony Luck
2021-08-29 1:40 ` Matthew Wilcox
2021-08-30 15:41 ` Luck, Tony
2021-08-28 22:23 ` Thomas Gleixner
2021-08-28 19:28 ` [Ocfs2-devel] [RFC][arm64] possible infinite loop in btrfs search_ioctl() Al Viro
2021-08-31 13:54 ` Catalin Marinas
2021-08-31 15:28 ` Al Viro
2021-08-31 16:01 ` Catalin Marinas
2021-10-11 17:37 ` Catalin Marinas
2021-10-11 19:15 ` Linus Torvalds
2021-10-11 21:08 ` Catalin Marinas
2021-10-11 23:59 ` Linus Torvalds
2021-10-12 17:27 ` Catalin Marinas
2021-10-12 17:58 ` Linus Torvalds
2021-10-18 17:13 ` Catalin Marinas
2021-10-21 0:46 ` Andreas Gruenbacher
2021-10-21 10:05 ` Catalin Marinas
2021-10-21 14:42 ` Andreas Gruenbacher
2021-10-21 17:09 ` Catalin Marinas
2021-10-21 18:00 ` Andreas Gruenbacher
2021-10-22 18:41 ` Catalin Marinas
2021-10-25 19:37 ` Andreas Gruenbacher
2021-10-22 2:30 ` Linus Torvalds
2021-10-22 9:34 ` Catalin Marinas
2021-08-29 0:58 ` [Ocfs2-devel] [PATCH v7 05/19] iov_iter: Introduce fault_in_iov_iter_writeable Al Viro
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 06/19] gfs2: Add wrapper for iomap_file_buffered_write Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 07/19] gfs2: Clean up function may_grant Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 08/19] gfs2: Eliminate vestigial HIF_FIRST Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 09/19] gfs2: Remove redundant check from gfs2_glock_dq Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 10/19] gfs2: Introduce flag for glock holder auto-demotion Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 11/19] gfs2: Move the inode glock locking to gfs2_file_buffered_write Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 12/19] gfs2: Eliminate ip->i_gh Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 13/19] gfs2: Fix mmap + page fault deadlocks for buffered I/O Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 14/19] iomap: Fix iomap_dio_rw return value for user copies Andreas Gruenbacher
2021-09-03 18:54 ` Darrick J. Wong
2021-09-09 11:17 ` Christoph Hellwig
2021-08-27 16:49 ` Andreas Gruenbacher [this message]
2021-09-03 18:54 ` [Ocfs2-devel] [PATCH v7 15/19] iomap: Support partial direct I/O on user copy failures Darrick J. Wong
2021-09-09 11:20 ` Christoph Hellwig
2021-09-28 15:05 ` Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 16/19] iomap: Add done_before argument to iomap_dio_rw Andreas Gruenbacher
2021-08-27 18:30 ` Darrick J. Wong
2021-08-27 20:15 ` Andreas Gruenbacher
2021-08-27 21:32 ` Darrick J. Wong
2021-08-27 21:49 ` Andreas Grünbacher
2021-08-27 22:35 ` Linus Torvalds
2021-09-03 18:47 ` Darrick J. Wong
2021-09-03 18:53 ` Darrick J. Wong
2021-09-09 11:30 ` Christoph Hellwig
2021-09-09 17:22 ` Linus Torvalds
2021-09-10 7:36 ` Christoph Hellwig
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 17/19] gup: Introduce FOLL_NOFAULT flag to disable page faults Andreas Gruenbacher
2021-09-09 11:36 ` Christoph Hellwig
2021-09-09 17:17 ` Linus Torvalds
2021-09-10 7:24 ` Christoph Hellwig
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 18/19] iov_iter: Introduce nofault " Andreas Gruenbacher
2021-08-27 18:47 ` Al Viro
2021-08-27 19:56 ` Andreas Gruenbacher
2021-08-27 16:49 ` [Ocfs2-devel] [PATCH v7 19/19] gfs2: Fix mmap + page fault deadlocks for direct I/O Andreas Gruenbacher
2021-08-27 17:16 ` [Ocfs2-devel] [PATCH v7 00/19] gfs2: Fix mmap + page fault deadlocks Linus Torvalds
2021-09-01 19:52 ` Andreas Gruenbacher
2021-09-03 15:52 ` Linus Torvalds
2021-09-03 18:25 ` Al Viro
2021-09-03 18:47 ` Linus Torvalds
2021-09-03 19:51 ` Andreas Grünbacher
2021-09-03 15:07 ` Filipe Manana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210827164926.1726765-16-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).