Include FOLL_FAST_ONLY in the list of flags to *not* WARN()
on, in internal_get_user_pages_fast().
Cc: Chris Wilson <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: "Joonas Lahtinen" <[email protected]>
Cc: Matthew Auld <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Souptick Joarder <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Signed-off-by: John Hubbard <[email protected]>
---
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/[email protected]
[2] https://lore.kernel.org/r/[email protected]
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
Quoting John Hubbard (2020-05-22 00:38:41)
> Include FOLL_FAST_ONLY in the list of flags to *not* WARN()
> on, in internal_get_user_pages_fast().
>
> Cc: Chris Wilson <[email protected]>
> Cc: Daniel Vetter <[email protected]>
> Cc: David Airlie <[email protected]>
> Cc: Jani Nikula <[email protected]>
> Cc: "Joonas Lahtinen" <[email protected]>
> Cc: Matthew Auld <[email protected]>
> Cc: Matthew Wilcox <[email protected]>
> Cc: Rodrigo Vivi <[email protected]>
> Cc: Souptick Joarder <[email protected]>
> Cc: Tvrtko Ursulin <[email protected]>
> Signed-off-by: John Hubbard <[email protected]>
> ---
>
> 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]?
If you post your series again with this patch included to intel-gfx, CI
will pick it up. Or I'll do that in the morning.
-Chris
On 2020-05-21 19:46, Chris Wilson wrote:
> Quoting John Hubbard (2020-05-22 00:38:41)
>> Include FOLL_FAST_ONLY in the list of flags to *not* WARN()
>> on, in internal_get_user_pages_fast().
>>
>> Cc: Chris Wilson <[email protected]>
>> Cc: Daniel Vetter <[email protected]>
>> Cc: David Airlie <[email protected]>
>> Cc: Jani Nikula <[email protected]>
>> Cc: "Joonas Lahtinen" <[email protected]>
>> Cc: Matthew Auld <[email protected]>
>> Cc: Matthew Wilcox <[email protected]>
>> Cc: Rodrigo Vivi <[email protected]>
>> Cc: Souptick Joarder <[email protected]>
>> Cc: Tvrtko Ursulin <[email protected]>
>> Signed-off-by: John Hubbard <[email protected]>
>> ---
>>
>> 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]?
>
> If you post your series again with this patch included to intel-gfx, CI
> will pick it up. Or I'll do that in the morning.
> -Chris
>
OK, perfect. I'll post a version for linux.git in a moment here.
thanks,
--
John Hubbard
NVIDIA