From: Andreas Gruenbacher <agruenba@redhat.com>
To: cluster-devel@redhat.com
Cc: kvm-ppc@vger.kernel.org, Paul Mackerras <paulus@ozlabs.org>,
Jan Kara <jack@suse.cz>,
Andreas Gruenbacher <agruenba@redhat.com>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH v9 15/17] gup: Introduce FOLL_NOFAULT flag to disable page faults
Date: Tue, 2 Nov 2021 13:29:43 +0100 [thread overview]
Message-ID: <20211102122945.117744-16-agruenba@redhat.com> (raw)
In-Reply-To: <20211102122945.117744-1-agruenba@redhat.com>
Introduce a new FOLL_NOFAULT flag that causes get_user_pages to return
-EFAULT when it would otherwise trigger a page fault. This is roughly
similar to FOLL_FAST_ONLY but available on all architectures, and less
fragile.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
include/linux/mm.h | 3 ++-
mm/gup.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 73a52aba448f..2f0e6b9f8f3b 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2851,7 +2851,8 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address,
#define FOLL_FORCE 0x10 /* get_user_pages read/write w/o permission */
#define FOLL_NOWAIT 0x20 /* if a disk transfer is needed, start the IO
* and return without waiting upon it */
-#define FOLL_POPULATE 0x40 /* fault in page */
+#define FOLL_POPULATE 0x40 /* fault in pages (with FOLL_MLOCK) */
+#define FOLL_NOFAULT 0x80 /* do not fault in pages */
#define FOLL_HWPOISON 0x100 /* check page is hwpoisoned */
#define FOLL_NUMA 0x200 /* force NUMA hinting page fault */
#define FOLL_MIGRATION 0x400 /* wait for page to replace migration entry */
diff --git a/mm/gup.c b/mm/gup.c
index 795f15c410cc..e1c7e4bde11f 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -918,6 +918,8 @@ static int faultin_page(struct vm_area_struct *vma,
/* mlock all present pages, but do not fault in new pages */
if ((*flags & (FOLL_POPULATE | FOLL_MLOCK)) == FOLL_MLOCK)
return -ENOENT;
+ if (*flags & FOLL_NOFAULT)
+ return -EFAULT;
if (*flags & FOLL_WRITE)
fault_flags |= FAULT_FLAG_WRITE;
if (*flags & FOLL_REMOTE)
@@ -2843,7 +2845,7 @@ static int internal_get_user_pages_fast(unsigned long start,
if (WARN_ON_ONCE(gup_flags & ~(FOLL_WRITE | FOLL_LONGTERM |
FOLL_FORCE | FOLL_PIN | FOLL_GET |
- FOLL_FAST_ONLY)))
+ FOLL_FAST_ONLY | FOLL_NOFAULT)))
return -EINVAL;
if (gup_flags & FOLL_PIN)
--
2.31.1
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2021-11-02 12:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 12:29 [Ocfs2-devel] [PATCH v9 00/17] gfs2: Fix mmap + page fault deadlocks Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 01/17] iov_iter: Fix iov_iter_get_pages{, _alloc} page fault return value Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 02/17] powerpc/kvm: Fix kvm_use_magic_page Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 03/17] gup: Turn fault_in_pages_{readable, writeable} into fault_in_{readable, writeable} Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 04/17] iov_iter: Turn iov_iter_fault_in_readable into fault_in_iov_iter_readable Andreas Gruenbacher
2021-11-04 18:22 ` Catalin Marinas
2021-11-04 20:31 ` Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 05/17] iov_iter: Introduce fault_in_iov_iter_writeable Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 06/17] gfs2: Add wrapper for iomap_file_buffered_write Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 07/17] gfs2: Clean up function may_grant Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 08/17] gfs2: Introduce flag for glock holder auto-demotion Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 09/17] gfs2: Move the inode glock locking to gfs2_file_buffered_write Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 10/17] gfs2: Eliminate ip->i_gh Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 11/17] gfs2: Fix mmap + page fault deadlocks for buffered I/O Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 12/17] iomap: Fix iomap_dio_rw return value for user copies Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 13/17] iomap: Support partial direct I/O on user copy failures Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 14/17] iomap: Add done_before argument to iomap_dio_rw Andreas Gruenbacher
2021-11-02 12:29 ` Andreas Gruenbacher [this message]
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 16/17] iov_iter: Introduce nofault flag to disable page faults Andreas Gruenbacher
2021-11-02 12:29 ` [Ocfs2-devel] [PATCH v9 17/17] gfs2: Fix mmap + page fault deadlocks for direct I/O Andreas Gruenbacher
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=20211102122945.117744-16-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=cluster-devel@redhat.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=kvm-ppc@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=paulus@ozlabs.org \
--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).