| Message ID | 3-v2-987e91b59705+36b-gup_tidy_jgg@nvidia.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Simplify the external interface for GUP | expand |
On 24.01.23 21:34, Jason Gunthorpe wrote: > get_user_pages_remote(), get_user_pages_unlocked() and get_user_pages() > are never called with FOLL_LONGTERM, so directly call > __get_user_pages_locked() > > The next patch will add an assertion for this. > > Suggested-by: John Hubbard <jhubbard@nvidia.com> > Reviewed-by: John Hubbard <jhubbard@nvidia.com> > Acked-by: Mike Rapoport (IBM) <rppt@kernel.org> > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> > --- > mm/gup.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index 7007b3afc4fda8..a6559d7243db92 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -2200,8 +2200,8 @@ long get_user_pages_remote(struct mm_struct *mm, > if (!is_valid_gup_flags(gup_flags)) > return -EINVAL; > > - return __gup_longterm_locked(mm, start, nr_pages, pages, vmas, locked, > - gup_flags | FOLL_TOUCH | FOLL_REMOTE); > + return __get_user_pages_locked(mm, start, nr_pages, pages, vmas, locked, > + gup_flags | FOLL_TOUCH | FOLL_REMOTE); > } > EXPORT_SYMBOL(get_user_pages_remote); > > @@ -2238,8 +2238,8 @@ long get_user_pages(unsigned long start, unsigned long nr_pages, > if (!is_valid_gup_flags(gup_flags)) > return -EINVAL; > > - return __gup_longterm_locked(current->mm, start, nr_pages, > - pages, vmas, NULL, gup_flags | FOLL_TOUCH); > + return __get_user_pages_locked(current->mm, start, nr_pages, pages, > + vmas, NULL, gup_flags | FOLL_TOUCH); > } > EXPORT_SYMBOL(get_user_pages); > > @@ -2263,8 +2263,8 @@ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages, > { > int locked = 0; > > - return __gup_longterm_locked(current->mm, start, nr_pages, pages, NULL, > - &locked, gup_flags | FOLL_TOUCH); > + return __get_user_pages_locked(current->mm, start, nr_pages, pages, > + NULL, &locked, gup_flags | FOLL_TOUCH); > } > EXPORT_SYMBOL(get_user_pages_unlocked); > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/gup.c b/mm/gup.c index 7007b3afc4fda8..a6559d7243db92 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2200,8 +2200,8 @@ long get_user_pages_remote(struct mm_struct *mm, if (!is_valid_gup_flags(gup_flags)) return -EINVAL; - return __gup_longterm_locked(mm, start, nr_pages, pages, vmas, locked, - gup_flags | FOLL_TOUCH | FOLL_REMOTE); + return __get_user_pages_locked(mm, start, nr_pages, pages, vmas, locked, + gup_flags | FOLL_TOUCH | FOLL_REMOTE); } EXPORT_SYMBOL(get_user_pages_remote); @@ -2238,8 +2238,8 @@ long get_user_pages(unsigned long start, unsigned long nr_pages, if (!is_valid_gup_flags(gup_flags)) return -EINVAL; - return __gup_longterm_locked(current->mm, start, nr_pages, - pages, vmas, NULL, gup_flags | FOLL_TOUCH); + return __get_user_pages_locked(current->mm, start, nr_pages, pages, + vmas, NULL, gup_flags | FOLL_TOUCH); } EXPORT_SYMBOL(get_user_pages); @@ -2263,8 +2263,8 @@ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages, { int locked = 0; - return __gup_longterm_locked(current->mm, start, nr_pages, pages, NULL, - &locked, gup_flags | FOLL_TOUCH); + return __get_user_pages_locked(current->mm, start, nr_pages, pages, + NULL, &locked, gup_flags | FOLL_TOUCH); } EXPORT_SYMBOL(get_user_pages_unlocked);