After commit e2846124f9a2 ("zsmalloc: zs_page_migrate: skip unnecessary
loops but not return -EBUSY if zspage is not inuse") zs_page_migrate
can handle the ZS_EMPTY zspage.

But it will affect the free_work free the zspage.  That will make this
ZS_EMPTY zspage stay in system until another zspage wake up free_work.

Make this patch let zs_page_migrate wake up free_work if need.

Fixes: e2846124f9a2 ("zsmalloc: zs_page_migrate: skip unnecessary loops but not 
return -EBUSY if zspage is not inuse")
Signed-off-by: Hui Zhu <zhu...@xiaomi.com>
---
 mm/zsmalloc.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 62457eb..48ce043 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -2035,8 +2035,14 @@ int zs_page_migrate(struct address_space *mapping, 
struct page *newpage,
         * Page migration is done so let's putback isolated zspage to
         * the list if @page is final isolated subpage in the zspage.
         */
-       if (!is_zspage_isolated(zspage))
-               putback_zspage(class, zspage);
+       if (!is_zspage_isolated(zspage)) {
+               /*
+                * The page and class is locked, we cannot free zspage
+                * immediately so let's defer.
+                */
+               if (putback_zspage(class, zspage) == ZS_EMPTY)
+                       schedule_work(&pool->free_work);
+       }
 
        reset_page(page);
        put_page(page);
-- 
1.9.1

Reply via email to