Commit 64165b1a authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

mm: swapoff: take notice of completion sooner

The old try_to_unuse() implementation was driven by find_next_to_unuse(),
which terminated as soon as all the swap had been freed.

Add inuse_pages checks now (alongside signal_pending()) to stop scanning
mms and swap_map once finished.

The same ought to be done in shmem_unuse() too, but never was before,
and needs a different interface: so leave it as is for now.

Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1904081258200.1523@eggly.anvils
Fixes: b56a2d8a ("mm: rid swapoff of quadratic complexity")
Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Cc: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Kelley Nielsen <kelleynnn@gmail.com>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Rik van Riel <riel@surriel.com>
Cc: Vineeth Pillai <vpillai@digitalocean.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd862deb
...@@ -2051,11 +2051,9 @@ int try_to_unuse(unsigned int type, bool frontswap, ...@@ -2051,11 +2051,9 @@ int try_to_unuse(unsigned int type, bool frontswap,
spin_lock(&mmlist_lock); spin_lock(&mmlist_lock);
p = &init_mm.mmlist; p = &init_mm.mmlist;
while ((p = p->next) != &init_mm.mmlist) { while (si->inuse_pages &&
if (signal_pending(current)) { !signal_pending(current) &&
retval = -EINTR; (p = p->next) != &init_mm.mmlist) {
break;
}
mm = list_entry(p, struct mm_struct, mmlist); mm = list_entry(p, struct mm_struct, mmlist);
if (!mmget_not_zero(mm)) if (!mmget_not_zero(mm))
...@@ -2082,7 +2080,9 @@ int try_to_unuse(unsigned int type, bool frontswap, ...@@ -2082,7 +2080,9 @@ int try_to_unuse(unsigned int type, bool frontswap,
mmput(prev_mm); mmput(prev_mm);
i = 0; i = 0;
while ((i = find_next_to_unuse(si, i, frontswap)) != 0) { while (si->inuse_pages &&
!signal_pending(current) &&
(i = find_next_to_unuse(si, i, frontswap)) != 0) {
entry = swp_entry(type, i); entry = swp_entry(type, i);
page = find_get_page(swap_address_space(entry), i); page = find_get_page(swap_address_space(entry), i);
...@@ -2123,8 +2123,11 @@ int try_to_unuse(unsigned int type, bool frontswap, ...@@ -2123,8 +2123,11 @@ int try_to_unuse(unsigned int type, bool frontswap,
* separate lists, and wait for those lists to be emptied; but it's * separate lists, and wait for those lists to be emptied; but it's
* easier and more robust (though cpu-intensive) just to keep retrying. * easier and more robust (though cpu-intensive) just to keep retrying.
*/ */
if (si->inuse_pages) if (si->inuse_pages) {
goto retry; if (!signal_pending(current))
goto retry;
retval = -EINTR;
}
out: out:
return (retval == FRONTSWAP_PAGES_UNUSED) ? 0 : retval; return (retval == FRONTSWAP_PAGES_UNUSED) ? 0 : retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment