From patchwork Tue Jun 4 10:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13685069 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 60ED8C25B7E for ; Tue, 4 Jun 2024 11:00:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC1286B00BC; Tue, 4 Jun 2024 07:00:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A70B86B00BD; Tue, 4 Jun 2024 07:00:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E92A6B00BE; Tue, 4 Jun 2024 07:00:06 -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 72BE86B00BC for ; Tue, 4 Jun 2024 07:00:06 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 217D4A1B1E for ; Tue, 4 Jun 2024 11:00:06 +0000 (UTC) X-FDA: 82192911612.14.5431071 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by imf10.hostedemail.com (Postfix) with ESMTP id 24F58C0035 for ; Tue, 4 Jun 2024 11:00:02 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JpQOME+X; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717498803; 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=5+XY1gPxeVwDTMFWy18KTOJW5+R0TdSJWJS675lM6zM=; b=DeKnKenQwKD3PY7MFlFjYRbSevtLvD/yNTJNJIY77kr3h5jCVCmk+A03hdu6vxnzD4fBBM ln5pfeSNciuJphFwaeCgGfYdW8AnXyGFRtko37ZSxGUfEC5FxLE3Lf2XHcm6DdgSgWx0XD NTl/SVJ7aWwdCll6U73PUdEk4rgKvV8= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JpQOME+X; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717498803; a=rsa-sha256; cv=none; b=R+ByevJP10nJt5p2ruVM/6MoI71Lk+w4AdPcOcu11oS7bGZ/g8lsRo0Gw9hATZrDLyphoh MMC+RpWMmRf+F8PVagBdbvh9Si6/IwSGf+dwMfGYNfb+PCvlILW2mFBmnkQokABpgIpRYn 5KFe8oWPVVmB8ubUd57QmWq8TJ4QO64= Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3d1fea41751so178490b6e.2 for ; Tue, 04 Jun 2024 04:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717498802; x=1718103602; 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=5+XY1gPxeVwDTMFWy18KTOJW5+R0TdSJWJS675lM6zM=; b=JpQOME+XfveF1BsD1y8w3sCyf14jzqfy13DYJ0kF1Jh/j7wFJDhuX8R8KRQBc6m6oY LCPByNaJBa+eGb5VfNrPTBSCeqG3asCdKGOkVUoLGJZbHlIICLt99r0jGh5NlHS6jRPS O3BqtW2v3lLK4c2e4Rf5oIBkM7VrtRJy9v2IXLjrSgIKfsuaDXBiY2mz8wYjfCETHraG 5imEW1KCOJ+UvqFr+9yAmrmnzCQ8rGEz5CjruAdSpbtrhzNQT/A+4lymli3miyC4ZpEK hi+RqBj3Nr4bQzAgJl8GllgKqvhtvXPYep82Wyrz7Ke7dOnQgtzGQkWF8r2faCe3XMZW ISbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717498802; x=1718103602; 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=5+XY1gPxeVwDTMFWy18KTOJW5+R0TdSJWJS675lM6zM=; b=U8R+nlf4zBdTE5LsYDbbG+eo0ums551P1ufx2leYtn0LGZx6nwUO/IVk12S5qU96ts FIdXV4BYn8hzAvl+3Pv7kid31fE/HfQ6xdbJ6BlXA14w2Ry39z/3qpM35DJaWe2sG4qF 2T1V9GzVvU1VkOSb2geyCdcgKNffpBdiYx7652MF8Mr2yfniIoCY3KDFyfaE24G5WgEo kk/4RmN3yPyNQXO8v4q0Pc3VblOHwSH+cXnLjVoE19COyZu5angzXsX3izsjOwPvArI8 xtkVQb1RGgwQrPtmcBcPwhjrmzvQZ1s+NCLZCwJxnYIwUwKhBG/wPFiZRYfO6xQewwuz GuPQ== X-Forwarded-Encrypted: i=1; AJvYcCXomOS0kUCrRH5BLE9uxVbKw33ifxog5E7t5Q6vWPpDtrwcdirCaPOPGZD+wMTClODlNgKGHyaBPxx3lsQ+kJrO1K8= X-Gm-Message-State: AOJu0YwVTMELflYB/lZ61zuUEHfphQUwQ+B8+oorkGyANnGe0IHDFaUF tLMpeyw/XJQhdvtyWastl0xX6C+i4yf6RWoKjdp6WT2ynsR1mqIH X-Google-Smtp-Source: AGHT+IGqjDsQMT9+d5i3I+sV8o2xgyHBJns1JSWePTCCOLgtjISL9ZlqehNIwR0a3myq26CqJC/CfQ== X-Received: by 2002:aca:280a:0:b0:3d1:c62a:3e0d with SMTP id 5614622812f47-3d1e35d0120mr10336000b6e.58.1717498801911; Tue, 04 Jun 2024 04:00:01 -0700 (PDT) Received: from localhost (fwdproxy-nao-005.fbsv.net. [2a03:2880:23ff:5::face:b00c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6afbf044967sm18003676d6.124.2024.06.04.04.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 04:00:00 -0700 (PDT) From: Usama Arif To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, willy@infradead.org, yosryahmed@google.com, nphamcs@gmail.com, chengming.zhou@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Usama Arif Subject: [PATCH v2 2/2] mm: remove code to handle same filled pages Date: Tue, 4 Jun 2024 11:58:25 +0100 Message-ID: <20240604105950.1134192-3-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240604105950.1134192-1-usamaarif642@gmail.com> References: <20240604105950.1134192-1-usamaarif642@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 24F58C0035 X-Stat-Signature: sfoyjrpzgdr9jpj9pmr9zw5qjtbmrqj7 X-HE-Tag: 1717498802-762204 X-HE-Meta: U2FsdGVkX19F6USVpA6j1qWkDiSnUVgDZXHq1on7PgVLDVeMuWW2jh6YeYsB1kV+mBJDnZsqfPsPA4MrfKuP8ZVYxQzayIvReiIQCglB0EoD8jwP0h89LRaiBL5SEjDUSSKEWXqU3oUsiilRHxjQIf2N639anMluIqBXL9IuhMzKw29ZWBZDOfoBQA9U9wRSo7StCz3a269zjNzjwmbzFrc+ecd1fFucBYiXZiVYY4pRMy0uQ4CdBTc6fsZuPu2kkqJyzO7xw/sSVrVn8969OmnfGnHGAQeEbDOuX8iuTlbCKzkGG+30uNTBBPTKR8yDVqb+Lo5NXPenQkHDmRmvH/7sYWc2ClqGismRo5v7PKlQBgRH6qSrBfCYfrSkxPWGBQb6BI3Kb4NrhSS8yFJD2odvIkISkhDk+D/IIIlNtYv4wDE5A07JMm7lMMGr9tObbFtjnFS6oGOgJmILKJMjons5AAmdi2/lKrWW6tv7SbjDmA6YTRVOMcbeF0lDaZzfP76ti8SzUTNaLJ9jkBkmUnfR5iw5jMO9pX2j8B50lRySNKtVnNDw52h2ZlJZuJAq7/mNmDB1WUgpXGS82KYPNRqqeWalniHMlr6WNO4+ZwccbbwSY3QN9RIBRJ1TnfpRLUt2jCEvADkGwHOBvdozqC+NDU/h4WpdCxv2huWMODBNOorezCckcj9Qw5Cj/KwaqD0QvC14vcfV1gd3j1+DO2mGRIzRQYqmDKmI89T03Gq6FZcnjZD8UgBRoFrOyJLM3sQ9J1tbNCEubGZrp0HzEKgcNxVbYuL77UOBkJsxzVFfqu7Gx47HGv6J/4qbKoJI2O98tWIZ8HQzpcNumh4O3IVxHov8Igy6vRryXUSf/MABYBOZnLyLdoTpSUzbPtn9Hhb3YA7OcXKq1t5m2G5DqIzuYi0foPKP2l669dv+JOrTtiKlDetbUBtx7A+D/UZ7NMnIjZe3jHXSHuNHret Tn1ixXEC m95mor+Lmm5uhregpvSLE+OCvxKWs5y86g8yOSsLQvdybwEL+8/j6epGg8PoePXWbL8vxqfmpdBkN9PBDTnkW71wkcc5QvYaydDS4jgB7eOgLilE8RYu5C6uZvlNs/2eGGGLQQIm6ShVl6Rk3dZEzu8VP1W55w55NE5bTvDcNaSioivBX0e7BjaxU9L0TmLrbVxpL/8vuyHTNnwzT/TLwKnn5dlDkCUHW18veyNIEhriJJJIxUC8yda44DK3wa00llU/gXZhsXWizYCtlFblcpQ6yx/EObk4D29VCs4dHV9UhdICoLzkXRIeKwSNHbki2hYSBcKNdKhEithgE9Wxz2XTTYHBLz/CQOxdsAuaMEXSC9mkSYXmxqBqvQPFztNFer5pn/xAXjdWhzmc+Ekg5zGKEGMbp4deLG2U8pvVzsDEWMww= 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: With an earlier commit to handle zero-filled pages in vmscan directly, and with only 1% of the same-filled pages being non-zero, zswap no longer needs to handle same-filled pages and can just work on compressed pages. Signed-off-by: Usama Arif --- mm/zswap.c | 86 +++++------------------------------------------------- 1 file changed, 8 insertions(+), 78 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index b9b35ef86d9b..ca8df9c99abf 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -44,8 +44,6 @@ **********************************/ /* 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 */ -static atomic_t zswap_same_filled_pages = ATOMIC_INIT(0); /* * The statistics below are not protected from concurrent access for @@ -182,11 +180,9 @@ static struct shrinker *zswap_shrinker; * * swpentry - associated swap entry, the offset indexes into the red-black tree * length - the length in bytes of the compressed page data. Needed during - * decompression. For a same value filled page length is 0, and both - * pool and lru are invalid and must be ignored. + * decompression. * pool - the zswap_pool the entry's data is in * handle - zpool allocation handle that stores the compressed page data - * value - value of the same-value filled pages which have same content * objcg - the obj_cgroup that the compressed memory is charged to * lru - handle to the pool's lru used to evict pages. */ @@ -194,10 +190,7 @@ struct zswap_entry { swp_entry_t swpentry; unsigned int length; struct zswap_pool *pool; - union { - unsigned long handle; - unsigned long value; - }; + unsigned long handle; struct obj_cgroup *objcg; struct list_head lru; }; @@ -814,13 +807,9 @@ static struct zpool *zswap_find_zpool(struct zswap_entry *entry) */ static void zswap_entry_free(struct zswap_entry *entry) { - if (!entry->length) - atomic_dec(&zswap_same_filled_pages); - else { - zswap_lru_del(&zswap_list_lru, entry); - zpool_free(zswap_find_zpool(entry), entry->handle); - zswap_pool_put(entry->pool); - } + zswap_lru_del(&zswap_list_lru, entry); + zpool_free(zswap_find_zpool(entry), entry->handle); + zswap_pool_put(entry->pool); if (entry->objcg) { obj_cgroup_uncharge_zswap(entry->objcg, entry->length); obj_cgroup_put(entry->objcg); @@ -1262,11 +1251,6 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, * 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). - * - * The memory saving factor calculated here takes same-filled pages into - * account, but those are not freeable since they almost occupy no - * space. Hence, we may scale nr_freeable down a little bit more than we - * should if we have a lot of same-filled pages. */ return mult_frac(nr_freeable, nr_backing, nr_stored); } @@ -1370,42 +1354,6 @@ static void shrink_worker(struct work_struct *w) } while (zswap_total_pages() > thr); } -/********************************* -* same-filled functions -**********************************/ -static bool zswap_is_folio_same_filled(struct folio *folio, unsigned long *value) -{ - unsigned long *data; - unsigned long val; - unsigned int pos, last_pos = PAGE_SIZE / sizeof(*data) - 1; - bool ret = false; - - data = kmap_local_folio(folio, 0); - val = data[0]; - - if (val != data[last_pos]) - goto out; - - for (pos = 1; pos < last_pos; pos++) { - if (val != data[pos]) - goto out; - } - - *value = val; - ret = true; -out: - kunmap_local(data); - return ret; -} - -static void zswap_fill_folio(struct folio *folio, unsigned long value) -{ - unsigned long *data = kmap_local_folio(folio, 0); - - memset_l(data, value, PAGE_SIZE / sizeof(unsigned long)); - kunmap_local(data); -} - /********************************* * main API **********************************/ @@ -1417,7 +1365,6 @@ bool zswap_store(struct folio *folio) struct zswap_entry *entry, *old; struct obj_cgroup *objcg = NULL; struct mem_cgroup *memcg = NULL; - unsigned long value; VM_WARN_ON_ONCE(!folio_test_locked(folio)); VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); @@ -1450,13 +1397,6 @@ bool zswap_store(struct folio *folio) goto reject; } - if (zswap_is_folio_same_filled(folio, &value)) { - entry->length = 0; - entry->value = value; - atomic_inc(&zswap_same_filled_pages); - goto store_entry; - } - /* if entry is successfully added, it keeps the reference */ entry->pool = zswap_pool_current_get(); if (!entry->pool) @@ -1474,7 +1414,6 @@ bool zswap_store(struct folio *folio) if (!zswap_compress(folio, entry)) goto put_pool; -store_entry: entry->swpentry = swp; entry->objcg = objcg; @@ -1522,13 +1461,9 @@ bool zswap_store(struct folio *folio) return true; store_failed: - if (!entry->length) - atomic_dec(&zswap_same_filled_pages); - else { - zpool_free(zswap_find_zpool(entry), entry->handle); + zpool_free(zswap_find_zpool(entry), entry->handle); put_pool: - zswap_pool_put(entry->pool); - } + zswap_pool_put(entry->pool); freepage: zswap_entry_cache_free(entry); reject: @@ -1577,10 +1512,7 @@ bool zswap_load(struct folio *folio) if (!entry) return false; - if (entry->length) - zswap_decompress(entry, folio); - else - zswap_fill_folio(folio, entry->value); + zswap_decompress(entry, folio); count_vm_event(ZSWPIN); if (entry->objcg) @@ -1682,8 +1614,6 @@ static int zswap_debugfs_init(void) 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, - zswap_debugfs_root, &zswap_same_filled_pages); return 0; }