The patch titled
Subject: zsmalloc: factor out zs_pages_to_compact()
has been removed from the -mm tree. Its filename was
zsmalloc-factor-out-zs_pages_to_compact.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Subject: zsmalloc: factor out zs_pages_to_compact()
Factor out the code that calculates how many pages compaction can free
into zs_pages_to_compact() function and export it as zsmalloc API symbol.
We still use it in zs_shrinker_count(), just like we did before, and at
the same time we now let zram know this number (and provide it to user
space) so user space can make better assumptions about manual compaction
effectiveness.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/zsmalloc.h | 1
mm/zsmalloc.c | 39 +++++++++++++++++++++----------------
2 files changed, 24 insertions(+), 16 deletions(-)
diff -puN include/linux/zsmalloc.h~zsmalloc-factor-out-zs_pages_to_compact include/linux/zsmalloc.h
--- a/include/linux/zsmalloc.h~zsmalloc-factor-out-zs_pages_to_compact
+++ a/include/linux/zsmalloc.h
@@ -53,6 +53,7 @@ void zs_unmap_object(struct zs_pool *poo
unsigned long zs_get_total_pages(struct zs_pool *pool);
unsigned long zs_compact(struct zs_pool *pool);
+unsigned long zs_pages_to_compact(struct zs_pool *pool);
void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats);
#endif
diff -puN mm/zsmalloc.c~zsmalloc-factor-out-zs_pages_to_compact mm/zsmalloc.c
--- a/mm/zsmalloc.c~zsmalloc-factor-out-zs_pages_to_compact
+++ a/mm/zsmalloc.c
@@ -1798,6 +1798,28 @@ void zs_pool_stats(struct zs_pool *pool,
}
EXPORT_SYMBOL_GPL(zs_pool_stats);
+unsigned long zs_pages_to_compact(struct zs_pool *pool)
+{
+ unsigned long pages_to_free = 0;
+ int i;
+ struct size_class *class;
+
+ for (i = zs_size_classes - 1; i >= 0; i--) {
+ class = pool->size_class[i];
+ if (!class)
+ continue;
+ if (class->index != i)
+ continue;
+
+ spin_lock(&class->lock);
+ pages_to_free += zs_can_compact(class);
+ spin_unlock(&class->lock);
+ }
+
+ return pages_to_free;
+}
+EXPORT_SYMBOL_GPL(zs_pages_to_compact);
+
static unsigned long zs_shrinker_scan(struct shrinker *shrinker,
struct shrink_control *sc)
{
@@ -1819,28 +1841,13 @@ static unsigned long zs_shrinker_scan(st
static unsigned long zs_shrinker_count(struct shrinker *shrinker,
struct shrink_control *sc)
{
- int i;
- struct size_class *class;
- unsigned long pages_to_free = 0;
struct zs_pool *pool = container_of(shrinker, struct zs_pool,
shrinker);
if (!pool->shrinker_enabled)
return 0;
- for (i = zs_size_classes - 1; i >= 0; i--) {
- class = pool->size_class[i];
- if (!class)
- continue;
- if (class->index != i)
- continue;
-
- spin_lock(&class->lock);
- pages_to_free += zs_can_compact(class);
- spin_unlock(&class->lock);
- }
-
- return pages_to_free;
+ return zs_pages_to_compact(pool);
}
static void zs_unregister_shrinker(struct zs_pool *pool)
_
Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are
zsmalloc-drop-unused-variable-nr_to_migrate.patch
zsmalloc-always-keep-per-class-stats.patch
zsmalloc-introduce-zs_can_compact-function.patch
zsmalloc-cosmetic-compaction-code-adjustments.patch
zsmalloc-zram-introduce-zs_pool_stats-api.patch
zsmalloc-account-the-number-of-compacted-pages.patch
zsmalloc-use-shrinker-to-trigger-auto-compaction.patch
zsmalloc-partial-page-ordering-within-a-fullness_list.patch
zsmalloc-consider-zs_almost_full-as-migrate-source.patch
zram-make-compact-a-read-write-sysfs-node.patch
zsmalloc-do-not-take-class-lock-in-zs_pages_to_compact.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
