From patchwork Tue Sep 19 17:14:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13391619 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 32630CE79AA for ; Tue, 19 Sep 2023 17:14:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2E146B0099; Tue, 19 Sep 2023 13:14:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A64E76B009B; Tue, 19 Sep 2023 13:14:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B7F46B009C; Tue, 19 Sep 2023 13:14:52 -0400 (EDT) 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 7834C6B0099 for ; Tue, 19 Sep 2023 13:14:52 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1E4111A0540 for ; Tue, 19 Sep 2023 17:14:52 +0000 (UTC) X-FDA: 81253996824.12.25CC627 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf14.hostedemail.com (Postfix) with ESMTP id 0B76410003B for ; Tue, 19 Sep 2023 17:14:49 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EUunrjFC; spf=pass (imf14.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695143690; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ps5yyHIsL0jmDCdV8gOzPQmLuV+jzhDxNGzAQR9e58w=; b=o6uxi1Wy+eOI0X0ESHceUuu9xQXaJ2/FiYJNKIbQGFYmjkl9wOfyGW8HUGSUjKIurAF2/P G+0jX8Q0XoDa2joF56O/zIvwvm925blTUYxPQaM/FlzkZ+XmzehmAlVz2MxM3JM+bGLVkQ kLJ5gWpxzxAXlH0gLzp2HLTAGFa68QA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EUunrjFC; spf=pass (imf14.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695143690; a=rsa-sha256; cv=none; b=0U04AdAuqQdiYnVoAA7G3P/vGlOdeDT3ij4MJSXsH8SI1hc3YTQrVOpwgpcgX+5iDeQHjI vpRnIccAxNJK7vlxfKwkrn0R5jo+Zb/gdEh8+fnpumjCSOrGPvwX8C6RFYauemG2VrK3ag o4LfVpXfjaZIwdi202MfhFuZfy1Plhw= Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-570a432468bso32891a12.0 for ; Tue, 19 Sep 2023 10:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695143689; x=1695748489; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ps5yyHIsL0jmDCdV8gOzPQmLuV+jzhDxNGzAQR9e58w=; b=EUunrjFCvyj1L71sv0SBSIUaVSs6xgLFQqm5H/G4qhhQMAiifCiGmXPGlNw5p2QVB6 a3Qky5ISTh7tEKfRz0ndyguS2w0XzEGlyXRSPUOa7rgKABw8V61oJ7VLvS5UPVfJc2/g RSeDP241X6xgfP4qxEam7uYXa1iYQwp63T+6Su1Jke6g4imnhR3GHNhvZbGOYE3JhOHw SfhcFpNHXeBDn4mvt1AmmnUz/aZWvFX92Ga0uD6FliaY/GcjtIJ4kfpPxDAKBEr/6OlI RWYOlUdaLbqzzy9Mm2mok472uGpCOOp7fGJ/N+CJ1VMUX2CS2WHetHsDCHVoq0vq8SbN F7EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695143689; x=1695748489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ps5yyHIsL0jmDCdV8gOzPQmLuV+jzhDxNGzAQR9e58w=; b=bRGa8lrm2qHFGjZh6IYAaqM+08VeEPE/qHim/flkesr8wkOKYkc4mj+jIj98vc8c2W oDQW48pR2WpKPmzf19NmC0H+wpOERXekN90omGCaLc1yqcwnMT8JSGExXtln58yYdyWB FGrdfRH2frPX4+vbangvnjq+JRDWmv21yiw+BhLmhVSbD1/UqxMHhFL7yS5bIa9lMWrr YYlEyR50aeMvI86VOg3DQw7DLgdeb3s+8NspLFVI0h+IFQ5s1PGwebxPjB8qJA8LtVZA RBIyaz75+l+fY6i/aig25c6mNxraLRIny3txbZ1h/BcIQikrtwrN/uGyIalvd+4xhckA N/mw== X-Gm-Message-State: AOJu0YwGRnIB8EtkCr298kahGdCljTthMViIhm+PUCxuhBn9pwxF95/o SWZp6V2xJU1Z8lyD8kVDO8g= X-Google-Smtp-Source: AGHT+IHDpWwVLic2HYDAbBTkOhk95Qv4mVErsEvBKGRpMMndhIeUKY6TBpt4feU2lPuvM4RpMokuUA== X-Received: by 2002:a17:90a:4594:b0:276:78f2:5d31 with SMTP id v20-20020a17090a459400b0027678f25d31mr304060pjg.21.1695143688694; Tue, 19 Sep 2023 10:14:48 -0700 (PDT) Received: from localhost (fwdproxy-prn-012.fbsv.net. [2a03:2880:ff:c::face:b00c]) by smtp.gmail.com with ESMTPSA id t5-20020a17090ad50500b00263154aab24sm8836683pju.57.2023.09.19.10.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 10:14:48 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, cerasuolodomenico@gmail.com, yosryahmed@google.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH v2 1/2] zswap: make shrinking memcg-aware Date: Tue, 19 Sep 2023 10:14:46 -0700 Message-Id: <20230919171447.2712746-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230919171447.2712746-1-nphamcs@gmail.com> References: <20230919171447.2712746-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0B76410003B X-Rspam-User: X-Stat-Signature: ny7ftpac7997fx44tgqg645czbqp4y38 X-Rspamd-Server: rspam01 X-HE-Tag: 1695143689-231895 X-HE-Meta: U2FsdGVkX1+dcWwwQAIqGWFw7ZgvkJohoq9oH1dOrEE8F+U20wji6syS+o8QXADHLW0ow+Nfp12v/DKzC/fZJdcSnizOWSx/WQAIZP4H7/v8UU8DVbeOnR1CcinJ977UztshlCm22dzl/gH8uqZfIxrLMelhRPZHU5W0myoxmg/Po1REUabs+bd2x2bULZBs4X1rgPKFV1W+dwCQwVB5b0sP0bIEn8UbADy5NPHszscrMOEwviXPBHghcD1Cwj3AHeOpV9wi4vrEfPc0Yf21SayST5Y6u5GRP9USJ6d/Dr5LiQQKJXvg7B6SKfj0LsbCWzk4dAfCQ0cRnAACtKPF4dUIcLqL11pgugcbSZTTaXBRfWCkvvjpRD7BWajgyQUHTHF+HQZepW6EBiFWiXL3ab65PEliVeywSaR5ixTxfgqiSVWTVlWM0y9egqWcqsUXqs+/psfLYsXtIyAy5QUcZP0WVgli9AIIfcOTbyGs7nPEiMhv2mJq+GKn7xtCEIimbuu5dFzX2sdYtx6/D8vQPS8g/W8e3+i+k3x4bBS8IsxLpic0aUfiCsfjTwQNggnzaIoHSXSwqV1JrWW1i7B01a6v3BbIc+h43lvz5uZIpTgwgxGIX6n1m0p87ljaBLTkz9Gj8exjSBnXozNk9i8HpVzPq53gB7/ZKKy+Gl4llSWfjvCm3+4wzj7Sf2+VL9C3wnnyQ2E4rMkgCBSmQVvMdZHFi2rrGdStt+Q6fNXMKoSrpWt2e+nFMDRLHaABl0orrTBZ9z42AsihKA4kV8sRGPViHAq0sK2eEPjkfKF/6Rwy6T4gaOK1ERJq5HRs8AiB8M1BXYQFuO+iWGr+b1oMWGOSSxpeIeO85DxRXeb37UNtoJ3fdXBbPSDeMEqJVWU1jtKCrF3KC/FTBanLhYZutbT8Ah0kZmQQaTHcbhBwQBdCiila2k4ND/S38QsDm9un2mKTRdz1lOUoJxH/evb 1YlScGf7 GOqH3baqf/B8Fj48LgeDrtGwRskwgbHenByf8d5397QM3TCcicZ7YASwlY1B5tWZhKg0y0ohiSFT8eGEia0lmF1zYTPs+pFrfGj7S3Foqcr7r7b9Sfw2go8us05+r1lLUACKg3skdp+k3Czy2Ap3zQc0O8kPNW9zAo1pdYNeLi1M/WYVadYjEurI50uJ6z3r0r07LxlN5PutoHPWx6foZ2dUx40PcCK/Leai2Gt/xXUereQGj/EZJNgNW9YiKN3kJRBEBnVYLlBx93zG2g7DPu45wx5UZMlMizw0rhmPsPEL9TBaK81zZjYLoXf5n5EQ4d2h8iVgXbppijFPpa47jzBAjUKfk8Ei5PlKMYNsLcr9zIzzkQb8CtIzgt3n8dpWTN71RULconSMos8IqdWmW/NUxn4JALhPT9wC8EFUD5mgvRJdJai1rjBoGH2AkTZRUqizHkAwQhvrnoi57oxHyvPhcHBWV4zRdcyep2vQMd7IKXAijbYxvENtyji8ckP6tiWsuKY7AxF0y+vklPr2xcPMDOOfITlQyufon 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: From: Domenico Cerasuolo Currently, we only have a single global LRU for zswap. This makes it impossible to perform worload-specific shrinking - an memcg cannot determine which pages in the pool it owns, and often ends up writing pages from other memcgs. This issue has been previously observed in practice and mitigated by simply disabling memcg-initiated shrinking: https://lore.kernel.org/all/20230530232435.3097106-1-nphamcs@gmail.com/T/#u This patch fully resolves the issue by replacing the global zswap LRU with memcg- and NUMA-specific LRUs, and modify the reclaim logic: a) When a store attempt hits an memcg limit, it now triggers a synchronous reclaim attempt that, if successful, allows the new hotter page to be accepted by zswap. b) If the store attempt instead hits the global zswap limit, it will trigger an asynchronous reclaim attempt, in which an memcg is selected for reclaim in a round-robin-like fashion. Signed-off-by: Domenico Cerasuolo Co-developed-by: Nhat Pham Signed-off-by: Nhat Pham --- include/linux/list_lru.h | 39 +++++++ include/linux/memcontrol.h | 5 + include/linux/zswap.h | 9 ++ mm/list_lru.c | 46 ++++++-- mm/swap_state.c | 19 ++++ mm/zswap.c | 221 +++++++++++++++++++++++++++++-------- 6 files changed, 287 insertions(+), 52 deletions(-) diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h index b35968ee9fb5..b517b4e2c7c4 100644 --- a/include/linux/list_lru.h +++ b/include/linux/list_lru.h @@ -89,6 +89,24 @@ void memcg_reparent_list_lrus(struct mem_cgroup *memcg, struct mem_cgroup *paren */ bool list_lru_add(struct list_lru *lru, struct list_head *item); +/** + * __list_lru_add: add an element to a specific sublist. + * @list_lru: the lru pointer + * @item: the item to be added. + * @memcg: the cgroup of the sublist to add the item to. + * @nid: the node id of the sublist to add the item to. + * + * This function is similar to list_lru_add(), but it allows the caller to + * specify the sublist to which the item should be added. This can be useful + * when the list_head node is not necessarily in the same cgroup and NUMA node + * as the data it represents, such as zswap, where the list_head node could be + * from kswapd and the data from a different cgroup altogether. + * + * Return value: true if the list was updated, false otherwise + */ +bool __list_lru_add(struct list_lru *lru, struct list_head *item, int nid, + struct mem_cgroup *memcg); + /** * list_lru_del: delete an element to the lru list * @list_lru: the lru pointer @@ -102,6 +120,18 @@ bool list_lru_add(struct list_lru *lru, struct list_head *item); */ bool list_lru_del(struct list_lru *lru, struct list_head *item); +/** + * __list_lru_delete: delete an element from a specific sublist. + * @list_lru: the lru pointer + * @item: the item to be deleted. + * @memcg: the cgroup of the sublist to delete the item from. + * @nid: the node id of the sublist to delete the item from. + * + * Return value: true if the list was updated, false otherwise. + */ +bool __list_lru_del(struct list_lru *lru, struct list_head *item, int nid, + struct mem_cgroup *memcg); + /** * list_lru_count_one: return the number of objects currently held by @lru * @lru: the lru pointer. @@ -137,6 +167,15 @@ void list_lru_isolate(struct list_lru_one *list, struct list_head *item); void list_lru_isolate_move(struct list_lru_one *list, struct list_head *item, struct list_head *head); +/* + * list_lru_putback: undo list_lru_isolate. + * + * Since we might have dropped the LRU lock in between, recompute list_lru_one + * from the node's id and memcg. + */ +void list_lru_putback(struct list_lru *lru, struct list_head *item, int nid, + struct mem_cgroup *memcg); + typedef enum lru_status (*list_lru_walk_cb)(struct list_head *item, struct list_lru_one *list, spinlock_t *lock, void *cb_arg); diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 67b823dfa47d..05d34b328d9d 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1179,6 +1179,11 @@ static inline struct mem_cgroup *page_memcg_check(struct page *page) return NULL; } +static inline struct mem_cgroup *get_mem_cgroup_from_objcg(struct obj_cgroup *objcg) +{ + return NULL; +} + static inline bool folio_memcg_kmem(struct folio *folio) { return false; diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 2a60ce39cfde..04f80b64a09b 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -15,6 +15,8 @@ bool zswap_load(struct folio *folio); void zswap_invalidate(int type, pgoff_t offset); void zswap_swapon(int type); void zswap_swapoff(int type); +bool zswap_remove_swpentry_from_lru(swp_entry_t swpentry); +void zswap_insert_swpentry_into_lru(swp_entry_t swpentry); #else @@ -32,6 +34,13 @@ static inline void zswap_invalidate(int type, pgoff_t offset) {} static inline void zswap_swapon(int type) {} static inline void zswap_swapoff(int type) {} +static inline bool zswap_remove_swpentry_from_lru(swp_entry_t swpentry) +{ + return false; +} + +static inline void zswap_insert_swpentry_into_lru(swp_entry_t swpentry) {} + #endif #endif /* _LINUX_ZSWAP_H */ diff --git a/mm/list_lru.c b/mm/list_lru.c index a05e5bef3b40..37c5c2ef6c0e 100644 --- a/mm/list_lru.c +++ b/mm/list_lru.c @@ -119,18 +119,26 @@ list_lru_from_kmem(struct list_lru *lru, int nid, void *ptr, bool list_lru_add(struct list_lru *lru, struct list_head *item) { int nid = page_to_nid(virt_to_page(item)); + struct mem_cgroup *memcg = list_lru_memcg_aware(lru) ? + mem_cgroup_from_slab_obj(item) : NULL; + + return __list_lru_add(lru, item, nid, memcg); +} +EXPORT_SYMBOL_GPL(list_lru_add); + +bool __list_lru_add(struct list_lru *lru, struct list_head *item, int nid, + struct mem_cgroup *memcg) +{ struct list_lru_node *nlru = &lru->node[nid]; - struct mem_cgroup *memcg; struct list_lru_one *l; spin_lock(&nlru->lock); if (list_empty(item)) { - l = list_lru_from_kmem(lru, nid, item, &memcg); + l = list_lru_from_memcg_idx(lru, nid, memcg_kmem_id(memcg)); list_add_tail(item, &l->list); /* Set shrinker bit if the first element was added */ if (!l->nr_items++) - set_shrinker_bit(memcg, nid, - lru_shrinker_id(lru)); + set_shrinker_bit(memcg, nid, lru_shrinker_id(lru)); nlru->nr_items++; spin_unlock(&nlru->lock); return true; @@ -138,17 +146,27 @@ bool list_lru_add(struct list_lru *lru, struct list_head *item) spin_unlock(&nlru->lock); return false; } -EXPORT_SYMBOL_GPL(list_lru_add); +EXPORT_SYMBOL_GPL(__list_lru_add); bool list_lru_del(struct list_lru *lru, struct list_head *item) { int nid = page_to_nid(virt_to_page(item)); + struct mem_cgroup *memcg = list_lru_memcg_aware(lru) ? + mem_cgroup_from_slab_obj(item) : NULL; + + return __list_lru_del(lru, item, nid, memcg); +} +EXPORT_SYMBOL_GPL(list_lru_del); + +bool __list_lru_del(struct list_lru *lru, struct list_head *item, int nid, + struct mem_cgroup *memcg) +{ struct list_lru_node *nlru = &lru->node[nid]; struct list_lru_one *l; spin_lock(&nlru->lock); if (!list_empty(item)) { - l = list_lru_from_kmem(lru, nid, item, NULL); + l = list_lru_from_memcg_idx(lru, nid, memcg_kmem_id(memcg)); list_del_init(item); l->nr_items--; nlru->nr_items--; @@ -158,7 +176,7 @@ bool list_lru_del(struct list_lru *lru, struct list_head *item) spin_unlock(&nlru->lock); return false; } -EXPORT_SYMBOL_GPL(list_lru_del); +EXPORT_SYMBOL_GPL(__list_lru_del); void list_lru_isolate(struct list_lru_one *list, struct list_head *item) { @@ -175,6 +193,20 @@ void list_lru_isolate_move(struct list_lru_one *list, struct list_head *item, } EXPORT_SYMBOL_GPL(list_lru_isolate_move); +void list_lru_putback(struct list_lru *lru, struct list_head *item, int nid, + struct mem_cgroup *memcg) +{ + struct list_lru_one *list = + list_lru_from_memcg_idx(lru, nid, memcg_kmem_id(memcg)); + + if (list_empty(item)) { + list_add_tail(item, &list->list); + if (!list->nr_items++) + set_shrinker_bit(memcg, nid, lru_shrinker_id(lru)); + } +} +EXPORT_SYMBOL_GPL(list_lru_putback); + unsigned long list_lru_count_one(struct list_lru *lru, int nid, struct mem_cgroup *memcg) { diff --git a/mm/swap_state.c b/mm/swap_state.c index b3b14bd0dd64..1c826737aacb 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "internal.h" #include "swap.h" @@ -417,6 +418,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, struct folio *folio; struct page *page; void *shadow = NULL; + bool zswap_lru_removed = false; *new_page_allocated = false; si = get_swap_device(entry); @@ -485,6 +487,17 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, __folio_set_locked(folio); __folio_set_swapbacked(folio); + /* + * Page fault might itself trigger reclaim, on a zswap object that + * corresponds to the same swap entry. However, as the swap entry has + * previously been pinned, the task will run into an infinite loop trying + * to pin the swap entry again. + * + * To prevent this from happening, we remove it from the zswap + * LRU to prevent its reclamation. + */ + zswap_lru_removed = zswap_remove_swpentry_from_lru(entry); + if (mem_cgroup_swapin_charge_folio(folio, NULL, gfp_mask, entry)) goto fail_unlock; @@ -497,6 +510,9 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, if (shadow) workingset_refault(folio, shadow); + if (zswap_lru_removed) + zswap_insert_swpentry_into_lru(entry); + /* Caller will initiate read into locked folio */ folio_add_lru(folio); *new_page_allocated = true; @@ -506,6 +522,9 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, return page; fail_unlock: + if (zswap_lru_removed) + zswap_insert_swpentry_into_lru(entry); + put_swap_folio(folio, entry); folio_unlock(folio); folio_put(folio); diff --git a/mm/zswap.c b/mm/zswap.c index 412b1409a0d7..1a469e5d5197 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "swap.h" #include "internal.h" @@ -171,8 +172,8 @@ struct zswap_pool { struct work_struct shrink_work; struct hlist_node node; char tfm_name[CRYPTO_MAX_ALG_NAME]; - struct list_head lru; - spinlock_t lru_lock; + struct list_lru list_lru; + struct mem_cgroup *next_shrink; }; /* @@ -209,6 +210,7 @@ struct zswap_entry { unsigned long value; }; struct obj_cgroup *objcg; + int nid; struct list_head lru; }; @@ -309,6 +311,29 @@ static void zswap_entry_cache_free(struct zswap_entry *entry) kmem_cache_free(zswap_entry_cache, entry); } +/********************************* +* lru functions +**********************************/ +static bool zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) +{ + struct mem_cgroup *memcg = entry->objcg ? + get_mem_cgroup_from_objcg(entry->objcg) : NULL; + bool added = __list_lru_add(list_lru, &entry->lru, entry->nid, memcg); + + mem_cgroup_put(memcg); + return added; +} + +static bool zswap_lru_del(struct list_lru *list_lru, struct zswap_entry *entry) +{ + struct mem_cgroup *memcg = entry->objcg ? + get_mem_cgroup_from_objcg(entry->objcg) : NULL; + bool removed = __list_lru_del(list_lru, &entry->lru, entry->nid, memcg); + + mem_cgroup_put(memcg); + return removed; +} + /********************************* * rbtree functions **********************************/ @@ -393,9 +418,7 @@ static void zswap_free_entry(struct zswap_entry *entry) if (!entry->length) atomic_dec(&zswap_same_filled_pages); else { - spin_lock(&entry->pool->lru_lock); - list_del(&entry->lru); - spin_unlock(&entry->pool->lru_lock); + zswap_lru_del(&entry->pool->list_lru, entry); zpool_free(zswap_find_zpool(entry), entry->handle); zswap_pool_put(entry->pool); } @@ -629,21 +652,16 @@ static void zswap_invalidate_entry(struct zswap_tree *tree, zswap_entry_put(tree, entry); } -static int zswap_reclaim_entry(struct zswap_pool *pool) +static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l, + spinlock_t *lock, void *arg) { - struct zswap_entry *entry; + struct zswap_entry *entry = container_of(item, struct zswap_entry, lru); + struct mem_cgroup *memcg; struct zswap_tree *tree; pgoff_t swpoffset; - int ret; + enum lru_status ret = LRU_REMOVED_RETRY; + int writeback_result; - /* Get an entry off the LRU */ - spin_lock(&pool->lru_lock); - if (list_empty(&pool->lru)) { - spin_unlock(&pool->lru_lock); - return -EINVAL; - } - entry = list_last_entry(&pool->lru, struct zswap_entry, lru); - list_del_init(&entry->lru); /* * Once the lru lock is dropped, the entry might get freed. The * swpoffset is copied to the stack, and entry isn't deref'd again @@ -651,26 +669,35 @@ static int zswap_reclaim_entry(struct zswap_pool *pool) */ swpoffset = swp_offset(entry->swpentry); tree = zswap_trees[swp_type(entry->swpentry)]; - spin_unlock(&pool->lru_lock); + list_lru_isolate(l, item); + spin_unlock(lock); /* Check for invalidate() race */ spin_lock(&tree->lock); if (entry != zswap_rb_search(&tree->rbroot, swpoffset)) { - ret = -EAGAIN; goto unlock; } /* Hold a reference to prevent a free during writeback */ zswap_entry_get(entry); spin_unlock(&tree->lock); - ret = zswap_writeback_entry(entry, tree); + writeback_result = zswap_writeback_entry(entry, tree); spin_lock(&tree->lock); - if (ret) { - /* Writeback failed, put entry back on LRU */ - spin_lock(&pool->lru_lock); - list_move(&entry->lru, &pool->lru); - spin_unlock(&pool->lru_lock); + if (writeback_result) { + zswap_reject_reclaim_fail++; + + /* Check for invalidate() race */ + if (entry != zswap_rb_search(&tree->rbroot, swpoffset)) + goto put_unlock; + + memcg = entry->objcg ? get_mem_cgroup_from_objcg(entry->objcg) : NULL; + spin_lock(lock); + /* we cannot use zswap_lru_add here, because it increments node's lru count */ + list_lru_putback(&entry->pool->list_lru, item, entry->nid, memcg); + spin_unlock(lock); + mem_cgroup_put(memcg); + ret = LRU_RETRY; goto put_unlock; } @@ -686,19 +713,63 @@ static int zswap_reclaim_entry(struct zswap_pool *pool) zswap_entry_put(tree, entry); unlock: spin_unlock(&tree->lock); - return ret ? -EAGAIN : 0; + spin_lock(lock); + return ret; +} + +static int shrink_memcg(struct mem_cgroup *memcg) +{ + struct zswap_pool *pool; + int nid, shrunk = 0; + bool is_empty = true; + + pool = zswap_pool_current_get(); + if (!pool) + return -EINVAL; + + for_each_node_state(nid, N_NORMAL_MEMORY) { + unsigned long nr_to_walk = 1; + + if (list_lru_walk_one(&pool->list_lru, nid, memcg, &shrink_memcg_cb, + NULL, &nr_to_walk)) + shrunk++; + if (!nr_to_walk) + is_empty = false; + } + zswap_pool_put(pool); + + if (is_empty) + return -EINVAL; + if (shrunk) + return 0; + return -EAGAIN; } static void shrink_worker(struct work_struct *w) { struct zswap_pool *pool = container_of(w, typeof(*pool), shrink_work); - int ret, failures = 0; + int ret, failures = 0, memcg_selection_failures = 0; + /* global reclaim will select cgroup in a round-robin fashion. */ do { - ret = zswap_reclaim_entry(pool); + /* previous next_shrink has become a zombie - restart from the top */ + if (pool->next_shrink && !mem_cgroup_online(pool->next_shrink)) { + mem_cgroup_put(pool->next_shrink); + pool->next_shrink = NULL; + } + pool->next_shrink = mem_cgroup_iter(NULL, pool->next_shrink, NULL); + + /* fails to find a suitable cgroup - give the worker another chance. */ + if (!pool->next_shrink) { + if (++memcg_selection_failures == 2) + break; + continue; + } + + ret = shrink_memcg(pool->next_shrink); + if (ret) { - zswap_reject_reclaim_fail++; if (ret != -EAGAIN) break; if (++failures == MAX_RECLAIM_RETRIES) @@ -764,9 +835,8 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) */ kref_init(&pool->kref); INIT_LIST_HEAD(&pool->list); - INIT_LIST_HEAD(&pool->lru); - spin_lock_init(&pool->lru_lock); INIT_WORK(&pool->shrink_work, shrink_worker); + list_lru_init_memcg(&pool->list_lru, NULL); zswap_pool_debug("created", pool); @@ -831,6 +901,9 @@ static void zswap_pool_destroy(struct zswap_pool *pool) cpuhp_state_remove_instance(CPUHP_MM_ZSWP_POOL_PREPARE, &pool->node); free_percpu(pool->acomp_ctx); + list_lru_destroy(&pool->list_lru); + if (pool->next_shrink) + mem_cgroup_put(pool->next_shrink); for (i = 0; i < ZSWAP_NR_ZPOOLS; i++) zpool_destroy_pool(pool->zpools[i]); kfree(pool); @@ -1199,8 +1272,10 @@ bool zswap_store(struct folio *folio) struct scatterlist input, output; struct crypto_acomp_ctx *acomp_ctx; struct obj_cgroup *objcg = NULL; + struct mem_cgroup *memcg = NULL; struct zswap_pool *pool; struct zpool *zpool; + int lru_alloc_ret; unsigned int dlen = PAGE_SIZE; unsigned long handle, value; char *buf; @@ -1218,14 +1293,15 @@ bool zswap_store(struct folio *folio) if (!zswap_enabled || !tree) return false; - /* - * XXX: zswap reclaim does not work with cgroups yet. Without a - * cgroup-aware entry LRU, we will push out entries system-wide based on - * local cgroup limits. - */ objcg = get_obj_cgroup_from_folio(folio); - if (objcg && !obj_cgroup_may_zswap(objcg)) - goto reject; + if (objcg && !obj_cgroup_may_zswap(objcg)) { + memcg = get_mem_cgroup_from_objcg(objcg); + if (shrink_memcg(memcg)) { + mem_cgroup_put(memcg); + goto reject; + } + mem_cgroup_put(memcg); + } /* reclaim space if needed */ if (zswap_is_full()) { @@ -1240,7 +1316,11 @@ bool zswap_store(struct folio *folio) else zswap_pool_reached_full = false; } - + pool = zswap_pool_current_get(); + if (!pool) { + ret = -EINVAL; + goto reject; + } /* allocate entry */ entry = zswap_entry_cache_alloc(GFP_KERNEL); if (!entry) { @@ -1256,6 +1336,7 @@ bool zswap_store(struct folio *folio) entry->length = 0; entry->value = value; atomic_inc(&zswap_same_filled_pages); + zswap_pool_put(pool); goto insert_entry; } kunmap_atomic(src); @@ -1264,6 +1345,15 @@ bool zswap_store(struct folio *folio) if (!zswap_non_same_filled_pages_enabled) goto freepage; + if (objcg) { + memcg = get_mem_cgroup_from_objcg(objcg); + lru_alloc_ret = memcg_list_lru_alloc(memcg, &pool->list_lru, GFP_KERNEL); + mem_cgroup_put(memcg); + + if (lru_alloc_ret) + goto freepage; + } + /* if entry is successfully added, it keeps the reference */ entry->pool = zswap_pool_current_get(); if (!entry->pool) @@ -1325,6 +1415,7 @@ bool zswap_store(struct folio *folio) insert_entry: entry->objcg = objcg; + entry->nid = page_to_nid(page); if (objcg) { obj_cgroup_charge_zswap(objcg, entry->length); /* Account before objcg ref is moved to tree */ @@ -1338,9 +1429,8 @@ bool zswap_store(struct folio *folio) zswap_invalidate_entry(tree, dupentry); } if (entry->length) { - spin_lock(&entry->pool->lru_lock); - list_add(&entry->lru, &entry->pool->lru); - spin_unlock(&entry->pool->lru_lock); + INIT_LIST_HEAD(&entry->lru); + zswap_lru_add(&pool->list_lru, entry); } spin_unlock(&tree->lock); @@ -1447,9 +1537,8 @@ bool zswap_load(struct folio *folio) zswap_invalidate_entry(tree, entry); folio_mark_dirty(folio); } else if (entry->length) { - spin_lock(&entry->pool->lru_lock); - list_move(&entry->lru, &entry->pool->lru); - spin_unlock(&entry->pool->lru_lock); + zswap_lru_del(&entry->pool->list_lru, entry); + zswap_lru_add(&entry->pool->list_lru, entry); } zswap_entry_put(tree, entry); spin_unlock(&tree->lock); @@ -1507,6 +1596,48 @@ void zswap_swapoff(int type) zswap_trees[type] = NULL; } +bool zswap_remove_swpentry_from_lru(swp_entry_t swpentry) +{ + struct zswap_tree *tree = zswap_trees[swp_type(swpentry)]; + struct zswap_entry *entry; + struct zswap_pool *pool; + bool removed = false; + + /* get the zswap entry and prevent it from being freed */ + spin_lock(&tree->lock); + entry = zswap_rb_search(&tree->rbroot, swp_offset(swpentry)); + /* skip if the entry is already written back or is a same filled page */ + if (!entry || !entry->length) + goto tree_unlock; + + pool = entry->pool; + removed = zswap_lru_del(&pool->list_lru, entry); + +tree_unlock: + spin_unlock(&tree->lock); + return removed; +} + +void zswap_insert_swpentry_into_lru(swp_entry_t swpentry) +{ + struct zswap_tree *tree = zswap_trees[swp_type(swpentry)]; + struct zswap_entry *entry; + struct zswap_pool *pool; + + /* get the zswap entry and prevent it from being freed */ + spin_lock(&tree->lock); + entry = zswap_rb_search(&tree->rbroot, swp_offset(swpentry)); + /* skip if the entry is already written back or is a same filled page */ + if (!entry || !entry->length) + goto tree_unlock; + + pool = entry->pool; + zswap_lru_add(&pool->list_lru, entry); + +tree_unlock: + spin_unlock(&tree->lock); +} + /********************************* * debugfs functions **********************************/ @@ -1560,7 +1691,7 @@ static int zswap_setup(void) struct zswap_pool *pool; int ret; - zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); + zswap_entry_cache = KMEM_CACHE(zswap_entry, SLAB_ACCOUNT); if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); goto cache_fail; From patchwork Tue Sep 19 17:14:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13391620 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 69947CE79AB for ; Tue, 19 Sep 2023 17:14:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 55E7D6B009B; Tue, 19 Sep 2023 13:14:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C0F06B009C; Tue, 19 Sep 2023 13:14:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 338B86B009D; Tue, 19 Sep 2023 13:14:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 221D56B009B for ; Tue, 19 Sep 2023 13:14:54 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EAB471A0558 for ; Tue, 19 Sep 2023 17:14:53 +0000 (UTC) X-FDA: 81253996866.09.B48BD19 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf16.hostedemail.com (Postfix) with ESMTP id 10C67180018 for ; Tue, 19 Sep 2023 17:14:50 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=fOFMXr2P; spf=pass (imf16.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695143691; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mZLeb4KXoBpe/+0JVGwklZQFLVSlOWzYpckySccYFaM=; b=xr/VH5AYhNDEh4hNZYIVSg1H2vO0BvyQJEB8WPbkkd22Ew7Xku1SKGJftOtpA5/9ogO01e cW01Jp4/4D+hcu8Uu6zDpr7EA9hCa2DAqdVxOREDVFXm5ZnYvrFAeKLdqQ+udW3K5fVerK JHYaKUccUy6gkXH3Z9v9M4yYaEDykXM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695143691; a=rsa-sha256; cv=none; b=NJaAu58mHvjNrjSu89z17GrvNK7o/7U0FyRTQ1xdWYKdrW1sdkaL5N2wIAykUa2Fu/ObiC hqHuK1iAQVtWKIfosQHkkrAm01KkCJZRFpZNNLCSdB2iv6YvWmaKZBC+qFeF/McjsYsPdU 8d7/NA4Xr2YHLcjrRp+vA0FqpdgI/sQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=fOFMXr2P; spf=pass (imf16.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1bf6ea270b2so45080355ad.0 for ; Tue, 19 Sep 2023 10:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695143690; x=1695748490; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mZLeb4KXoBpe/+0JVGwklZQFLVSlOWzYpckySccYFaM=; b=fOFMXr2PNkuPmZTpU9ISNXWfgjanK0Y+tOTR3ab9jgmpCVepLNMANHyQEzAwTbmpnN Rs4MI0McyGJ7YejU8jRlrJyI0ZU7RxtELCI8FAVhxHQhZrObUY0DF69Hps38LG9rdpMe xWYAbmCj5Ro0MyXoVVYWgYAVm1YwRAOhA2QfQRRy4kW5hp+lQZY6GrWSmE8kbHHY4nH4 dChdWmRoUG8rvwrTaJm/PYwQaA0H1ot7nBFDcnAi1xFgu1yeuuhkFS0QFmQACeguykL0 LBKMsubPwhD37aZrx/mgwEwkNlOoewkcMLcxKu710dQjiMzgxovK9I8KCnIB0KxSEcSi 5U1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695143690; x=1695748490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mZLeb4KXoBpe/+0JVGwklZQFLVSlOWzYpckySccYFaM=; b=jOuGVDrWxFcoZVNiSBfMZwQf+AzEhSk/VRMAl9vbW2jpQrgIKeLPdTcv79y3XBhfj8 3dIAKBVs9+OXxsKLt+kSpcO5q3F165HtNQhQ+dHn/skZ3IkLH/a4cQM7W1dqB0e+cIuf EMzbuo4dsL3WFv3evu1N3zSr7fMsUjwZ1ZqGjLyqL4JIIH6lMcwVYTAL4Q1wm92V4wEz +qHvG5y1s+9S0pv1cqcs53Urxg86N66ygUDQSwBSLaGrA7rnSccp7q3xRQ4PMIjQcaQx hZ/8mH6Ul2TPaFqmU46D90G1BV61HB8IqyaqSeae6f/M+vlXgBYAKhmab81gO8Yg++nS BWlg== X-Gm-Message-State: AOJu0Yz33y7D7upMnJbCcEyliSQ/IHsIS15FWVDW1s5qEEIMBhBgBrS7 yo+lkKBEhu1rbD2EqPM4ABA= X-Google-Smtp-Source: AGHT+IGj4n5KOZE1ZcGkXAPrdrXcf4IqzOydB+G7fdWAli3loJHS/GIl+xUUTvsosEtx4gzvUUeWUQ== X-Received: by 2002:a17:902:cec2:b0:1bf:66c3:d4d4 with SMTP id d2-20020a170902cec200b001bf66c3d4d4mr64681plg.16.1695143689658; Tue, 19 Sep 2023 10:14:49 -0700 (PDT) Received: from localhost (fwdproxy-prn-006.fbsv.net. [2a03:2880:ff:6::face:b00c]) by smtp.gmail.com with ESMTPSA id s11-20020a170902ea0b00b001bdd68b3f52sm10301343plg.302.2023.09.19.10.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 10:14:49 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, cerasuolodomenico@gmail.com, yosryahmed@google.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH v2 2/2] zswap: shrinks zswap pool based on memory pressure Date: Tue, 19 Sep 2023 10:14:47 -0700 Message-Id: <20230919171447.2712746-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230919171447.2712746-1-nphamcs@gmail.com> References: <20230919171447.2712746-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Stat-Signature: naeppyxqy89w4ic7t6tn1z8s1jeyrdm3 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 10C67180018 X-Rspam-User: X-HE-Tag: 1695143690-454709 X-HE-Meta: U2FsdGVkX18ZaXUVhjJlxiPpK3wKKLGR5bR7m0/Xe5Ino9Y0cG9JxDGZEYwD0wQejNC/jxf8R6QxeqsW3RjAVNLUoEvr8qI9R99Qn8Klu/KmOkQL84W5A8A2Ahq3wMXu9vsKtaLuIOjU6OOnHdz4kBvpQJCbILnj3o/s8Iq/AQti/oO5yvuA6RCHKITgBa4TxQvIdx5Twg33pXHt9xQ+dp9l1+1fKo0ZyQ8uC2d1Q+d5DoCIJTD10rz2djestdk3sCwkvZEnEc3kyYjHqIa25+vjSpG27IgnDClcFOuMU9zt9pvAX46E5e8e4pv/gOJl+b4fnbmM2/8soJVKUICW/mfVvoi7Fsr4pKr3rDkeHu+RDxGDKRiKjDeDNUbrSbHUS/hfmYl8IP75CZnQBVIsAc1L938o84dwFT/3CXUbabQiL2ydhCfTbdC2D94jX7elDMIPZ6wA/p2x6R/Xi/Sd8ftIibSAoZ+dLeSCofYEFLTZSJaQempM2ddvhXE7YNTiqsfCKALgqJsgh4ybb96zcXY8TcPOjYmwakASxkrV32C4kpKIITqx6So9bi89aZmD1b9deEvx6xqDoLCb9ASKoqpgeE8LPMCmIvLChlYkBzvu0libuCBeae0DcUtb18Q1Ir5nDOkIx9/++bUzc3MtGtbE4eZKFDQQux5Pb0k032HTSupAmOfzibN8i6+l36FCTLDbMFgWk8JVDJUOYosF7LbU2/oe73XdYgdQAKJdbldBTlVrPH8VmCgOBTp7nenCgwYqvc7AcP5hgB+xU/YJTcbLF9obAEfu/87StwxTl+IJ3Ua20Lic1pViPF/EJs5CTXrYFofh9n7shFAotk6fHvr8F4ykSb65mBbbDIj68P6NoB80aTU30dpxJ4eJ7PoCFoiDptmy+d8OF4GbjcJ6wMrBbDu7X28IgpX3ItLxL3XPkeeH+2hiJ6lwxUfmFKMawERGSHxXkhM02jKMCd8 oqudtEPg jhiUUSHZ4o1CSPasxOLVXT2IK6cOIFwUk0/kLVySym2tJzDvZHFag75UytxE4IRC0/gL9YXx6s4TffLfbBWrpFbR5zR1SVYaXj7rlxhfbgkzPjiGpW1zwtG/kijLrCZ2zIlu3hxHaWg2/kI1pznu3Ul/MScL/OTM0xCIwJiJW1sce8EjMnZx1YAonDpUITIGmThr2z+lG55ghFNNaXH2bAgc98FLgmIwCpIIHaIcOfvcUCvtgnKZ7XrBKJQ2/N5qz1Mo4A2XAc8fnijzdyTsfc99xtOYmnXcW7GDdO1/D+ZnxP7AuaCtNTO3v5fapt9lW8US02Kk5/RiEQJ61kEfFJ4+cGUk9B8w7Qcf2eW9MaLojod9dV5aZxC6sDPAXU5BB8jHP1/TmJlAChQ1S/S6tQr/qUJevNm5PVD/X3mdSFdXPXEQHacxd9uscZVCTFW8h1SW+q3ypZiQwETKEB8EsPhtK7qy7WP8fcH+xwpwjnq30qL0= 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: Currently, we only shrink the zswap pool when the user-defined limit is hit. This means that if we set the limit too high, cold data that are unlikely to be used again will reside in the pool, wasting precious memory. It is hard to predict how much zswap space will be needed ahead of time, as this depends on the workload (specifically, on factors such as memory access patterns and compressibility of the memory pages). This patch implements a memcg- and NUMA-aware shrinker for zswap, that is initiated when there is memory pressure. The shrinker does not have any parameter that must be tuned by the user, and can be opted in or out on a per-memcg basis. Furthermore, to make it more robust for many workloads and prevent overshrinking (i.e evicting warm pages that might be refaulted into memory), we build in the following heuristics: * Estimate the number of warm pages residing in zswap, and attempt to protect this region of the zswap LRU. * Scale the number of freeable objects by an estimate of the memory saving factor. The better zswap compresses the data, the fewer pages we will evict to swap (as we will otherwise incur IO for relatively small memory saving). * During reclaim, if the shrinker encounters a page that is also being brought into memory, the shrinker will cautiously terminate its shrinking action, as this is a sign that it is touching the warmer region of the zswap LRU. On a benchmark that we have run: (without the shrinker) real -- mean: 153.27s, median: 153.199s sys -- mean: 541.652s, median: 541.903s user -- mean: 4384.9673999999995s, median: 4385.471s (with the shrinker) real -- mean: 151.4956s, median: 151.456s sys -- mean: 461.14639999999997s, median: 465.656s user -- mean: 4384.7118s, median: 4384.675s We observed a 14-15% reduction in kernel CPU time, which translated to over 1% reduction in real time. On another benchmark, where there was a lot more cold memory residing in zswap, we observed even more pronounced gains: (without the shrinker) real -- mean: 157.52519999999998s, median: 157.281s sys -- mean: 769.3082s, median: 780.545s user -- mean: 4378.1622s, median: 4378.286s (with the shrinker) real -- mean: 152.9608s, median: 152.845s sys -- mean: 517.4446s, median: 506.749s user -- mean: 4387.694s, median: 4387.935s Here, we saw around 32-35% reduction in kernel CPU time, which translated to 2.8% reduction in real time. These results confirm our hypothesis that the shrinker is more helpful the more cold memory we have. Suggested-by: Johannes Weiner Signed-off-by: Nhat Pham --- Documentation/admin-guide/mm/zswap.rst | 12 ++ include/linux/memcontrol.h | 1 + include/linux/mmzone.h | 14 ++ mm/memcontrol.c | 33 +++++ mm/swap_state.c | 31 ++++- mm/zswap.c | 180 ++++++++++++++++++++++++- 6 files changed, 263 insertions(+), 8 deletions(-) diff --git a/Documentation/admin-guide/mm/zswap.rst b/Documentation/admin-guide/mm/zswap.rst index 45b98390e938..ae8597a67804 100644 --- a/Documentation/admin-guide/mm/zswap.rst +++ b/Documentation/admin-guide/mm/zswap.rst @@ -153,6 +153,18 @@ attribute, e. g.:: Setting this parameter to 100 will disable the hysteresis. +When there is a sizable amount of cold memory residing in the zswap pool, it +can be advantageous to proactively write these cold pages to swap and reclaim +the memory for other use cases. By default, the zswap shrinker is disabled. +User can enable it by first switching on the global knob: + + echo Y > /sys/module/zswap/par meters/shrinker_enabled + +When the kernel is compiled with CONFIG_MEMCG_KMEM, user needs to further turn +it on for each cgroup that the shrinker should target: + + echo 1 > /sys/fs/cgroup//memory.zswap.shrinker.enabled + A debugfs interface is provided for various statistic about pool size, number of pages stored, same-value filled pages and various counters for the reasons pages are rejected. diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 05d34b328d9d..f005ea667863 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -219,6 +219,7 @@ struct mem_cgroup { #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) unsigned long zswap_max; + atomic_t zswap_shrinker_enabled; #endif unsigned long soft_limit; diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 4106fbc5b4b3..81f4c5ea3e16 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -637,6 +637,20 @@ struct lruvec { #ifdef CONFIG_MEMCG struct pglist_data *pgdat; #endif +#ifdef CONFIG_ZSWAP + /* + * Number of pages in zswap that should be protected from the shrinker. + * This number is an estimate of the following counts: + * + * a) Recent page faults. + * b) Recent insertion to the zswap LRU. This includes new zswap stores, + * as well as recent zswap LRU rotations. + * + * These pages are likely to be warm, and might incur IO if the are written + * to swap. + */ + unsigned long nr_zswap_protected; +#endif }; /* Isolate unmapped pages */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9f84b3f7b469..1a2c97cf396f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5352,6 +5352,8 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) WRITE_ONCE(memcg->soft_limit, PAGE_COUNTER_MAX); #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) memcg->zswap_max = PAGE_COUNTER_MAX; + /* Disable the shrinker by default */ + atomic_set(&memcg->zswap_shrinker_enabled, 0); #endif page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX); if (parent) { @@ -7877,6 +7879,31 @@ static ssize_t zswap_max_write(struct kernfs_open_file *of, return nbytes; } +static int zswap_shrinker_enabled_show(struct seq_file *m, void *v) +{ + struct mem_cgroup *memcg = mem_cgroup_from_seq(m); + + seq_printf(m, "%d\n", atomic_read(&memcg->zswap_shrinker_enabled)); + return 0; +} + +static ssize_t zswap_shrinker_enabled_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off) +{ + struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of)); + int zswap_shrinker_enabled; + ssize_t parse_ret = kstrtoint(strstrip(buf), 0, &zswap_shrinker_enabled); + + if (parse_ret) + return parse_ret; + + if (zswap_shrinker_enabled < 0 || zswap_shrinker_enabled > 1) + return -ERANGE; + + atomic_set(&memcg->zswap_shrinker_enabled, zswap_shrinker_enabled); + return nbytes; +} + static struct cftype zswap_files[] = { { .name = "zswap.current", @@ -7889,6 +7916,12 @@ static struct cftype zswap_files[] = { .seq_show = zswap_max_show, .write = zswap_max_write, }, + { + .name = "zswap.shrinker.enabled", + .flags = CFTYPE_NOT_ON_ROOT, + .seq_show = zswap_shrinker_enabled_show, + .write = zswap_shrinker_enabled_write, + }, { } /* terminate */ }; #endif /* CONFIG_MEMCG_KMEM && CONFIG_ZSWAP */ diff --git a/mm/swap_state.c b/mm/swap_state.c index 1c826737aacb..788e36a06c34 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -618,6 +618,22 @@ static unsigned long swapin_nr_pages(unsigned long offset) return pages; } +#ifdef CONFIG_ZSWAP +/* + * Refault is an indication that warmer pages are not resident in memory. + * Increase the size of zswap's protected area. + */ +static void inc_nr_protected(struct page *page) +{ + struct lruvec *lruvec = folio_lruvec(page_folio(page)); + unsigned long flags; + + spin_lock_irqsave(&lruvec->lru_lock, flags); + lruvec->nr_zswap_protected++; + spin_unlock_irqrestore(&lruvec->lru_lock, flags); +} +#endif + /** * swap_cluster_readahead - swap in pages in hope we need them soon * @entry: swap entry of this memory @@ -686,7 +702,12 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, lru_add_drain(); /* Push any new pages onto the LRU now */ skip: /* The page was likely read above, so no need for plugging here */ - return read_swap_cache_async(entry, gfp_mask, vma, addr, NULL); + page = read_swap_cache_async(entry, gfp_mask, vma, addr, NULL); +#ifdef CONFIG_ZSWAP + if (page) + inc_nr_protected(page); +#endif + return page; } int init_swap_address_space(unsigned int type, unsigned long nr_pages) @@ -853,8 +874,12 @@ static struct page *swap_vma_readahead(swp_entry_t fentry, gfp_t gfp_mask, lru_add_drain(); skip: /* The page was likely read above, so no need for plugging here */ - return read_swap_cache_async(fentry, gfp_mask, vma, vmf->address, - NULL); + page = read_swap_cache_async(fentry, gfp_mask, vma, vmf->address, NULL); +#ifdef CONFIG_ZSWAP + if (page) + inc_nr_protected(page); +#endif + return page; } /** diff --git a/mm/zswap.c b/mm/zswap.c index 1a469e5d5197..79cb18eeb8bf 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -145,6 +145,26 @@ module_param_named(exclusive_loads, zswap_exclusive_loads_enabled, bool, 0644); /* Number of zpools in zswap_pool (empirically determined for scalability) */ #define ZSWAP_NR_ZPOOLS 32 +/* + * Global flag to enable/disable memory pressure-based shrinker for all memcgs. + * If CONFIG_MEMCG_KMEM is on, we can further selectively disable + * the shrinker for each memcg. + */ +static bool zswap_shrinker_enabled; +module_param_named(shrinker_enabled, zswap_shrinker_enabled, bool, 0644); +#ifdef CONFIG_MEMCG_KMEM +static bool is_shrinker_enabled(struct mem_cgroup *memcg) +{ + return zswap_shrinker_enabled && + atomic_read(&memcg->zswap_shrinker_enabled); +} +#else +static bool is_shrinker_enabled(struct mem_cgroup *memcg) +{ + return zswap_shrinker_enabled; +} +#endif + /********************************* * data structures **********************************/ @@ -174,6 +194,8 @@ struct zswap_pool { char tfm_name[CRYPTO_MAX_ALG_NAME]; struct list_lru list_lru; struct mem_cgroup *next_shrink; + struct shrinker *shrinker; + atomic_t nr_stored; }; /* @@ -273,17 +295,26 @@ static bool zswap_can_accept(void) DIV_ROUND_UP(zswap_pool_total_size, PAGE_SIZE); } +static u64 get_zswap_pool_size(struct zswap_pool *pool) +{ + u64 pool_size = 0; + int i; + + for (i = 0; i < ZSWAP_NR_ZPOOLS; i++) + pool_size += zpool_get_total_size(pool->zpools[i]); + + return pool_size; +} + static void zswap_update_total_size(void) { struct zswap_pool *pool; u64 total = 0; - int i; rcu_read_lock(); list_for_each_entry_rcu(pool, &zswap_pools, list) - for (i = 0; i < ZSWAP_NR_ZPOOLS; i++) - total += zpool_get_total_size(pool->zpools[i]); + total += get_zswap_pool_size(pool); rcu_read_unlock(); @@ -318,8 +349,23 @@ static bool zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) { struct mem_cgroup *memcg = entry->objcg ? get_mem_cgroup_from_objcg(entry->objcg) : NULL; + struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(entry->nid)); bool added = __list_lru_add(list_lru, &entry->lru, entry->nid, memcg); + unsigned long flags, lru_size; + + if (added) { + lru_size = list_lru_count_one(list_lru, entry->nid, memcg); + spin_lock_irqsave(&lruvec->lru_lock, flags); + lruvec->nr_zswap_protected++; + /* + * Decay to avoid overflow and adapt to changing workloads. + * This is based on LRU reclaim cost decaying heuristics. + */ + if (lruvec->nr_zswap_protected > lru_size / 4) + lruvec->nr_zswap_protected /= 2; + spin_unlock_irqrestore(&lruvec->lru_lock, flags); + } mem_cgroup_put(memcg); return added; } @@ -420,6 +466,7 @@ static void zswap_free_entry(struct zswap_entry *entry) else { zswap_lru_del(&entry->pool->list_lru, entry); zpool_free(zswap_find_zpool(entry), entry->handle); + atomic_dec(&entry->pool->nr_stored); zswap_pool_put(entry->pool); } zswap_entry_cache_free(entry); @@ -461,6 +508,98 @@ static struct zswap_entry *zswap_entry_find_get(struct rb_root *root, return entry; } +/********************************* +* shrinker functions +**********************************/ +static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l, + spinlock_t *lock, void *arg); + +static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, + struct shrink_control *sc) +{ + struct zswap_pool *pool = shrinker->private_data; + unsigned long shrink_ret, nr_zswap_protected, flags, + lru_size = list_lru_shrink_count(&pool->list_lru, sc); + struct lruvec *lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); + bool encountered_page_in_swapcache = false; + + spin_lock_irqsave(&lruvec->lru_lock, flags); + nr_zswap_protected = lruvec->nr_zswap_protected; + spin_unlock_irqrestore(&lruvec->lru_lock, flags); + + /* + * Abort if the shrinker is disabled or if we are shrinking into the + * protected region. + */ + if (!is_shrinker_enabled(sc->memcg) || + nr_zswap_protected >= lru_size - sc->nr_to_scan) { + sc->nr_scanned = 0; + return SHRINK_STOP; + } + + shrink_ret = list_lru_shrink_walk(&pool->list_lru, sc, &shrink_memcg_cb, + &encountered_page_in_swapcache); + + if (encountered_page_in_swapcache) + return SHRINK_STOP; + + return shrink_ret ? shrink_ret : SHRINK_STOP; +} + +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, flags; + +#ifdef CONFIG_MEMCG_KMEM + cgroup_rstat_flush(memcg->css.cgroup); + nr_backing = memcg_page_state(memcg, MEMCG_ZSWAP_B) >> PAGE_SHIFT; + 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); +#endif + + if (!is_shrinker_enabled(memcg) || !nr_stored) + return 0; + + nr_freeable = list_lru_shrink_count(&pool->list_lru, sc); + /* + * Subtract the lru size by an estimate of the number of pages + * that should be protected. + */ + spin_lock_irqsave(&lruvec->lru_lock, flags); + nr_freeable = nr_freeable > lruvec->nr_zswap_protected ? + nr_freeable - lruvec->nr_zswap_protected : 0; + spin_unlock_irqrestore(&lruvec->lru_lock, flags); + + /* + * Scale the number of freeable pages by the memory saving factor. + * This ensures that the better zswap compresses memory, the fewer + * pages we will evict to swap (as it will otherwise incur IO for + * relatively small memory saving). + */ + return mult_frac(nr_freeable, nr_backing, nr_stored); +} + +static void zswap_alloc_shrinker(struct zswap_pool *pool) +{ + pool->shrinker = + shrinker_alloc(SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE, "mm-zswap"); + if (!pool->shrinker) + return; + + 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; +} + /********************************* * per-cpu code **********************************/ @@ -656,11 +795,14 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o spinlock_t *lock, void *arg) { struct zswap_entry *entry = container_of(item, struct zswap_entry, lru); + bool *encountered_page_in_swapcache = (bool *)arg; struct mem_cgroup *memcg; struct zswap_tree *tree; + struct lruvec *lruvec; pgoff_t swpoffset; enum lru_status ret = LRU_REMOVED_RETRY; int writeback_result; + unsigned long flags; /* * Once the lru lock is dropped, the entry might get freed. The @@ -696,8 +838,24 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o /* we cannot use zswap_lru_add here, because it increments node's lru count */ list_lru_putback(&entry->pool->list_lru, item, entry->nid, memcg); spin_unlock(lock); - mem_cgroup_put(memcg); ret = LRU_RETRY; + + /* + * Encountering a page already in swap cache is a sign that we are shrinking + * into the warmer region. We should terminate shrinking (if we're in the dynamic + * shrinker context). + */ + if (writeback_result == -EEXIST && encountered_page_in_swapcache) { + ret = LRU_SKIP; + *encountered_page_in_swapcache = true; + } + lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(entry->nid)); + spin_lock_irqsave(&lruvec->lru_lock, flags); + /* Increment the protection area to account for the LRU rotation. */ + lruvec->nr_zswap_protected++; + spin_unlock_irqrestore(&lruvec->lru_lock, flags); + + mem_cgroup_put(memcg); goto put_unlock; } @@ -828,6 +986,11 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) &pool->node); 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 @@ -836,12 +999,17 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) kref_init(&pool->kref); INIT_LIST_HEAD(&pool->list); INIT_WORK(&pool->shrink_work, shrink_worker); - list_lru_init_memcg(&pool->list_lru, NULL); + if (list_lru_init_memcg(&pool->list_lru, pool->shrinker)) + goto lru_fail; + shrinker_register(pool->shrinker); 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); @@ -899,6 +1067,7 @@ 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); @@ -1431,6 +1600,7 @@ bool zswap_store(struct folio *folio) if (entry->length) { INIT_LIST_HEAD(&entry->lru); zswap_lru_add(&pool->list_lru, entry); + atomic_inc(&pool->nr_stored); } spin_unlock(&tree->lock);