A few cleanup patches for z3fold
v2 cover A few cleanup patches for z3fold
Hi,
This series contains a few patches to simplify the code, remove unneeded code, fix obsolete comment and so on. More details can be found in the respective changelogs. Thanks!
---v1->v2:
collect Reviewed-by tag. Thanks Vitaly, Souptick and David for review drop mm/z3fold: remove unneeded return value of z3fold_compact_page() split the enhance of reducing atomic_ops overhead into separate patch
---
Miaohe Lin (8):
mm/z3fold: declare z3fold_mount with __init
mm/z3fold: remove obsolete comment in z3fold_alloc mm/z3fold: minor clean up for z3fold_free
mm/z3fold: remove unneeded page_mapcount_reset and ClearPagePrivate mm/z3fold: remove confusing local variable l reassignment mm/z3fold: move decrement of pool->pages_nr into
__release_z3fold_page()
mm/z3fold: remove redundant list_del_init of zhdr->buddy in
z3fold_free
mm/z3fold: remove unneeded PAGE_HEADLESS check in free_handle()
mm/z3fold.c | 64 ++++++++++++++--------------------------------------- 1 file changed, 17 insertions(+), 47 deletions(-)
Signature · 1 line
2.23.0
PATCH v2 1/8 mm/z3fold: declare z3fold_mount with __init
z3fold_mount is only called during init. So we should declare it with __init.
--- mm/z3fold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/z3fold.c +1 -1
@@ -345,7 +345,7 @@ static struct file_system_type z3fold_fs = { };static struct vfsmount *z3fold_mnt; -static int z3fold_mount (void ) +static int __init z3fold_mount (void ) {int ret =0 ;
Signature · 1 line
2.23.0
PATCH v2 2/8 mm/z3fold: remove obsolete comment in z3fold_alloc
In reply to Miaohe LinThe highmem pages are supported since commit f1549cb5ab2b ("mm/z3fold.c:
allow __GFP_HIGHMEM in z3fold_alloc"). Remove the residual comment.
--- mm/z3fold.c | 3 --- 1 file changed, 3 deletions(-)
mm/z3fold.c +0 -3
@@ -1064,9 +1064,6 @@ static void z3fold_destroy_pool(struct z3fold_pool *pool)* performed first. If no suitable free region is found, then a new page is * allocated and added to the pool to satisfy the request. * -* gfp should not set __GFP_HIGHMEM as highmem pages cannot be used -* as z3fold pool pages. -* * Return: 0 if success and handle is set, otherwise -EINVAL if the size or * gfp arguments are invalid or -ENOMEM if the pool was unable to allocate * a new page.
Signature · 1 line
2.23.0
PATCH v2 3/8 mm/z3fold: minor clean up for z3fold_free
In reply to Miaohe LinUse put_z3fold_header() to pair with get_z3fold_header. Also fix the wrong comments. Minor readability improvement.
--- mm/z3fold.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/z3fold.c +4 -4
@@ -1187,9 +1187,9 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp,* @handle: handle associated with the allocation returned by z3fold_alloc() * * In the case that the z3fold page in which the allocation resides is under -* reclaim, as indicated by the PG_reclaim flag being set, this function -* only sets the first|last_chunks to 0. The page is actually freed -* once both buddies are evicted (see z3fold_reclaim_page() below). +* reclaim, as indicated by the PAGE_CLAIMED flag being set, this function +* only sets the first|middle|last_chunks to 0. The page is actually freed +* once all buddies are evicted (see z3fold_reclaim_page() below). */ static void z3fold_free (struct z3fold_pool *pool,unsigned long handle) {
@@ -1247,7 +1247,7 @@ static void z3fold_free(struct z3fold_pool *pool, unsigned long handle) }if (page_claimed) {/* the page has not been claimed by us */ -z3fold_page_unlock (zhdr); +put_z3fold_header (zhdr);return ; }if (test_and_set_bit (NEEDS_COMPACTING , &page->private)) {
Signature · 1 line
2.23.0
PATCH v2 4/8 mm/z3fold: remove unneeded page_mapcount_reset and ClearPagePrivate
In reply to Miaohe LinPage->page_type and PagePrivate are not used in z3fold. We should remove these confusing unneeded operations. The z3fold do these here is due to referring to zsmalloc's migration code which does need these operations.
--- mm/z3fold.c | 3 --- 1 file changed, 3 deletions(-)
mm/z3fold.c +0 -3
@@ -420,7 +420,6 @@ static void free_z3fold_page(struct page *page, bool headless)__ClearPageMovable (page);unlock_page (page); } -ClearPagePrivate (page);__free_page (page); }
@@ -1635,7 +1634,6 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpaINIT_LIST_HEAD (&new_zhdr->buddy); new_mapping =page_mapping (page);__ClearPageMovable (page); -ClearPagePrivate (page);get_page (newpage);z3fold_page_lock (new_zhdr);
@@ -1655,7 +1653,6 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpaqueue_work_on (new_zhdr->cpu, pool->compact_wq, &new_zhdr->work); -page_mapcount_reset (page);clear_bit (PAGE_CLAIMED , &page->private);put_page (page);return 0 ;
Signature · 1 line
2.23.0
PATCH v2 5/8 mm/z3fold: remove confusing local variable l reassignment
In reply to Miaohe LinThe local variable l holds the address of unbuddied[i] which won't change after we take the pool lock. Remove it to avoid confusion.
--- mm/z3fold.c | 1 - 1 file changed, 1 deletion(-)
mm/z3fold.c +0 -1
@@ -876,7 +876,6 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool,/* Re-check under lock. */ spin_lock (&pool->lock); - l = &unbuddied[i];if (unlikely (zhdr !=list_first_entry (READ_ONCE (l), struct z3fold_header, buddy)) || !z3fold_page_trylock (zhdr)) {
Signature · 1 line
2.23.0
PATCH v2 6/8 mm/z3fold: move decrement of pool->pages_nr into __release_z3fold_page()
In reply to Miaohe LinThe z3fold will always do atomic64_dec(&pool->pages_nr) when the __release_z3fold_page() is called. Thus we can move decrement of pool->pages_nr into __release_z3fold_page() to simplify the code. Also we can reduce the size of z3fold.o ~1k.
Without this patch:
text data bss dec hex filename
15444 1376 8 16828 41bc mm/z3fold.o
With this patch:
text data bss dec hex filename
15044 1248 8 16300 3fac mm/z3fold.o
--- mm/z3fold.c | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-)
mm/z3fold.c +12 -29
@@ -520,6 +520,8 @@ static void __release_z3fold_page(struct z3fold_header *zhdr, bool locked)list_add (&zhdr->buddy, &pool->stale);queue_work (pool->release_wq, &pool->work);spin_unlock (&pool->stale_lock); + +atomic64_dec (&pool->pages_nr); }static void release_z3fold_page (struct kref *ref)
@@ -737,13 +739,9 @@ static struct z3fold_header *compact_single_buddy(struct z3fold_header *zhdr)return new_zhdr; out_fail: -if (new_zhdr) { -if (kref_put (&new_zhdr->refcount, release_z3fold_page_locked)) -atomic64_dec (&pool->pages_nr); -else { -add_to_unbuddied (pool, new_zhdr); -z3fold_page_unlock (new_zhdr); - } +if (new_zhdr && !kref_put (&new_zhdr->refcount, release_z3fold_page_locked)) { +add_to_unbuddied (pool, new_zhdr); +z3fold_page_unlock (new_zhdr); }return NULL ;
@@ -816,10 +814,8 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked)list_del_init (&zhdr->buddy);spin_unlock (&pool->lock); -if (kref_put (&zhdr->refcount, release_z3fold_page_locked)) { -atomic64_dec (&pool->pages_nr); +if (kref_put (&zhdr->refcount, release_z3fold_page_locked))return ; - }if (test_bit (PAGE_STALE , &page->private) ||test_and_set_bit (PAGE_CLAIMED , &page->private)) {
@@ -829,9 +825,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked)if (!zhdr->foreign_handles &&buddy_single (zhdr) && zhdr->mapped_count ==0 &&compact_single_buddy (zhdr)) { -if (kref_put (&zhdr->refcount, release_z3fold_page_locked)) -atomic64_dec (&pool->pages_nr); -else { +if (!kref_put (&zhdr->refcount, release_z3fold_page_locked)) {clear_bit (PAGE_CLAIMED , &page->private);z3fold_page_unlock (zhdr); }
@@ -1089,10 +1083,8 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp,if (zhdr) { bud =get_free_buddy (zhdr, chunks);if (bud ==HEADLESS ) { -if (kref_put (&zhdr->refcount, +if (!kref_put (&zhdr->refcount, release_z3fold_page_locked)) -atomic64_dec (&pool->pages_nr); -else z3fold_page_unlock (zhdr);pr_err ("No free chunks in unbuddied\n" );WARN_ON (1 );
@@ -1239,10 +1231,8 @@ static void z3fold_free(struct z3fold_pool *pool, unsigned long handle)if (!page_claimed)free_handle (handle, zhdr); -if (kref_put (&zhdr->refcount, release_z3fold_page_locked_list)) { -atomic64_dec (&pool->pages_nr); +if (kref_put (&zhdr->refcount, release_z3fold_page_locked_list))return ; - }if (page_claimed) {/* the page has not been claimed by us */ put_z3fold_header (zhdr);
@@ -1353,9 +1343,7 @@ static int z3fold_reclaim_page(struct z3fold_pool *pool, unsigned int retries)break ; }if (!z3fold_page_trylock (zhdr)) { -if (kref_put (&zhdr->refcount, - release_z3fold_page)) -atomic64_dec (&pool->pages_nr); +kref_put (&zhdr->refcount, release_z3fold_page); zhdr =NULL ;continue ;/* can't evict at this point */ }
@@ -1366,10 +1354,8 @@ static int z3fold_reclaim_page(struct z3fold_pool *pool, unsigned int retries)*/ if (zhdr->foreign_handles ||test_and_set_bit (PAGE_CLAIMED , &page->private)) { -if (kref_put (&zhdr->refcount, +if (!kref_put (&zhdr->refcount, release_z3fold_page_locked)) -atomic64_dec (&pool->pages_nr); -else z3fold_page_unlock (zhdr); zhdr =NULL ;continue ;/* can't evict such page */
@@ -1447,7 +1433,6 @@ static int z3fold_reclaim_page(struct z3fold_pool *pool, unsigned int retries)if (kref_put (&zhdr->refcount, release_z3fold_page_locked)) {kmem_cache_free (pool->c_handle, slots); -atomic64_dec (&pool->pages_nr);return 0 ; }/*
@@ -1669,10 +1654,8 @@ static void z3fold_page_putback(struct page *page)if (!list_empty (&zhdr->buddy))list_del_init (&zhdr->buddy);INIT_LIST_HEAD (&page->lru); -if (kref_put (&zhdr->refcount, release_z3fold_page_locked)) { -atomic64_dec (&pool->pages_nr); +if (kref_put (&zhdr->refcount, release_z3fold_page_locked))return ; - }spin_lock (&pool->lock);list_add (&page->lru, &pool->lru);spin_unlock (&pool->lock);
Signature · 1 line
2.23.0
PATCH v2 7/8 mm/z3fold: remove redundant list_del_init of zhdr->buddy in z3fold_free
In reply to Miaohe LinThe do_compact_page will do list_del_init(&zhdr->buddy) for us. Remove this extra one to save some possible cpu cycles.
--- mm/z3fold.c | 3 --- 1 file changed, 3 deletions(-)
mm/z3fold.c +0 -3
@@ -1244,9 +1244,6 @@ static void z3fold_free(struct z3fold_pool *pool, unsigned long handle)return ; }if (zhdr->cpu <0 || !cpu_online (zhdr->cpu)) { -spin_lock (&pool->lock); -list_del_init (&zhdr->buddy); -spin_unlock (&pool->lock); zhdr->cpu =-1 ;kref_get (&zhdr->refcount);clear_bit (PAGE_CLAIMED , &page->private);
Signature · 1 line
2.23.0
PATCH v2 8/8 mm/z3fold: remove unneeded PAGE_HEADLESS check in free_handle()
In reply to Miaohe LinThe only caller z3fold_free() never calls free_handle() in PAGE_HEADLESS case. Remove this unneeded check.
--- mm/z3fold.c | 3 --- 1 file changed, 3 deletions(-)
mm/z3fold.c +0 -3
@@ -297,9 +297,6 @@ static inline void free_handle(unsigned long handle, struct z3fold_header *zhdr)int i;bool is_free; -if (handle & (1 <<PAGE_HEADLESS )) -return ; -if (WARN_ON (*(unsigned long *)handle ==0 ))return ;
Signature · 1 line
2.23.0