Include FOLL_FAST_ONLY in the list of flags to *not* WARN()
on, in internal_get_user_pages_fast().
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: Daniel Vetter <dan...@ffwll.ch>
Cc: David Airlie <airl...@linux.ie>
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: "Joonas Lahtinen" <joonas.lahti...@linux.intel.com>
Cc: Matthew Auld <matthew.a...@intel.com>
Cc: Matthew Wilcox <wi...@infradead.org>
Cc: Rodrigo Vivi <rodrigo.v...@intel.com>
Cc: Souptick Joarder <jrdr.li...@gmail.com>
Cc: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Signed-off-by: John Hubbard <jhubb...@nvidia.com>
---
Hi Andrew, Chris,
Andrew: This is a fixup that applies to today's (20200521) linux-next.
In that tree, this fixes up:
commit dfb8dfe80808 ("mm/gup: refactor and de-duplicate gup_fast() code")
Chris: I'd like to request another CI run for the drm/i915 changes, so
for that, would you prefer that I post a v2 of the series [1], or
is it easier for you to just apply this patch here, on top of [2]?
[1] https://lore.kernel.org/r/20200519002124.2025955-1-jhubb...@nvidia.com
[2]
https://lore.kernel.org/r/158985123351.31239.10766458886430429...@emeril.freedesktop.org
thanks,
John Hubbard
NVIDIA
mm/gup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mm/gup.c b/mm/gup.c
index dd8895f2fafa1..ada6aa79576dc 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2724,7 +2724,8 @@ static int internal_get_user_pages_fast(unsigned long
start, int nr_pages,
int nr_pinned = 0, ret = 0;
if (WARN_ON_ONCE(gup_flags & ~(FOLL_WRITE | FOLL_LONGTERM |
- FOLL_FORCE | FOLL_PIN | FOLL_GET)))
+ FOLL_FORCE | FOLL_PIN | FOLL_GET |
+ FOLL_FAST_ONLY)))
return -EINVAL;
start = untagged_addr(start) & PAGE_MASK;
--
2.26.2
