| Message ID | 20220530113016.16663-3-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | A few cleanup and fixup patches for migration | expand |
On 30.05.22 13:30, Miaohe Lin wrote: > When non-lru movable page was freed from under us, __ClearPageMovable must > have been done. So we can remove unneeded lock page and PageMovable check > here. Also free_pages_prepare() will clear PG_isolated for us, so we can > further remove ClearPageIsolated as suggested by David. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Oscar Salvador <osalvador@suse.de> > --- > mm/migrate.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index e88ebb88fa6f..337336115e43 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1090,15 +1090,10 @@ static int unmap_and_move(new_page_t get_new_page, > return -ENOSYS; > > if (page_count(page) == 1) { > - /* page was freed from under us. So we are done. */ > + /* Page was freed from under us. So we are done. */ > ClearPageActive(page); > ClearPageUnevictable(page); > - if (unlikely(__PageMovable(page))) { > - lock_page(page); > - if (!PageMovable(page)) > - ClearPageIsolated(page); > - unlock_page(page); > - } > + /* free_pages_prepare() will clear PG_isolated. */ > goto out; > } > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/migrate.c b/mm/migrate.c index e88ebb88fa6f..337336115e43 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1090,15 +1090,10 @@ static int unmap_and_move(new_page_t get_new_page, return -ENOSYS; if (page_count(page) == 1) { - /* page was freed from under us. So we are done. */ + /* Page was freed from under us. So we are done. */ ClearPageActive(page); ClearPageUnevictable(page); - if (unlikely(__PageMovable(page))) { - lock_page(page); - if (!PageMovable(page)) - ClearPageIsolated(page); - unlock_page(page); - } + /* free_pages_prepare() will clear PG_isolated. */ goto out; }