From mboxrd@z Thu Jan 1 00:00:00 1970 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 8BA49C25B78 for ; Tue, 28 May 2024 04:34:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06CA76B0088; Tue, 28 May 2024 00:34:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01AD06B0089; Tue, 28 May 2024 00:34:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD5DD6B008A; Tue, 28 May 2024 00:34:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BEEAA6B0088 for ; Tue, 28 May 2024 00:34:46 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 75DFB1401FB for ; Tue, 28 May 2024 04:34:46 +0000 (UTC) X-FDA: 82166538972.15.1E0CAFD Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by imf03.hostedemail.com (Postfix) with ESMTP id BB95F2000F for ; Tue, 28 May 2024 04:34:44 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QQ1kXOL7; spf=pass (imf03.hostedemail.com: domain of flintglass@gmail.com designates 209.85.160.53 as permitted sender) smtp.mailfrom=flintglass@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=1716870884; 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=W0FwtNJwtUXGe6IZ+n9Z0anxXb12NEWwpY37V9CVD5c=; b=EW9T2qVtoT7bIiK1joIRnQeC0HX93MBWOzd+QJC8MzjVTHaMrmpzYwJVK0NfYPHQUqbKXk 1iLETNbl+iULEnWAoNt75YEGc1NQ3Di1su4K29+ukn6MsrnWTEz3WLPdt2KiKjXFmSLSdS AEk14ESBF8R8UfKuhIJ7/DF71IDVqNU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716870884; a=rsa-sha256; cv=none; b=1N3/hgf+kaIFRkeNBcNLXVxMN4mIVFafe5vrB3AfpQIZuX7SrNBZxa2TF3Z6/5/jRzrVu+ /dn265WH2uHGvEgCupyiiiPec9PZvkibGDKJ/ni0eBpPx0lal/KUpwbBYzpqbI7zWuCjif q06GFSdM2LWpZB202q1nB3pyUNpbwbI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QQ1kXOL7; spf=pass (imf03.hostedemail.com: domain of flintglass@gmail.com designates 209.85.160.53 as permitted sender) smtp.mailfrom=flintglass@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-24ca3acb835so199282fac.3 for ; Mon, 27 May 2024 21:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716870884; x=1717475684; 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=W0FwtNJwtUXGe6IZ+n9Z0anxXb12NEWwpY37V9CVD5c=; b=QQ1kXOL7AsVCrYyxDx57cKqP2pVsn5RfMhq96DTvR/CvZi4pnIwIkUXxTu44/E0Ir6 PNPvyF8Do3zB8JL+Og0roGGRbLfq8P/IBwxjxSiCgq+7w7c6qgIZWio7t1bH/wd7H4B2 cz1HQWnVttgxb/xq3bWQAwQbQDoxLFTDX7yeyCNBg7l67vV8/b6A8JheQ8TB5IxHShf8 i4oSzeWKT8FsSFifQaATyCB94z4srNO3HWEj2ZAhIzrO1PsZHp0lRj6HksRxKNOD2+Xt 7aLcdGBB6D+otfgwdhFAoZFu0DMP3qQKV0gJ5/My5RacbHVP9CznfAhM04jHMGWPrXKQ KQ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716870884; x=1717475684; 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=W0FwtNJwtUXGe6IZ+n9Z0anxXb12NEWwpY37V9CVD5c=; b=jgAUaq+Tju7lCTR8kthmlLDxRAsX8DPoOyq92KLpoMfZ2PgrJGztsRGVcuSWIa9EZM RCMrIiI1JaCcH50YMYxWdZLQTpHQ5DOy1mz5n0HmZKDj2vDYrJvE82AuJ6weBP8R5b4X cFRkMHgRmk6T+FEm5mrDIzSFzvlmp3EFKGH+iUzlncKz6M7JFxO2bHkUeM5f4FbzQVKK N0YJhRAIk0QiGENuuAJCuwsZXAQaXX3CMZaix1sld31DoMN6I+w4OTguF4ZV6sR2IUii GPQt8SfIsN+E8vBICt4LhLjajmRb7e6VmXcmOnVmLC1UrWb7GjixTfoPzj5jdt4e3EG3 fhXA== X-Gm-Message-State: AOJu0YyrSalJbrlEnRzjD3QVPNC9pt8L0el7uIbHg3Dn4PQISkZyF1T0 ADoTK5wEzMjNs5plALI2CMu6w2oWPGSMCMrRsYuPwgeCzhkMPO97 X-Google-Smtp-Source: AGHT+IG+M9uCZ37lujmkacVFpRUOUtCzWpjhQ3KyJPVcIXwjbpjOXZt7xy4QwP8AV7IDU0AkNndjrQ== X-Received: by 2002:a05:6870:2183:b0:24f:c42e:3124 with SMTP id 586e51a60fabf-24fc42f1cdcmr8469019fac.40.1716870883408; Mon, 27 May 2024 21:34:43 -0700 (PDT) Received: from cbuild.srv.usb0.net (uw2.srv.usb0.net. [185.197.30.200]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fd4d57b9sm5620036b3a.193.2024.05.27.21.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 May 2024 21:34:43 -0700 (PDT) From: Takero Funaki To: flintglass@gmail.com, Johannes Weiner , Yosry Ahmed , Nhat Pham , Chengming Zhou , Jonathan Corbet , Andrew Morton , Domenico Cerasuolo Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] mm: zswap: fix global shrinker memcg iteration Date: Tue, 28 May 2024 04:34:02 +0000 Message-ID: <20240528043404.39327-3-flintglass@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240528043404.39327-2-flintglass@gmail.com> References: <20240528043404.39327-2-flintglass@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: oft8dbjjmoknmrwmu1befkxjffhqdfyc X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: BB95F2000F X-HE-Tag: 1716870884-752898 X-HE-Meta: U2FsdGVkX1+W/sL1XfjA7UfV7ShM99Iy1sg7GcCGQDNobv/dPrPgO2Fa9YSB5zw1fjgpZcSFblQNF5DizFM/sGKfQ6Gav49+TOkS+HwLd5Z7dfSqYaeQuUMIhfgzddQWT63aliqEyUmjzk1p82uXp+wh8v0VWRkjEnSxHwtaQQBTA7YTOYfzCU43miW5BK/Drujx7xSTzIpFRO+H1duADVcZt/G5hrfFi3qMhrcgXAx8miYX/NcrqY1QEt60dXJcFkr5adfZ8k5xpBh1UHVVUJLMdPUo3KvbChZCWsanB8Cs0gOy+SVAtN22D+hH80+1gOxbXtL3dhM3d+rTA9wR8hhDsMXowVfYLd1tBamNJ5OQGr2R6Q4ae51es5M4VRuOI91SfQzPq/tIPZZ1Z/5n6lqMtAH/LMbkxGJdDdiN/UU7zo9a909iXUH1S7Kq8KwoSwFR585/zSSMZ0ovkv+FUmxanfOBTFVWWXDGHc/XatgQ4QlCMNNzR0XCizoF+Ovs+P/ZoH8wXSW1xV/h5dNZJYWd+CWpd1rb+wFAzt/XTzd7wjk7RFIvssJfppDk6CCdLT5lbCxAo7mZa7mtDiMnKeLrEP0q8D9OlN/w63G7H24UobddWcCGh7mL2k7m3ZhZuSxQ0IFHWjleFQpR7mTPhR6gHpfSlD2rk//LOtBafN7KMmAC/o4931fwMtY1QGjQV9m8kRNF49j+3lkmkUIRhc2NRIXyczQl8wHCB5CJu+9v8jBxSdgGX3DDfNEIh1asuuRq5PlcqICxXcVxaait34+IvBYViKaMlNI8S2KBye9JvA1jmvZFrwN8+dn5naZ+FLVia0/LB52Vom0RKSWZjTWmuvEchCp+VMSv4Tkogf9xd8Thw2GtPtbZfNgEAOqWdySopnYiav1QqJfciZdWu2gb9HyN+BjT4vLr6bTM9gKiLY9gPa3wdIVwG0ozFFfqyiavqh+kbC4SSj+vnyM 33rjouGH YRldPyEdM8CDeL4FkR/uFwiePpxr7ezxJM78djXSojf20BTTuVpuL+ijGbkTZ2VOhG8hn38IXu36mQm/qDjbIhlGb7pczficiT4mfWm6bB1JRZyewBNISQ6rN+ay7BlwEx+EenN5bGBzEgq3YLIunUiyNjP2uDxRvaBo9I+drczcxOFnZEgNM3WhQVOfTvuo3+rsUvD0pw4j2DM9JuSfg0HhzyUC2h1Iizo+l+uFSRz0BWfl0FC5zsdVX59iUYeT0Fj2U3/RQPY4lL7tlY+nRdJoBD6CdBGysH8Z4O6SCfBORUxZFVZgz028rsu4zee3F+yF/3htvZ1wR7UjKrqTDW6enJLinyxe2+BYnCI4JzNwgPy0WkEv9Om+0r3QhbFF8tdkpAeyVfWm5O+7P7dWI6dM1OFCydJ5nCOkdXCEK/tzyMT6WVVMRQAZ1cFJR8oTbgEJY 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: This patch fixes an issue where the zswap global shrinker stopped iterating through the memcg tree. The problem was that `shrink_worker()` would stop iterating when a memcg was being offlined and restart from the tree root. Now, it properly handles the offlining memcg and continues shrinking with the next memcg. Fixes: a65b0e7607cc ("zswap: make shrinking memcg-aware") Signed-off-by: Takero Funaki --- mm/zswap.c | 76 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index a50e2986cd2f..0b1052cee36c 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -775,12 +775,27 @@ void zswap_folio_swapin(struct folio *folio) } } +/* + * This function should be called when a memcg is being offlined. + * + * Since the global shrinker shrink_worker() may hold a reference + * of the memcg, we must check and release the reference in + * zswap_next_shrink. + * + * shrink_worker() must handle the case where this function releases + * the reference of memcg being shrunk. + */ void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg) { /* 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); + + if (READ_ONCE(zswap_next_shrink) == memcg) { + /* put back reference and advance the cursor */ + memcg = mem_cgroup_iter(NULL, memcg, NULL); + WRITE_ONCE(zswap_next_shrink, memcg); + } + spin_unlock(&zswap_shrink_lock); } @@ -1312,25 +1327,38 @@ static int shrink_memcg(struct mem_cgroup *memcg) static void shrink_worker(struct work_struct *w) { - struct mem_cgroup *memcg; + struct mem_cgroup *memcg = NULL; + struct mem_cgroup *next_memcg; int ret, failures = 0; unsigned long thr; /* Reclaim down to the accept threshold */ thr = zswap_accept_thr_pages(); - /* global reclaim will select cgroup in a round-robin fashion. */ + /* global reclaim will select cgroup in a round-robin fashion. + * + * We save iteration cursor memcg into zswap_next_shrink, + * which can be modified by the offline memcg cleaner + * zswap_memcg_offline_cleanup(). + */ do { spin_lock(&zswap_shrink_lock); - zswap_next_shrink = mem_cgroup_iter(NULL, zswap_next_shrink, NULL); - memcg = zswap_next_shrink; + next_memcg = READ_ONCE(zswap_next_shrink); + + if (memcg != next_memcg) { + /* + * Ours was released by offlining. + * Use the saved memcg reference. + */ + memcg = next_memcg; + } else { +iternext: + /* advance cursor */ + memcg = mem_cgroup_iter(NULL, memcg, NULL); + WRITE_ONCE(zswap_next_shrink, memcg); + } /* - * We need to retry if we have gone through a full round trip, or if we - * got an offline memcg (or else we risk undoing the effect of the - * zswap memcg offlining cleanup callback). This is not catastrophic - * per se, but it will keep the now offlined memcg hostage for a while. - * * Note that if we got an online memcg, we will keep the extra * reference in case the original reference obtained by mem_cgroup_iter * is dropped by the zswap memcg offlining callback, ensuring that the @@ -1345,16 +1373,18 @@ 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); - zswap_next_shrink = NULL; - spin_unlock(&zswap_shrink_lock); - - if (++failures == MAX_RECLAIM_RETRIES) - break; - - goto resched; + /* + * It is an offline memcg which we cannot shrink + * until its pages are reparented. + * Put back the memcg reference before cleanup + * function reads it from zswap_next_shrink. + */ + goto iternext; } + /* + * We got an extra memcg reference before unlocking. + * The cleaner cannot free it using zswap_next_shrink. + */ spin_unlock(&zswap_shrink_lock); ret = shrink_memcg(memcg); @@ -1368,6 +1398,12 @@ static void shrink_worker(struct work_struct *w) resched: cond_resched(); } while (zswap_total_pages() > thr); + + /* + * We can still hold the original memcg reference. + * The reference is stored in zswap_next_shrink, and then reused + * by the next shrink_worker(). + */ } /********************************* -- 2.43.0