From patchwork Wed Feb 14 08:54:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13556094 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE754C48BC4 for ; Wed, 14 Feb 2024 08:54:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 231E18D0013; Wed, 14 Feb 2024 03:54:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1ED868D0001; Wed, 14 Feb 2024 03:54:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF1028D0013; Wed, 14 Feb 2024 03:54:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CB3078D0001 for ; Wed, 14 Feb 2024 03:54:51 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A10E3C0797 for ; Wed, 14 Feb 2024 08:54:51 +0000 (UTC) X-FDA: 81789799182.14.37A4B6A Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) by imf12.hostedemail.com (Postfix) with ESMTP id C6F1140013 for ; Wed, 14 Feb 2024 08:54:49 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf12.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707900890; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fwDwUvl5oErYnGAEQNxIu6TsJxhn36KEY4oty3LjmHg=; b=s4nwzqdY53DqMcPK1Hcwe0tcMElmOuV1V5IpF2+0YcIgNtt/OCNvj8aj0WVufv3r+yXqHT lzo/kSlA4ccrRXTu2h8p8ZqIF1q24M5A9VhjJjcPIuTR07uDx2kyRWbo6hAbw0hwFPnqpy SfPrpYgiy8quc/aP5Oy3RDhPHWeN2Hg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf12.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707900890; a=rsa-sha256; cv=none; b=ROdtMJDMGUfkwumhQ98SjWqV5wlwNyCzMP23t0YZqOZnLuAPhL2n2zC/1uI84dFhUcD6An E9Puyew2jDIpLVtx3IHXaVTdO8RNYKuHY2g2Pkfvjp6EeBxV53HDb51jUMBmWunSByGbus O6McpghJuu0ADKGahfj3qINmy413iqQ= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Wed, 14 Feb 2024 08:54:37 +0000 Subject: [PATCH v2 1/2] mm/zswap: global lru and shrinker shared by all zswap_pools MIME-Version: 1.0 Message-Id: <20240210-zswap-global-lru-v2-1-fbee3b11a62e@bytedance.com> References: <20240210-zswap-global-lru-v2-0-fbee3b11a62e@bytedance.com> In-Reply-To: <20240210-zswap-global-lru-v2-0-fbee3b11a62e@bytedance.com> To: Yosry Ahmed , Johannes Weiner , Andrew Morton , Nhat Pham Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: C6F1140013 X-Stat-Signature: ztar6em1sojr1krknjyy3wa41q7ejofp X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1707900889-23742 X-HE-Meta: U2FsdGVkX1/KN/Q1Rolaiv5otdCX9wXWywDSfniKdn6duwXImLKmNPZGgc2pxURDYYaqSHDLaUYLcFtSgBNXwN2z1wzRlz6cQ0bXBZmPJZIN2bdB90BqQArLpjIseIk12K2wqAoCzSpYHpdcXXzdZkFZEmkfsz6QijABlVc2nvW9kEIeQn18XoTihv8Ex00T+u9RetCh9rpEpSjeNS2Hkn1ZT/T1YI87FgbCExnAe4E6u77s5cp05zCJKCqzEvZvwW1cpzZZRDelx6UI4Z369OTTOtwMLHoCov9VOFhBYCxEFcF1yusPnbJu7h9vjw/6JyqwVWWFsucD+NtiDt9j2kRB5uce2gF9hpSg3XFSZfTOH1Ek+HT1pDhXODD1w+4aGYRMwQ8KdI0f3biDtAGuHvVFQMjdbPs4ozIZ9SIVH1RLwd4TsomrUbB/QtxTd2liUsI9tT0g0PQwVOtf3Jg4vEzQXDZPOiVmziyXOjtilmgGvowhYMyj+jMVumdjcLCFYSxo0B4sKc4K5XZFLGcaoVf6c9qFPBKDYLQh6C7RFVM3l/U9qdU3YjeL+8G0B7zG26lnUFk6cTJGax1bfp8EJnhxPROHS+Fbvth9dfVDBt58u4CY2zYVqPygLz8V5kGSwLlJv55xB35kA2hLYmMVG0IdE5JmpewAPKnkwsSU4m6H5K7kgwYPIfqwr43Pw61OxDfl0/GWRqqQIrQt1X+BuPJNF1ARl7BnH8f0m0SNC/Tytflagz6cvzsTdMytRNpjlOUAjP/w3aFUpAB1Gd/3S24BLHeQunQgtSvdSNJvZtGLmnrgJvlopVfukebiSSWv4+2T33WlXBf0RPXBENsboR9HX1mhDgVLzK+Jv/gXSnf9zfU+z3+TV0WapF8U7lGLjEPzXBNhqQTR25+xX5nGaOK/7vg2AgvgfmXQeDea9lx7MFXIvA/B3nU/TRA0J3odUpGXr/i0CaDl9QJfE/l EM45HxvB QqweBg0l6JuXy3agrDdxUG9THshbfcHQ0yaiJaoH5ztcaK2IyOdB1XQY3XhkeYrcZV9ptImhkEnnV6EXgdC/ru6JElulsL67nZYIXV3v87eZzKNqv8sn9dZXsakhKskeAwdUs3jiAm9HtlqIbV6+P/gJsXdFj9cBda9P2Nd4r2dk2ukVJBwEcyAVfMjygj9tFTRY2Cxxi+7tEI6cuH2Toexib0BqoN/1LTAieJnKg7JPr9MZdYoOUMXvwwYymAHYh+SMcY0JwehGZFRX3kvGlTtAI8o9cHLixwXSMsaCyfmuPWs7ecZlWc+RFSG7r8rm22GSw2aVMdGvLtZ4wnKf1XYdT+miW8OaR6/wSWJyHHNs1rtgGMKVnm2zu6A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Dynamic zswap_pool creation may create/reuse to have multiple zswap_pools in a list, only the first will be current used. Each zswap_pool has its own lru and shrinker, which is not necessary and has its problem: 1. When memory has pressure, all shrinker of zswap_pools will try to shrink its own lru, there is no order between them. 2. When zswap limit hit, only the last zswap_pool's shrink_work will try to shrink its lru, which is inefficient. Anyway, having a global lru and shrinker shared by all zswap_pools is better and efficient. Signed-off-by: Chengming Zhou Acked-by: Yosry Ahmed --- mm/zswap.c | 170 +++++++++++++++++++++++-------------------------------------- 1 file changed, 65 insertions(+), 105 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 62fe307521c9..dbff67d7e1c7 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -176,14 +176,18 @@ struct zswap_pool { struct kref kref; struct list_head list; struct work_struct release_work; - struct work_struct shrink_work; struct hlist_node node; char tfm_name[CRYPTO_MAX_ALG_NAME]; +}; + +static struct { struct list_lru list_lru; - struct mem_cgroup *next_shrink; - struct shrinker *shrinker; atomic_t nr_stored; -}; + struct shrinker *shrinker; + struct work_struct shrink_work; + struct mem_cgroup *next_shrink; + spinlock_t shrink_lock; +} zswap; /* * struct zswap_entry @@ -301,9 +305,6 @@ static void zswap_update_total_size(void) * pool functions **********************************/ -static void zswap_alloc_shrinker(struct zswap_pool *pool); -static void shrink_worker(struct work_struct *w); - static struct zswap_pool *zswap_pool_create(char *type, char *compressor) { int i; @@ -353,30 +354,16 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) if (ret) goto error; - zswap_alloc_shrinker(pool); - if (!pool->shrinker) - goto error; - - pr_debug("using %s compressor\n", pool->tfm_name); - /* being the current pool takes 1 ref; this func expects the * caller to always add the new pool as the current pool */ kref_init(&pool->kref); INIT_LIST_HEAD(&pool->list); - if (list_lru_init_memcg(&pool->list_lru, pool->shrinker)) - goto lru_fail; - shrinker_register(pool->shrinker); - INIT_WORK(&pool->shrink_work, shrink_worker); - atomic_set(&pool->nr_stored, 0); zswap_pool_debug("created", pool); return pool; -lru_fail: - list_lru_destroy(&pool->list_lru); - shrinker_free(pool->shrinker); error: if (pool->acomp_ctx) free_percpu(pool->acomp_ctx); @@ -434,15 +421,8 @@ static void zswap_pool_destroy(struct zswap_pool *pool) zswap_pool_debug("destroying", pool); - shrinker_free(pool->shrinker); cpuhp_state_remove_instance(CPUHP_MM_ZSWP_POOL_PREPARE, &pool->node); free_percpu(pool->acomp_ctx); - list_lru_destroy(&pool->list_lru); - - spin_lock(&zswap_pools_lock); - mem_cgroup_iter_break(NULL, pool->next_shrink); - pool->next_shrink = NULL; - spin_unlock(&zswap_pools_lock); for (i = 0; i < ZSWAP_NR_ZPOOLS; i++) zpool_destroy_pool(pool->zpools[i]); @@ -529,24 +509,6 @@ static struct zswap_pool *zswap_pool_current_get(void) return pool; } -static struct zswap_pool *zswap_pool_last_get(void) -{ - struct zswap_pool *pool, *last = NULL; - - rcu_read_lock(); - - list_for_each_entry_rcu(pool, &zswap_pools, list) - last = pool; - WARN_ONCE(!last && zswap_has_pool, - "%s: no page storage pool!\n", __func__); - if (!zswap_pool_get(last)) - last = NULL; - - rcu_read_unlock(); - - return last; -} - /* type and compressor must be null-terminated */ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor) { @@ -816,15 +778,11 @@ void zswap_folio_swapin(struct folio *folio) void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg) { - struct zswap_pool *pool; - - /* lock out zswap pools list modification */ - spin_lock(&zswap_pools_lock); - list_for_each_entry(pool, &zswap_pools, list) { - if (pool->next_shrink == memcg) - pool->next_shrink = mem_cgroup_iter(NULL, pool->next_shrink, NULL); - } - spin_unlock(&zswap_pools_lock); + /* lock out zswap shrinker walking memcg tree */ + spin_lock(&zswap.shrink_lock); + if (zswap.next_shrink == memcg) + zswap.next_shrink = mem_cgroup_iter(NULL, zswap.next_shrink, NULL); + spin_unlock(&zswap.shrink_lock); } /********************************* @@ -923,9 +881,9 @@ static void zswap_entry_free(struct zswap_entry *entry) if (!entry->length) atomic_dec(&zswap_same_filled_pages); else { - zswap_lru_del(&entry->pool->list_lru, entry); + zswap_lru_del(&zswap.list_lru, entry); zpool_free(zswap_find_zpool(entry), entry->handle); - atomic_dec(&entry->pool->nr_stored); + atomic_dec(&zswap.nr_stored); zswap_pool_put(entry->pool); } if (entry->objcg) { @@ -1288,7 +1246,6 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, { struct lruvec *lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); unsigned long shrink_ret, nr_protected, lru_size; - struct zswap_pool *pool = shrinker->private_data; bool encountered_page_in_swapcache = false; if (!zswap_shrinker_enabled || @@ -1299,7 +1256,7 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, nr_protected = atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); - lru_size = list_lru_shrink_count(&pool->list_lru, sc); + lru_size = list_lru_shrink_count(&zswap.list_lru, sc); /* * Abort if we are shrinking into the protected region. @@ -1316,7 +1273,7 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, return SHRINK_STOP; } - shrink_ret = list_lru_shrink_walk(&pool->list_lru, sc, &shrink_memcg_cb, + shrink_ret = list_lru_shrink_walk(&zswap.list_lru, sc, &shrink_memcg_cb, &encountered_page_in_swapcache); if (encountered_page_in_swapcache) @@ -1328,7 +1285,6 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, static unsigned long zswap_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) { - struct zswap_pool *pool = shrinker->private_data; struct mem_cgroup *memcg = sc->memcg; struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(sc->nid)); unsigned long nr_backing, nr_stored, nr_freeable, nr_protected; @@ -1342,8 +1298,8 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, nr_stored = memcg_page_state(memcg, MEMCG_ZSWAPPED); #else /* use pool stats instead of memcg stats */ - nr_backing = get_zswap_pool_size(pool) >> PAGE_SHIFT; - nr_stored = atomic_read(&pool->nr_stored); + nr_backing = zswap_pool_total_size >> PAGE_SHIFT; + nr_stored = atomic_read(&zswap.nr_stored); #endif if (!nr_stored) @@ -1351,7 +1307,7 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, nr_protected = atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); - nr_freeable = list_lru_shrink_count(&pool->list_lru, sc); + nr_freeable = list_lru_shrink_count(&zswap.list_lru, sc); /* * Subtract the lru size by an estimate of the number of pages * that should be protected. @@ -1367,23 +1323,24 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, return mult_frac(nr_freeable, nr_backing, nr_stored); } -static void zswap_alloc_shrinker(struct zswap_pool *pool) +static struct shrinker *zswap_alloc_shrinker(void) { - pool->shrinker = + struct shrinker *shrinker; + + shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE, "mm-zswap"); - if (!pool->shrinker) - return; + if (!shrinker) + return NULL; - pool->shrinker->private_data = pool; - pool->shrinker->scan_objects = zswap_shrinker_scan; - pool->shrinker->count_objects = zswap_shrinker_count; - pool->shrinker->batch = 0; - pool->shrinker->seeks = DEFAULT_SEEKS; + shrinker->scan_objects = zswap_shrinker_scan; + shrinker->count_objects = zswap_shrinker_count; + shrinker->batch = 0; + shrinker->seeks = DEFAULT_SEEKS; + return shrinker; } static int shrink_memcg(struct mem_cgroup *memcg) { - struct zswap_pool *pool; int nid, shrunk = 0; if (!mem_cgroup_zswap_writeback_enabled(memcg)) @@ -1396,32 +1353,25 @@ static int shrink_memcg(struct mem_cgroup *memcg) if (memcg && !mem_cgroup_online(memcg)) return -ENOENT; - pool = zswap_pool_current_get(); - if (!pool) - return -EINVAL; - for_each_node_state(nid, N_NORMAL_MEMORY) { unsigned long nr_to_walk = 1; - shrunk += list_lru_walk_one(&pool->list_lru, nid, memcg, + shrunk += list_lru_walk_one(&zswap.list_lru, nid, memcg, &shrink_memcg_cb, NULL, &nr_to_walk); } - zswap_pool_put(pool); return shrunk ? 0 : -EAGAIN; } static void shrink_worker(struct work_struct *w) { - struct zswap_pool *pool = container_of(w, typeof(*pool), - shrink_work); struct mem_cgroup *memcg; int ret, failures = 0; /* global reclaim will select cgroup in a round-robin fashion. */ do { - spin_lock(&zswap_pools_lock); - pool->next_shrink = mem_cgroup_iter(NULL, pool->next_shrink, NULL); - memcg = pool->next_shrink; + spin_lock(&zswap.shrink_lock); + zswap.next_shrink = mem_cgroup_iter(NULL, zswap.next_shrink, NULL); + memcg = zswap.next_shrink; /* * We need to retry if we have gone through a full round trip, or if we @@ -1435,7 +1385,7 @@ static void shrink_worker(struct work_struct *w) * memcg is not killed when we are reclaiming. */ if (!memcg) { - spin_unlock(&zswap_pools_lock); + spin_unlock(&zswap.shrink_lock); if (++failures == MAX_RECLAIM_RETRIES) break; @@ -1445,15 +1395,15 @@ static void shrink_worker(struct work_struct *w) if (!mem_cgroup_tryget_online(memcg)) { /* drop the reference from mem_cgroup_iter() */ mem_cgroup_iter_break(NULL, memcg); - pool->next_shrink = NULL; - spin_unlock(&zswap_pools_lock); + zswap.next_shrink = NULL; + spin_unlock(&zswap.shrink_lock); if (++failures == MAX_RECLAIM_RETRIES) break; goto resched; } - spin_unlock(&zswap_pools_lock); + spin_unlock(&zswap.shrink_lock); ret = shrink_memcg(memcg); /* drop the extra reference */ @@ -1467,7 +1417,6 @@ static void shrink_worker(struct work_struct *w) resched: cond_resched(); } while (!zswap_can_accept()); - zswap_pool_put(pool); } static int zswap_is_page_same_filled(void *ptr, unsigned long *value) @@ -1508,7 +1457,6 @@ bool zswap_store(struct folio *folio) struct zswap_entry *entry, *dupentry; struct obj_cgroup *objcg = NULL; struct mem_cgroup *memcg = NULL; - struct zswap_pool *shrink_pool; VM_WARN_ON_ONCE(!folio_test_locked(folio)); VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); @@ -1576,7 +1524,7 @@ bool zswap_store(struct folio *folio) if (objcg) { memcg = get_mem_cgroup_from_objcg(objcg); - if (memcg_list_lru_alloc(memcg, &entry->pool->list_lru, GFP_KERNEL)) { + if (memcg_list_lru_alloc(memcg, &zswap.list_lru, GFP_KERNEL)) { mem_cgroup_put(memcg); goto put_pool; } @@ -1607,8 +1555,8 @@ bool zswap_store(struct folio *folio) } if (entry->length) { INIT_LIST_HEAD(&entry->lru); - zswap_lru_add(&entry->pool->list_lru, entry); - atomic_inc(&entry->pool->nr_stored); + zswap_lru_add(&zswap.list_lru, entry); + atomic_inc(&zswap.nr_stored); } spin_unlock(&tree->lock); @@ -1640,9 +1588,7 @@ bool zswap_store(struct folio *folio) return false; shrink: - shrink_pool = zswap_pool_last_get(); - if (shrink_pool && !queue_work(shrink_wq, &shrink_pool->shrink_work)) - zswap_pool_put(shrink_pool); + queue_work(shrink_wq, &zswap.shrink_work); goto reject; } @@ -1804,6 +1750,22 @@ static int zswap_setup(void) if (ret) goto hp_fail; + shrink_wq = alloc_workqueue("zswap-shrink", + WQ_UNBOUND|WQ_MEM_RECLAIM, 1); + if (!shrink_wq) + goto shrink_wq_fail; + + zswap.shrinker = zswap_alloc_shrinker(); + if (!zswap.shrinker) + goto shrinker_fail; + if (list_lru_init_memcg(&zswap.list_lru, zswap.shrinker)) + goto lru_fail; + shrinker_register(zswap.shrinker); + + INIT_WORK(&zswap.shrink_work, shrink_worker); + atomic_set(&zswap.nr_stored, 0); + spin_lock_init(&zswap.shrink_lock); + pool = __zswap_pool_create_fallback(); if (pool) { pr_info("loaded using pool %s/%s\n", pool->tfm_name, @@ -1815,19 +1777,17 @@ static int zswap_setup(void) zswap_enabled = false; } - shrink_wq = alloc_workqueue("zswap-shrink", - WQ_UNBOUND|WQ_MEM_RECLAIM, 1); - if (!shrink_wq) - goto fallback_fail; - if (zswap_debugfs_init()) pr_warn("debugfs initialization failed\n"); zswap_init_state = ZSWAP_INIT_SUCCEED; return 0; -fallback_fail: - if (pool) - zswap_pool_destroy(pool); +lru_fail: + shrinker_free(zswap.shrinker); +shrinker_fail: + destroy_workqueue(shrink_wq); +shrink_wq_fail: + cpuhp_remove_multi_state(CPUHP_MM_ZSWP_POOL_PREPARE); hp_fail: kmem_cache_destroy(zswap_entry_cache); cache_fail: From patchwork Wed Feb 14 08:54:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13556095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9D6BC48BEC for ; Wed, 14 Feb 2024 08:54:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5C168D0014; Wed, 14 Feb 2024 03:54:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ABDC48D0001; Wed, 14 Feb 2024 03:54:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95DD08D0014; Wed, 14 Feb 2024 03:54:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 81FB48D0001 for ; Wed, 14 Feb 2024 03:54:53 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5454FA2202 for ; Wed, 14 Feb 2024 08:54:53 +0000 (UTC) X-FDA: 81789799266.11.E68A2B7 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) by imf14.hostedemail.com (Postfix) with ESMTP id 8AB2C100016 for ; Wed, 14 Feb 2024 08:54:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf14.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707900891; a=rsa-sha256; cv=none; b=kcKU+bTAQOCkQ5ocYg1Rqn4gAycclZ31dDp10k1pbWk5UvfaRoBIcewhAouq6X+PcEGcow 48w9jCs/xL+Q1WTeAMqlkD6/0uZw681nykvZFDiBWibuV5DU8FlZVUIeLHpGo5idA4d9B0 uLWpl8+Vi+lJCyczHzDRFPJLs9TrKdI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf14.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707900891; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1p4VLiafWD3G/v8RUY99fbKtMhISGd+RELaghb++nEw=; b=qnl/FxrG4Sduo3tfdVxx85v5zR0KFEsPPlmyDXgzFGrzpTtDeyu/suMQtuozeLWGgBVTzp b96scLJ6L7gCP0XMFcyGYnVEFY0FTGdzoGlf+wLr2MPxMdMTKeWijt3az7NLY1BPuS7lAr eQKVYFSmPvbd+4kEgv1MhuDxm5rEgew= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Wed, 14 Feb 2024 08:54:38 +0000 Subject: [PATCH v2 2/2] mm/zswap: change zswap_pool kref to percpu_ref MIME-Version: 1.0 Message-Id: <20240210-zswap-global-lru-v2-2-fbee3b11a62e@bytedance.com> References: <20240210-zswap-global-lru-v2-0-fbee3b11a62e@bytedance.com> In-Reply-To: <20240210-zswap-global-lru-v2-0-fbee3b11a62e@bytedance.com> To: Yosry Ahmed , Johannes Weiner , Andrew Morton , Nhat Pham Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 8AB2C100016 X-Stat-Signature: 6wjrdd6wgi18kzmzct6xfd5gpq1rw83q X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1707900891-691345 X-HE-Meta: U2FsdGVkX1+amttiaceESOMffjyzkWRD534GSBFauvJc0HyL60T6MmVZW5RAHce9c2agweXq3EZ4ed/HqvTjgWg9ct4JfX27HeZr8AlueCJxrMV08bInnYdcMwOmVyPJ7BT7nqLe8LHOUeEnbvN4U6hL9aO0b9Dr10w0F+Xy/eE/ZUjBsM1XUnOa7jaqgR1WY8yCilIZ/CmbFETkXhKureQxNg65Gc8T4scRtvo6lVTdM8vguipeiwUz6YVUHhfHydaPTxy9fnZvkTVI07R5Ad6MHWakz7SX0nVtHAAN3j25DbldSEhWc0LF7dBovIxDJC8IfbfmKyVD1t7pv0otpnWgMGwNwLmuKAYfYLdJaQDZHX9HOHUjPPQgD/QxMQdErRYzLIIJkFsXTnLuNApKvxHB46rBYdWXXF4+8jZ7JsWZGeEd8/vaHtx1elKyFzLKIryCZukELBh0ORtKS2g927qcNPlXyqOBXYGcs4MZsEhMElqN6BGeZB0481G7XMLb6+A0vkJ48GI+xE0q8TwBRK55vLERwp0rYOh0LuQfc5Bx1FRRtunuyv2VeIDEFH3lpHkVurN7+pgNFFtsKeyjp0O7KZ3wpUHUptq2FerhOYJPBEgkWItR87m/9AfLyVkiaYf/F/vWDOH3q4kcz/N27jYXo6ykU7keCNNYhzefnxgESKMPruX48aFk0IGKZeaRkywDA1pvrdLNqrP1VtDN0Ptx7hy51aIVTRdCJsZZd7MMyfrahJGLL26ji4gcSG64RXAn4JuQyUmSE4nOIQuZCsQ8A/BJBwf3OsUrPwPPWZ1nyL8sp3PlWFVJBrwrAq/FepdqMcE9qYKYrDaUFd0Wgz8aqXLg+kXt8elCxG6xkeLzGUVXzgn1ch31T/o4tiCUZGjMqBvN3ViumyAuxuo0gmmCeJ/c+62ZHg9jXqtn50I745Ow0cJH52iUvSTFmtMvECWDqXc44YEIKSFQflT xVjSFEhP LxtbzHCq3axG+v6lPeIV608MsASIhikBneIvxZ+i2pI/AC/KBkDuEO2eS0BWBZETPB+p46sMgQrzuoFEUFKRnTZZUl/ZmLlGcLtQ5B2j+TvAdn8ThsIYk1Win1B6LhU1MsTHI/kmqy6XpUw9J/cWrnmZYwNBooeIpUSvehNqOgrLXQx5HwQdFCym6G93GUK1HTGE3gSQ8GxhmU5XyCSH8boYP2v2ftrmy8L3ecSUF9ZlrzlrZQWwA6zRBhbWAI6PodGCeSveT71SXqetBZJuDYMqEkq0OoS1FbTy9CfO2NDl5+eeMchMNRFAo12kWQm7WfRlVWEKquBAXhv5hzzNnY+k8IgF6j1nX8aeltUyQAutAbz7nQa/ApL4Pxg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: All zswap entries will take a reference of zswap_pool when zswap_store(), and drop it when free. Change it to use the percpu_ref is better for scalability performance. Although percpu_ref use a bit more memory which should be ok for our use case, since we almost have only one zswap_pool to be using. The performance gain is for zswap_store/load hotpath. Testing kernel build (32 threads) in tmpfs with memory.max=2GB. (zswap shrinker and writeback enabled with one 50GB swapfile, on a 128 CPUs x86-64 machine, below is the average of 5 runs) mm-unstable zswap-global-lru real 63.20 63.12 user 1061.75 1062.95 sys 268.74 264.44 Signed-off-by: Chengming Zhou --- mm/zswap.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index dbff67d7e1c7..f6470d30d337 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -173,7 +173,7 @@ struct crypto_acomp_ctx { struct zswap_pool { struct zpool *zpools[ZSWAP_NR_ZPOOLS]; struct crypto_acomp_ctx __percpu *acomp_ctx; - struct kref kref; + struct percpu_ref ref; struct list_head list; struct work_struct release_work; struct hlist_node node; @@ -304,6 +304,7 @@ static void zswap_update_total_size(void) /********************************* * pool functions **********************************/ +static void __zswap_pool_empty(struct percpu_ref *ref); static struct zswap_pool *zswap_pool_create(char *type, char *compressor) { @@ -357,13 +358,18 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) /* being the current pool takes 1 ref; this func expects the * caller to always add the new pool as the current pool */ - kref_init(&pool->kref); + ret = percpu_ref_init(&pool->ref, __zswap_pool_empty, + PERCPU_REF_ALLOW_REINIT, GFP_KERNEL); + if (ret) + goto ref_fail; INIT_LIST_HEAD(&pool->list); zswap_pool_debug("created", pool); return pool; +ref_fail: + cpuhp_state_remove_instance(CPUHP_MM_ZSWP_POOL_PREPARE, &pool->node); error: if (pool->acomp_ctx) free_percpu(pool->acomp_ctx); @@ -436,8 +442,9 @@ static void __zswap_pool_release(struct work_struct *work) synchronize_rcu(); - /* nobody should have been able to get a kref... */ - WARN_ON(kref_get_unless_zero(&pool->kref)); + /* nobody should have been able to get a ref... */ + WARN_ON(percpu_ref_tryget(&pool->ref)); + percpu_ref_exit(&pool->ref); /* pool is now off zswap_pools list and has no references. */ zswap_pool_destroy(pool); @@ -445,11 +452,11 @@ static void __zswap_pool_release(struct work_struct *work) static struct zswap_pool *zswap_pool_current(void); -static void __zswap_pool_empty(struct kref *kref) +static void __zswap_pool_empty(struct percpu_ref *ref) { struct zswap_pool *pool; - pool = container_of(kref, typeof(*pool), kref); + pool = container_of(ref, typeof(*pool), ref); spin_lock(&zswap_pools_lock); @@ -468,12 +475,12 @@ static int __must_check zswap_pool_get(struct zswap_pool *pool) if (!pool) return 0; - return kref_get_unless_zero(&pool->kref); + return percpu_ref_tryget(&pool->ref); } static void zswap_pool_put(struct zswap_pool *pool) { - kref_put(&pool->kref, __zswap_pool_empty); + percpu_ref_put(&pool->ref); } static struct zswap_pool *__zswap_pool_current(void) @@ -603,6 +610,12 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, if (!pool) pool = zswap_pool_create(type, compressor); + else { + /* Resurrect percpu_ref to percpu mode. */ + percpu_ref_resurrect(&pool->ref); + /* Drop the ref from zswap_pool_find_get(). */ + zswap_pool_put(pool); + } if (pool) ret = param_set_charp(s, kp); @@ -641,7 +654,7 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, * or the new pool we failed to add */ if (put_pool) - zswap_pool_put(put_pool); + percpu_ref_kill(&put_pool->ref); return ret; }