From patchwork Mon Mar 11 16:12:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 13588993 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 8B993C54E58 for ; Mon, 11 Mar 2024 16:12:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D860A6B00C0; Mon, 11 Mar 2024 12:12:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0ED26B00BD; Mon, 11 Mar 2024 12:12:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFCCE6B00BF; Mon, 11 Mar 2024 12:12:25 -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 A2C956B00BC for ; Mon, 11 Mar 2024 12:12:25 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 206D4C04D5 for ; Mon, 11 Mar 2024 16:12:25 +0000 (UTC) X-FDA: 81885250650.19.632F0CE Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by imf17.hostedemail.com (Postfix) with ESMTP id 0997940028 for ; Mon, 11 Mar 2024 16:12:21 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=MpZI8yO9; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf17.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.46 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710173542; 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:references:dkim-signature; bh=8rae8DczRYY1qVTc5krNA5vQiwAZfYKBrfNd8phx9FQ=; b=UVU4Lzd8LNHdZXNjEaGcc2mrRWToiJ3VBiTm/7/+9b91fQk6K9bLu+XuBFFM7mWncSI6JC 5t81U926b0emJMpTt1i113TVbivnvk0UG33WaStX0Q8KwsBhqR4prmU/P/vlBuqCLS58KP /tn+zZVxDEIQ3fz+aiO3DohSNp+nZ/I= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=MpZI8yO9; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf17.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.46 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710173542; a=rsa-sha256; cv=none; b=YnO5aDF2zlwBrd2w0eayGp2FKwEPr22wNwiqp7IJRS6UgnpohQaY/dR6VO5WMJgHtQVyW3 8FVER8xTynZgXm9ov2qem8YXhyU/kh6lP1voL5vR7Lm/yu1SLt9H6jmX/I1IVghwCHSXU1 H94koCJB6xgYSkayVjxmVzKX4C/j5cg= Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-690cffa8a0bso7636676d6.0 for ; Mon, 11 Mar 2024 09:12:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1710173541; x=1710778341; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8rae8DczRYY1qVTc5krNA5vQiwAZfYKBrfNd8phx9FQ=; b=MpZI8yO9Oq1l6oxM5cAa51QgJZ+X2hyXZYmYoLQW2/YyR+Ol6G4bZpo6b+P8dGqNwA 3crGK6Wl03NZeGEXae63TPggCpt4lmhHQY3D/pVTCdCy8M4CcPnD50o7i3mG5PswJjAS jES18dsrzhozZ1RGY6t/23sLFq2ilCWIxLavf7APW7rxrqGla6uhsYdg2BwA9ERteBmE 3kNsX9e4EXt//0BkmRhchAT6+3nZNd5hJpGFkovg5JADGRdT5gpePdetQPJEGg0wD7xh VLquXF2R5lkhVogjC8xlTs146jfXg6pQjvHMgAutXlfKepGHcXKrj37hQiZw9vP2R/AN vuUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710173541; x=1710778341; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8rae8DczRYY1qVTc5krNA5vQiwAZfYKBrfNd8phx9FQ=; b=Z0NKW3Qytvt13vtBvD4T1rWQBIdZf6622dRX1dV9/bVkckK6HnEA4FwGankDnorDlv ob+lo1Ij04nrBKhaBHE08PWU/5v31jbXMuMUrrSJoE/w+Gkicgs/+ME6j7Y5w/sQyT+/ c3i5ToJ5J17qk+xxrUkwPSPGcct9Xb8Bn9R8K+gdA5T7uIuW3V/fi9ZUjRPiA85T+hFJ T3mkt2Ua5PgCS9aGlE3Ea3EPeUrsPJIeRuFK1A2TaAtGnJqizlHRVtGURBKVCGz5nii6 xv2Ur01IxOkGoCazPadJTmFtQgJW822XoF7PlPUc9FpWJYY9vqPpfzz/vpZieKgggyVa zHsQ== X-Forwarded-Encrypted: i=1; AJvYcCWY1XZVunLb3AuIsM31Zfm3YViU+lBoNUO3zf3z2WpNmD9oJEyBukGpj4EpfhEWEclukdF4wDc//WlsE6SDEceQMlE= X-Gm-Message-State: AOJu0YxAXBMsf3PkgROl/RwiOtZ0NxA1MRqYYLRL8OyeH1xA2ssoraTK y/HMihpKTYsTs2L+jc8ZguB/EuDTpqaM2FY/+hs446JgQ1syz+OIGOABUX/m5B4= X-Google-Smtp-Source: AGHT+IF1lXMtfLql23ntUBZ5Bx3lRSL4pD/LtPVgSinUp2k9OQFjpcIS4RA39FA+WPNkw9m4xQHQ4Q== X-Received: by 2002:a0c:fa82:0:b0:690:aed1:bd8f with SMTP id o2-20020a0cfa82000000b00690aed1bd8fmr7127592qvn.57.1710173540994; Mon, 11 Mar 2024 09:12:20 -0700 (PDT) Received: from localhost (2603-7000-0c01-2716-da5e-d3ff-fee7-26e7.res6.spectrum.com. [2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with ESMTPSA id p6-20020a0cf546000000b00690d2ed0d74sm1115722qvm.115.2024.03.11.09.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 09:12:20 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: Yosry Ahmed , Nhat Pham , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] mm: zswap: optimize zswap pool size tracking Date: Mon, 11 Mar 2024 12:12:13 -0400 Message-ID: <20240311161214.1145168-1-hannes@cmpxchg.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 0997940028 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ggmefpxifhciudjahsk1b68ne65cswdc X-HE-Tag: 1710173541-680770 X-HE-Meta: U2FsdGVkX19t5WXsUw4YuNzVDGc94RMWas+Ol0Pay/ihtzvlZ9GFWzjFNfA0gl3ww/VaU6ynlMT10pOO/7lBX5FpPzO7j1jVq8opAHpm57Htj/heMFIucUlLTCj05/cyQhMxzL9nIklYNfsmpO4UBqfOWYIXBiZhiG2GOOIvVW29H4bMmk7EZ5rd9HzSZPIbsoIVHOavtIrB78ClMTufSyUsd8OUy9XGFiYugqhyhmjLjA+Uh5gr3JvH3JsLvTItcDrsRESCFxV4IE+BSGeldARZ9Ws+ytL+8waRTRTAxH9yEw/ybxRWOf6d6Dw9JZNW0hgOmgSAvE6RavQ+PSzf78CeC1LSq/IoonCDvjUP545c0rLB0pglx0oZD54U5ONEdTQbfEVfgye+l7qWJbcYck/UuGVXFiNgDJ3Jr5cNu6fodHjaEd7Zom2aVlY2Flpt3qJgQeXUx9lj1tvjmE51cfp8DdfC2CJjuZKwKAmlQPFOHfCK7cMNtInLe4OgMS1s5oL2E13CJZTfcxlpHw5dkyYAOOK8VQEdAX0qTPZBknt3ul+yqaI7IlN2KXP5ydB5iwdmNXIzRDofLDbkpfK7J4nILDxWzFFvc3bEaZxfiLoqvJ+0iHpiiVsS7oxiUYBPeuVXoDjRXIsTUQ9FP/EUg7A4tV4NanxfCzUi08OeWXFdYKru9k7Tz8sEYO3AKe+lRF2ZOP8pHmNDwFlqcS2K15vMQDZSaCzmNqokYPVxC3SMSrwHop/mq3PhCtu7Sn7fWEBzcg9B7dE/CntMPvLJMgXCNPjtWPETiCpqDKL8mjU17PcAFwPdDJp/H4D7th0r/mTqWjvEd14WXem4QdKlrTALbBifyriJaQpDV02wMOWj8NfVPD9HoRwEGmECxWLLpe1aaTA3KgUxeY3rL49XMSHwxIWzsVEtGgyRREtFGi3Hgwa525NJUtSfg46rAWp1lvZOgCze6n766Io+lNb B4IRhBsO 5kbY4x+PW535BGcjN3lmyi52BVhdl/wRJKzSJg/hujaqjeYSriq8oviwBKQoJ52c+fye3BaCbNxCQoqscBQCJm/Knf6u1dHzRiidugi6T+4lrhwkhsfFV+ynaMbKZeC058aEY9/MloYWVpYZVm2A7SPlYL3xaH1aCqYZXXHQ7U9fAMBI= 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: Profiling the munmap() of a zswapped memory region shows 50%(!) of the total cycles currently going into updating the zswap_pool_total_size. There are three consumers of this counter: - store, to enforce the globally configured pool limit - meminfo & debugfs, to report the size to the user - shrink, to determine the batch size for each cycle Instead of aggregating everytime an entry enters or exits the zswap pool, aggregate the value from the zpools on-demand: - Stores aggregate the counter anyway upon success. Aggregating to check the limit instead is the same amount of work. - Meminfo & debugfs might benefit somewhat from a pre-aggregated counter, but aren't exactly hotpaths. - Shrinking can aggregate once for every cycle instead of doing it for every freed entry. As the shrinker might work on tens or hundreds of objects per scan cycle, this is a large reduction in aggregations. The paths that benefit dramatically are swapin, swapoff, and unmaps. There could be millions of pages being processed until somebody asks for the pool size again. This eliminates the pool size updates from those paths entirely. Signed-off-by: Johannes Weiner Acked-by: Yosry Ahmed Reviewed-by: Chengming Zhou Reviewed-by: Nhat Pham --- fs/proc/meminfo.c | 3 +- include/linux/zswap.h | 2 +- mm/zswap.c | 98 +++++++++++++++++++++---------------------- 3 files changed, 49 insertions(+), 54 deletions(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 45af9a989d40..245171d9164b 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -89,8 +89,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "SwapTotal: ", i.totalswap); show_val_kb(m, "SwapFree: ", i.freeswap); #ifdef CONFIG_ZSWAP - seq_printf(m, "Zswap: %8lu kB\n", - (unsigned long)(zswap_pool_total_size >> 10)); + show_val_kb(m, "Zswap: ", zswap_total_pages()); seq_printf(m, "Zswapped: %8lu kB\n", (unsigned long)atomic_read(&zswap_stored_pages) << (PAGE_SHIFT - 10)); diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 341aea490070..2a85b941db97 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -7,7 +7,6 @@ struct lruvec; -extern u64 zswap_pool_total_size; extern atomic_t zswap_stored_pages; #ifdef CONFIG_ZSWAP @@ -27,6 +26,7 @@ struct zswap_lruvec_state { atomic_long_t nr_zswap_protected; }; +unsigned long zswap_total_pages(void); bool zswap_store(struct folio *folio); bool zswap_load(struct folio *folio); void zswap_invalidate(swp_entry_t swp); diff --git a/mm/zswap.c b/mm/zswap.c index 9a3237752082..7c39327a7cc2 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -43,8 +43,6 @@ /********************************* * statistics **********************************/ -/* Total bytes used by the compressed storage */ -u64 zswap_pool_total_size; /* The number of compressed pages currently stored in zswap */ atomic_t zswap_stored_pages = ATOMIC_INIT(0); /* The number of same-value filled pages currently stored in zswap */ @@ -264,45 +262,6 @@ static inline struct zswap_tree *swap_zswap_tree(swp_entry_t swp) pr_debug("%s pool %s/%s\n", msg, (p)->tfm_name, \ zpool_get_type((p)->zpools[0])) -static bool zswap_is_full(void) -{ - return totalram_pages() * zswap_max_pool_percent / 100 < - DIV_ROUND_UP(zswap_pool_total_size, PAGE_SIZE); -} - -static bool zswap_can_accept(void) -{ - return totalram_pages() * zswap_accept_thr_percent / 100 * - zswap_max_pool_percent / 100 > - 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; - - rcu_read_lock(); - - list_for_each_entry_rcu(pool, &zswap_pools, list) - total += get_zswap_pool_size(pool); - - rcu_read_unlock(); - - zswap_pool_total_size = total; -} - /********************************* * pool functions **********************************/ @@ -540,6 +499,28 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor) return NULL; } +static unsigned long zswap_max_pages(void) +{ + return totalram_pages() * zswap_max_pool_percent / 100; +} + +unsigned long zswap_total_pages(void) +{ + struct zswap_pool *pool; + u64 total = 0; + + rcu_read_lock(); + list_for_each_entry_rcu(pool, &zswap_pools, list) { + int i; + + for (i = 0; i < ZSWAP_NR_ZPOOLS; i++) + total += zpool_get_total_size(pool->zpools[i]); + } + rcu_read_unlock(); + + return total >> PAGE_SHIFT; +} + /********************************* * param callbacks **********************************/ @@ -912,7 +893,6 @@ static void zswap_entry_free(struct zswap_entry *entry) } zswap_entry_cache_free(entry); atomic_dec(&zswap_stored_pages); - zswap_update_total_size(); } /* @@ -1317,7 +1297,7 @@ 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 = zswap_pool_total_size >> PAGE_SHIFT; + nr_backing = zswap_total_pages(); nr_stored = atomic_read(&zswap_nr_stored); #endif @@ -1385,6 +1365,10 @@ static void shrink_worker(struct work_struct *w) { struct mem_cgroup *memcg; int ret, failures = 0; + unsigned long thr; + + /* Reclaim down to the accept threshold */ + thr = zswap_max_pages() * zswap_accept_thr_percent / 100; /* global reclaim will select cgroup in a round-robin fashion. */ do { @@ -1432,10 +1416,9 @@ static void shrink_worker(struct work_struct *w) break; if (ret && ++failures == MAX_RECLAIM_RETRIES) break; - resched: cond_resched(); - } while (!zswap_can_accept()); + } while (zswap_total_pages() > thr); } static int zswap_is_page_same_filled(void *ptr, unsigned long *value) @@ -1476,6 +1459,7 @@ bool zswap_store(struct folio *folio) struct zswap_entry *entry, *dupentry; struct obj_cgroup *objcg = NULL; struct mem_cgroup *memcg = NULL; + unsigned long max_pages, cur_pages; VM_WARN_ON_ONCE(!folio_test_locked(folio)); VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); @@ -1487,6 +1471,7 @@ bool zswap_store(struct folio *folio) if (!zswap_enabled) goto check_old; + /* Check cgroup limits */ objcg = get_obj_cgroup_from_folio(folio); if (objcg && !obj_cgroup_may_zswap(objcg)) { memcg = get_mem_cgroup_from_objcg(objcg); @@ -1497,15 +1482,20 @@ bool zswap_store(struct folio *folio) mem_cgroup_put(memcg); } - /* reclaim space if needed */ - if (zswap_is_full()) { + /* Check global limits */ + cur_pages = zswap_total_pages(); + max_pages = zswap_max_pages(); + + if (cur_pages >= max_pages) { zswap_pool_limit_hit++; zswap_pool_reached_full = true; goto shrink; } if (zswap_pool_reached_full) { - if (!zswap_can_accept()) + unsigned long thr = max_pages * zswap_accept_thr_percent / 100; + + if (cur_pages > thr) goto shrink; else zswap_pool_reached_full = false; @@ -1581,7 +1571,6 @@ bool zswap_store(struct folio *folio) /* update stats */ atomic_inc(&zswap_stored_pages); - zswap_update_total_size(); count_vm_event(ZSWPOUT); return true; @@ -1711,6 +1700,13 @@ void zswap_swapoff(int type) static struct dentry *zswap_debugfs_root; +static int debugfs_get_total_size(void *data, u64 *val) +{ + *val = zswap_total_pages() * PAGE_SIZE; + return 0; +} +DEFINE_DEBUGFS_ATTRIBUTE(total_size_fops, debugfs_get_total_size, NULL, "%llu"); + static int zswap_debugfs_init(void) { if (!debugfs_initialized()) @@ -1732,8 +1728,8 @@ static int zswap_debugfs_init(void) zswap_debugfs_root, &zswap_reject_compress_poor); debugfs_create_u64("written_back_pages", 0444, zswap_debugfs_root, &zswap_written_back_pages); - debugfs_create_u64("pool_total_size", 0444, - zswap_debugfs_root, &zswap_pool_total_size); + debugfs_create_file("pool_total_size", 0444, + zswap_debugfs_root, NULL, &total_size_fops); debugfs_create_atomic_t("stored_pages", 0444, zswap_debugfs_root, &zswap_stored_pages); debugfs_create_atomic_t("same_filled_pages", 0444,