Skip to content

Commit 517f496

Browse files
davidhildenbrandakpm00
authored andcommitted
mm/gup: revert "mm: gup: fix infinite loop within __get_longterm_locked"
After commit 1aaf8c1 ("mm: gup: fix infinite loop within __get_longterm_locked") we are able to longterm pin folios that are not supposed to get longterm pinned, simply because they temporarily have the LRU flag cleared (esp. temporarily isolated). For example, two __get_longterm_locked() callers can race, or __get_longterm_locked() can race with anything else that temporarily isolates folios. The introducing commit mentions the use case of a driver that uses vm_ops->fault to insert pages allocated through cma_alloc() into the page tables, assuming they can later get longterm pinned. These pages/ folios would never have the LRU flag set and consequently cannot get isolated. There is no known in-tree user making use of that so far, fortunately. To handle that in the future -- and avoid retrying forever to isolate/migrate them -- we will need a different mechanism for the CMA area *owner* to indicate that it actually already allocated the page and is fine with longterm pinning it. The LRU flag is not suitable for that. Probably we can lookup the relevant CMA area and query the bitmap; we only have have to care about some races, probably. If already allocated, we could just allow longterm pinning) Anyhow, let's fix the "must not be longterm pinned" problem first by reverting the original commit. Link: https://lkml.kernel.org/r/20250611131314.594529-1-david@redhat.com Fixes: 1aaf8c1 ("mm: gup: fix infinite loop within __get_longterm_locked") Signed-off-by: David Hildenbrand <david@redhat.com> Closes: https://lore.kernel.org/all/20250522092755.GA3277597@tiffany/ Reported-by: Hyesoo Yu <hyesoo.yu@samsung.com> Reviewed-by: John Hubbard <jhubbard@nvidia.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Peter Xu <peterx@redhat.com> Cc: Zhaoyang Huang <zhaoyang.huang@unisoc.com> Cc: Aijun Sun <aijun.sun@unisoc.com> Cc: Alistair Popple <apopple@nvidia.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 965f877 commit 517f496

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

mm/gup.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2303,13 +2303,13 @@ static void pofs_unpin(struct pages_or_folios *pofs)
23032303
/*
23042304
* Returns the number of collected folios. Return value is always >= 0.
23052305
*/
2306-
static void collect_longterm_unpinnable_folios(
2306+
static unsigned long collect_longterm_unpinnable_folios(
23072307
struct list_head *movable_folio_list,
23082308
struct pages_or_folios *pofs)
23092309
{
2310+
unsigned long i, collected = 0;
23102311
struct folio *prev_folio = NULL;
23112312
bool drain_allow = true;
2312-
unsigned long i;
23132313

23142314
for (i = 0; i < pofs->nr_entries; i++) {
23152315
struct folio *folio = pofs_get_folio(pofs, i);
@@ -2321,6 +2321,8 @@ static void collect_longterm_unpinnable_folios(
23212321
if (folio_is_longterm_pinnable(folio))
23222322
continue;
23232323

2324+
collected++;
2325+
23242326
if (folio_is_device_coherent(folio))
23252327
continue;
23262328

@@ -2342,6 +2344,8 @@ static void collect_longterm_unpinnable_folios(
23422344
NR_ISOLATED_ANON + folio_is_file_lru(folio),
23432345
folio_nr_pages(folio));
23442346
}
2347+
2348+
return collected;
23452349
}
23462350

23472351
/*
@@ -2418,9 +2422,11 @@ static long
24182422
check_and_migrate_movable_pages_or_folios(struct pages_or_folios *pofs)
24192423
{
24202424
LIST_HEAD(movable_folio_list);
2425+
unsigned long collected;
24212426

2422-
collect_longterm_unpinnable_folios(&movable_folio_list, pofs);
2423-
if (list_empty(&movable_folio_list))
2427+
collected = collect_longterm_unpinnable_folios(&movable_folio_list,
2428+
pofs);
2429+
if (!collected)
24242430
return 0;
24252431

24262432
return migrate_longterm_unpinnable_folios(&movable_folio_list, pofs);

0 commit comments

Comments
 (0)