The patch titled
Subject: zsmalloc: follow up zsmalloc vmstat
has been removed from the -mm tree. Its filename was
mm-add-nr_zsmalloc-to-vmstat-fix-2.patch
This patch was dropped because it was folded into mm-add-nr_zsmalloc-to-vmstat.patch
------------------------------------------------------
From: Minchan Kim <minchan@xxxxxxxxxx>
Subject: zsmalloc: follow up zsmalloc vmstat
It's follow-up patch based on comment and report of static checker.
* Use more general term 'zspages' rather than 'zsmalloc' - Sergey
* decrease zone stat NR_ZSPAGES on right page - Dan
Link: http://lkml.kernel.org/r/20160607091737.GC23435@bbox
Signed-off-by: Minchan Kim <minchan@xxxxxxxxxx>
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mmzone.h | 2 +-
mm/vmstat.c | 2 +-
mm/zsmalloc.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff -puN include/linux/mmzone.h~mm-add-nr_zsmalloc-to-vmstat-fix-2 include/linux/mmzone.h
--- a/include/linux/mmzone.h~mm-add-nr_zsmalloc-to-vmstat-fix-2
+++ a/include/linux/mmzone.h
@@ -141,7 +141,7 @@ enum zone_stat_item {
NR_WRITTEN, /* page writings since bootup */
NR_PAGES_SCANNED, /* pages scanned since last reclaim */
#if IS_ENABLED(CONFIG_ZSMALLOC)
- NR_ZSMALLOC,
+ NR_ZSPAGES, /* allocated in zsmalloc */
#endif
#ifdef CONFIG_NUMA
NUMA_HIT, /* allocated in intended node */
diff -puN mm/vmstat.c~mm-add-nr_zsmalloc-to-vmstat-fix-2 mm/vmstat.c
--- a/mm/vmstat.c~mm-add-nr_zsmalloc-to-vmstat-fix-2
+++ a/mm/vmstat.c
@@ -719,7 +719,7 @@ const char * const vmstat_text[] = {
"nr_written",
"nr_pages_scanned",
#if IS_ENABLED(CONFIG_ZSMALLOC)
- "nr_zsmalloc",
+ "nr_zspages",
#endif
#ifdef CONFIG_NUMA
"numa_hit",
diff -puN mm/zsmalloc.c~mm-add-nr_zsmalloc-to-vmstat-fix-2 mm/zsmalloc.c
--- a/mm/zsmalloc.c~mm-add-nr_zsmalloc-to-vmstat-fix-2
+++ a/mm/zsmalloc.c
@@ -1007,8 +1007,8 @@ static void __free_zspage(struct zs_pool
next = get_next_page(page);
reset_page(page);
unlock_page(page);
+ dec_zone_page_state(page, NR_ZSPAGES);
put_page(page);
- dec_zone_page_state(page, NR_ZSMALLOC);
page = next;
} while (page != NULL);
@@ -1139,14 +1139,14 @@ static struct zspage *alloc_zspage(struc
page = alloc_page(gfp);
if (!page) {
while (--i >= 0) {
+ dec_zone_page_state(pages[i], NR_ZSPAGES);
__free_page(pages[i]);
- dec_zone_page_state(page, NR_ZSMALLOC);
}
cache_free_zspage(pool, zspage);
return NULL;
}
- inc_zone_page_state(page, NR_ZSMALLOC);
+ inc_zone_page_state(page, NR_ZSPAGES);
pages[i] = page;
}
_
Patches currently in -mm which might be from minchan@xxxxxxxxxx are
mm-use-put_page-to-free-page-instead-of-putback_lru_page.patch
mm-migrate-support-non-lru-movable-page-migration.patch
mm-balloon-use-general-non-lru-movable-page-feature.patch
zsmalloc-keep-max_object-in-size_class.patch
zsmalloc-use-bit_spin_lock.patch
zsmalloc-use-accessor.patch
zsmalloc-factor-page-chain-functionality-out.patch
zsmalloc-introduce-zspage-structure.patch
zsmalloc-separate-free_zspage-from-putback_zspage.patch
zsmalloc-use-freeobj-for-index.patch
zsmalloc-page-migration-support.patch
zram-use-__gfp_movable-for-memory-allocation.patch
zsmalloc-use-obj_tag_bit-for-bit-shifter.patch
mm-add-nr_zsmalloc-to-vmstat.patch
mm-fix-build-warnings-in-linux-compactionh.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
