[7/8] mm/gup: remove pin_user_pages_fast_only()

Commit Message

Jason Gunthorpe Jan. 17, 2023, 3:58 p.m. UTC

Commit ed29c2691188 ("drm/i915: Fix userptr so we do not have to worry
about obj->mm.lock, v7.")  removed the only caller, remove this dead code
too.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 include/linux/mm.h |  2 --
 mm/gup.c           | 33 ---------------------------------
 2 files changed, 35 deletions(-)

Comments

John Hubbard Jan. 20, 2023, 7:23 p.m. UTC | #1

On 1/17/23 07:58, Jason Gunthorpe wrote:
> Commit ed29c2691188 ("drm/i915: Fix userptr so we do not have to worry
> about obj->mm.lock, v7.")  removed the only caller, remove this dead code
> too.
> 
> Signed-off-by: Jason Gunthorpe <[e-mail]>
> ---
>  include/linux/mm.h |  2 --
>  mm/gup.c           | 33 ---------------------------------
>  2 files changed, 35 deletions(-)


Reviewed-by: John Hubbard <[e-mail]>


thanks,

David Hildenbrand Jan. 23, 2023, 11:31 a.m. UTC | #2

On 17.01.23 16:58, Jason Gunthorpe wrote:
> Commit ed29c2691188 ("drm/i915: Fix userptr so we do not have to worry
> about obj->mm.lock, v7.")  removed the only caller, remove this dead code
> too.
> 
> Signed-off-by: Jason Gunthorpe <[e-mail]>

Reviewed-by: David Hildenbrand <[e-mail]>

Patch

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7496a5c8acede1..de300b0de58e7d 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2159,8 +2159,6 @@  extern int mprotect_fixup(struct mmu_gather *tlb, struct vm_area_struct *vma,
  */
 int get_user_pages_fast_only(unsigned long start, int nr_pages,
 			     unsigned int gup_flags, struct page **pages);
-int pin_user_pages_fast_only(unsigned long start, int nr_pages,
-			     unsigned int gup_flags, struct page **pages);
 
 static inline bool get_user_page_fast_only(unsigned long addr,
 			unsigned int gup_flags, struct page **pagep)
diff --git a/mm/gup.c b/mm/gup.c
index 1ccfff759a29eb..b260c182135587 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -3099,39 +3099,6 @@  int pin_user_pages_fast(unsigned long start, int nr_pages,
 }
 EXPORT_SYMBOL_GPL(pin_user_pages_fast);
 
-/*
- * This is the FOLL_PIN equivalent of get_user_pages_fast_only(). Behavior
- * is the same, except that this one sets FOLL_PIN instead of FOLL_GET.
- *
- * The API rules are the same, too: no negative values may be returned.
- */
-int pin_user_pages_fast_only(unsigned long start, int nr_pages,
-			     unsigned int gup_flags, struct page **pages)
-{
-	int nr_pinned;
-
-	/*
-	 * FOLL_FAST_ONLY is required in order to match the API description of
-	 * this routine: no fall back to regular ("slow") GUP.
-	 */
-	if (!is_valid_gup_args(pages, NULL, NULL, &gup_flags,
-			       FOLL_PIN | FOLL_FAST_ONLY))
-		return 0;
-
-	nr_pinned = internal_get_user_pages_fast(start, nr_pages, gup_flags,
-						 pages);
-	/*
-	 * This routine is not allowed to return negative values. However,
-	 * internal_get_user_pages_fast() *can* return -errno. Therefore,
-	 * correct for that here:
-	 */
-	if (nr_pinned < 0)
-		nr_pinned = 0;
-
-	return nr_pinned;
-}
-EXPORT_SYMBOL_GPL(pin_user_pages_fast_only);
-
 /**
  * pin_user_pages_remote() - pin pages of a remote process
  *