All of lore.kernel.org
 help / color / mirror / Atom feed
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>, Matthew Wilcox <willy@infradead.org>,
	cluster-devel@redhat.com, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com,
	Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v6 17/19] iov_iter: Introduce nofault flag to disable page faults
Date: Thu, 19 Aug 2021 21:41:00 +0200	[thread overview]
Message-ID: <20210819194102.1491495-18-agruenba@redhat.com> (raw)
In-Reply-To: <20210819194102.1491495-1-agruenba@redhat.com>

Introduce a new nofault flag to indicate to get_user_pages to use the
FOLL_NOFAULT flag.  This will cause get_user_pages to fail when it
would otherwise fault in a page.

Currently, the noio flag is only checked in iov_iter_get_pages and
iov_iter_get_pages_alloc.  This is enough for iomaop_dio_rw, but it
may make sense to check in other contexts as well.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 include/linux/uio.h |  1 +
 lib/iov_iter.c      | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index ffa431aeb067..ea35e511268f 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -29,6 +29,7 @@ enum iter_type {
 
 struct iov_iter {
 	u8 iter_type;
+	bool nofault;
 	bool data_source;
 	size_t iov_offset;
 	size_t count;
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 968f2d2595cd..22a82f272754 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -513,6 +513,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction,
 	WARN_ON(direction & ~(READ | WRITE));
 	*i = (struct iov_iter) {
 		.iter_type = ITER_IOVEC,
+		.nofault = false,
 		.data_source = direction,
 		.iov = iov,
 		.nr_segs = nr_segs,
@@ -1523,13 +1524,17 @@ ssize_t iov_iter_get_pages(struct iov_iter *i,
 		return 0;
 
 	if (likely(iter_is_iovec(i))) {
+		unsigned int gup_flags = 0;
 		unsigned long addr;
 
+		if (iov_iter_rw(i) != WRITE)
+			gup_flags |= FOLL_WRITE;
+		if (i->nofault)
+			gup_flags |= FOLL_NOFAULT;
+
 		addr = first_iovec_segment(i, &len, start, maxsize, maxpages);
 		n = DIV_ROUND_UP(len, PAGE_SIZE);
-		res = get_user_pages_fast(addr, n,
-				iov_iter_rw(i) != WRITE ?  FOLL_WRITE : 0,
-				pages);
+		res = get_user_pages_fast(addr, n, gup_flags, pages);
 		if (unlikely(res <= 0))
 			return res;
 		return (res == n ? len : res * PAGE_SIZE) - *start;
@@ -1645,15 +1650,20 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
 		return 0;
 
 	if (likely(iter_is_iovec(i))) {
+		unsigned int gup_flags = 0;
 		unsigned long addr;
 
+		if (iov_iter_rw(i) != WRITE)
+			gup_flags |= FOLL_WRITE;
+		if (i->nofault)
+			gup_flags |= FOLL_NOFAULT;
+
 		addr = first_iovec_segment(i, &len, start, maxsize, ~0U);
 		n = DIV_ROUND_UP(len, PAGE_SIZE);
 		p = get_pages_array(n);
 		if (!p)
 			return -ENOMEM;
-		res = get_user_pages_fast(addr, n,
-				iov_iter_rw(i) != WRITE ?  FOLL_WRITE : 0, p);
+		res = get_user_pages_fast(addr, n, gup_flags, p);
 		if (unlikely(res <= 0)) {
 			kvfree(p);
 			*pages = NULL;
-- 
2.26.3


WARNING: multiple messages have this Message-ID (diff)
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 v6 17/19] iov_iter: Introduce nofault flag to disable page faults
Date: Thu, 19 Aug 2021 21:41:00 +0200	[thread overview]
Message-ID: <20210819194102.1491495-18-agruenba@redhat.com> (raw)
In-Reply-To: <20210819194102.1491495-1-agruenba@redhat.com>

Introduce a new nofault flag to indicate to get_user_pages to use the
FOLL_NOFAULT flag.  This will cause get_user_pages to fail when it
would otherwise fault in a page.

Currently, the noio flag is only checked in iov_iter_get_pages and
iov_iter_get_pages_alloc.  This is enough for iomaop_dio_rw, but it
may make sense to check in other contexts as well.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 include/linux/uio.h |  1 +
 lib/iov_iter.c      | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index ffa431aeb067..ea35e511268f 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -29,6 +29,7 @@ enum iter_type {
 
 struct iov_iter {
 	u8 iter_type;
+	bool nofault;
 	bool data_source;
 	size_t iov_offset;
 	size_t count;
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 968f2d2595cd..22a82f272754 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -513,6 +513,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction,
 	WARN_ON(direction & ~(READ | WRITE));
 	*i = (struct iov_iter) {
 		.iter_type = ITER_IOVEC,
+		.nofault = false,
 		.data_source = direction,
 		.iov = iov,
 		.nr_segs = nr_segs,
@@ -1523,13 +1524,17 @@ ssize_t iov_iter_get_pages(struct iov_iter *i,
 		return 0;
 
 	if (likely(iter_is_iovec(i))) {
+		unsigned int gup_flags = 0;
 		unsigned long addr;
 
+		if (iov_iter_rw(i) != WRITE)
+			gup_flags |= FOLL_WRITE;
+		if (i->nofault)
+			gup_flags |= FOLL_NOFAULT;
+
 		addr = first_iovec_segment(i, &len, start, maxsize, maxpages);
 		n = DIV_ROUND_UP(len, PAGE_SIZE);
-		res = get_user_pages_fast(addr, n,
-				iov_iter_rw(i) != WRITE ?  FOLL_WRITE : 0,
-				pages);
+		res = get_user_pages_fast(addr, n, gup_flags, pages);
 		if (unlikely(res <= 0))
 			return res;
 		return (res == n ? len : res * PAGE_SIZE) - *start;
@@ -1645,15 +1650,20 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
 		return 0;
 
 	if (likely(iter_is_iovec(i))) {
+		unsigned int gup_flags = 0;
 		unsigned long addr;
 
+		if (iov_iter_rw(i) != WRITE)
+			gup_flags |= FOLL_WRITE;
+		if (i->nofault)
+			gup_flags |= FOLL_NOFAULT;
+
 		addr = first_iovec_segment(i, &len, start, maxsize, ~0U);
 		n = DIV_ROUND_UP(len, PAGE_SIZE);
 		p = get_pages_array(n);
 		if (!p)
 			return -ENOMEM;
-		res = get_user_pages_fast(addr, n,
-				iov_iter_rw(i) != WRITE ?  FOLL_WRITE : 0, p);
+		res = get_user_pages_fast(addr, n, gup_flags, p);
 		if (unlikely(res <= 0)) {
 			kvfree(p);
 			*pages = NULL;
-- 
2.26.3


_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

WARNING: multiple messages have this Message-ID (diff)
From: Andreas Gruenbacher <agruenba@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH v6 17/19] iov_iter: Introduce nofault flag to disable page faults
Date: Thu, 19 Aug 2021 21:41:00 +0200	[thread overview]
Message-ID: <20210819194102.1491495-18-agruenba@redhat.com> (raw)
In-Reply-To: <20210819194102.1491495-1-agruenba@redhat.com>

Introduce a new nofault flag to indicate to get_user_pages to use the
FOLL_NOFAULT flag.  This will cause get_user_pages to fail when it
would otherwise fault in a page.

Currently, the noio flag is only checked in iov_iter_get_pages and
iov_iter_get_pages_alloc.  This is enough for iomaop_dio_rw, but it
may make sense to check in other contexts as well.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 include/linux/uio.h |  1 +
 lib/iov_iter.c      | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index ffa431aeb067..ea35e511268f 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -29,6 +29,7 @@ enum iter_type {
 
 struct iov_iter {
 	u8 iter_type;
+	bool nofault;
 	bool data_source;
 	size_t iov_offset;
 	size_t count;
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 968f2d2595cd..22a82f272754 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -513,6 +513,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction,
 	WARN_ON(direction & ~(READ | WRITE));
 	*i = (struct iov_iter) {
 		.iter_type = ITER_IOVEC,
+		.nofault = false,
 		.data_source = direction,
 		.iov = iov,
 		.nr_segs = nr_segs,
@@ -1523,13 +1524,17 @@ ssize_t iov_iter_get_pages(struct iov_iter *i,
 		return 0;
 
 	if (likely(iter_is_iovec(i))) {
+		unsigned int gup_flags = 0;
 		unsigned long addr;
 
+		if (iov_iter_rw(i) != WRITE)
+			gup_flags |= FOLL_WRITE;
+		if (i->nofault)
+			gup_flags |= FOLL_NOFAULT;
+
 		addr = first_iovec_segment(i, &len, start, maxsize, maxpages);
 		n = DIV_ROUND_UP(len, PAGE_SIZE);
-		res = get_user_pages_fast(addr, n,
-				iov_iter_rw(i) != WRITE ?  FOLL_WRITE : 0,
-				pages);
+		res = get_user_pages_fast(addr, n, gup_flags, pages);
 		if (unlikely(res <= 0))
 			return res;
 		return (res == n ? len : res * PAGE_SIZE) - *start;
@@ -1645,15 +1650,20 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
 		return 0;
 
 	if (likely(iter_is_iovec(i))) {
+		unsigned int gup_flags = 0;
 		unsigned long addr;
 
+		if (iov_iter_rw(i) != WRITE)
+			gup_flags |= FOLL_WRITE;
+		if (i->nofault)
+			gup_flags |= FOLL_NOFAULT;
+
 		addr = first_iovec_segment(i, &len, start, maxsize, ~0U);
 		n = DIV_ROUND_UP(len, PAGE_SIZE);
 		p = get_pages_array(n);
 		if (!p)
 			return -ENOMEM;
-		res = get_user_pages_fast(addr, n,
-				iov_iter_rw(i) != WRITE ?  FOLL_WRITE : 0, p);
+		res = get_user_pages_fast(addr, n, gup_flags, p);
 		if (unlikely(res <= 0)) {
 			kvfree(p);
 			*pages = NULL;
-- 
2.26.3



  parent reply	other threads:[~2021-08-19 19:42 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19 19:40 [PATCH v6 00/19] gfs2: Fix mmap + page fault deadlocks Andreas Gruenbacher
2021-08-19 19:40 ` Andreas Gruenbacher
2021-08-19 19:40 ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 01/19] iov_iter: Fix iov_iter_get_pages{,_alloc} page fault return value Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] [PATCH v6 01/19] iov_iter: Fix iov_iter_get_pages{, _alloc} " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 02/19] powerpc/kvm: Fix kvm_use_magic_page Andreas Gruenbacher
2021-08-19 19:40   ` Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 03/19] Turn fault_in_pages_{readable,writeable} into fault_in_{readable,writeable} Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] [PATCH v6 03/19] Turn fault_in_pages_{readable, writeable} into fault_in_{readable, writeable} Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 04/19] Turn iov_iter_fault_in_readable into fault_in_iov_iter_readable Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 05/19] iov_iter: Introduce fault_in_iov_iter_writeable Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 06/19] gfs2: Add wrapper for iomap_file_buffered_write Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 07/19] gfs2: Clean up function may_grant Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 08/19] gfs2: Eliminate vestigial HIF_FIRST Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 09/19] gfs2: Remove redundant check from gfs2_glock_dq Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 10/19] gfs2: Introduce flag for glock holder auto-demotion Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-20  9:35   ` [Cluster-devel] " Steven Whitehouse
2021-08-20  9:35     ` Steven Whitehouse
2021-08-20  9:35     ` [Ocfs2-devel] " Steven Whitehouse
2021-08-20 13:11     ` Bob Peterson
2021-08-20 13:11       ` Bob Peterson
2021-08-20 13:11       ` [Ocfs2-devel] " Bob Peterson
2021-08-20 13:41       ` Steven Whitehouse
2021-08-20 13:41         ` Steven Whitehouse
2021-08-20 13:41         ` [Ocfs2-devel] " Steven Whitehouse
2021-08-20 15:22       ` Andreas Gruenbacher
2021-08-20 15:22         ` Andreas Gruenbacher
2021-08-20 15:22         ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-23  8:14         ` Steven Whitehouse
2021-08-23  8:14           ` Steven Whitehouse
2021-08-23  8:14           ` [Ocfs2-devel] " Steven Whitehouse
2021-08-23 15:18           ` Andreas Gruenbacher
2021-08-23 15:18             ` Andreas Gruenbacher
2021-08-23 15:18             ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-23 16:05             ` Matthew Wilcox
2021-08-23 16:05               ` Matthew Wilcox
2021-08-23 16:05               ` [Ocfs2-devel] " Matthew Wilcox
2021-08-23 16:36               ` Bob Peterson
2021-08-23 16:36                 ` Bob Peterson
2021-08-23 16:36                 ` [Ocfs2-devel] " Bob Peterson
2021-08-23 19:12               ` Andreas Gruenbacher
2021-08-23 19:12                 ` Andreas Gruenbacher
2021-08-23 19:12                 ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-24  7:59             ` Steven Whitehouse
2021-08-24  7:59               ` Steven Whitehouse
2021-08-24  7:59               ` [Ocfs2-devel] " Steven Whitehouse
2021-08-20 13:17     ` Andreas Gruenbacher
2021-08-20 13:17       ` Andreas Gruenbacher
2021-08-20 13:17       ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-20 13:47       ` Steven Whitehouse
2021-08-20 13:47         ` Steven Whitehouse
2021-08-20 13:47         ` [Ocfs2-devel] " Steven Whitehouse
2021-08-20 14:43         ` Andreas Grünbacher
2021-08-20 14:43           ` Andreas Grünbacher
2021-08-20 14:43           ` [Ocfs2-devel] " Andreas Grünbacher
2021-08-19 19:40 ` [PATCH v6 11/19] gfs2: Move the inode glock locking to gfs2_file_buffered_write Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 12/19] gfs2: Fix mmap + page fault deadlocks for buffered I/O Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 13/19] iomap: Fix iomap_dio_rw return value for user copies Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 14/19] iomap: Support partial direct I/O on user copy failures Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:40 ` [Ocfs2-devel] [PATCH v6 15/19] iomap: Add done_before argument to iomap_dio_rw Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` Andreas Gruenbacher
2021-08-19 19:40 ` [PATCH v6 16/19] gup: Introduce FOLL_NOFAULT flag to disable page faults Andreas Gruenbacher
2021-08-19 19:40   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:40   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:41 ` Andreas Gruenbacher [this message]
2021-08-19 19:41   ` [Cluster-devel] [PATCH v6 17/19] iov_iter: Introduce nofault " Andreas Gruenbacher
2021-08-19 19:41   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:41 ` [PATCH v6 18/19] gfs2: Fix mmap + page fault deadlocks for direct I/O Andreas Gruenbacher
2021-08-19 19:41   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:41   ` [Ocfs2-devel] " Andreas Gruenbacher
2021-08-19 19:41 ` [PATCH v6 19/19] gfs2: Eliminate ip->i_gh Andreas Gruenbacher
2021-08-19 19:41   ` [Cluster-devel] " Andreas Gruenbacher
2021-08-19 19:41   ` [Ocfs2-devel] " 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=20210819194102.1491495-18-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 \
    --cc=willy@infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.