From patchwork Thu Jun 27 10:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13714185 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 92678C2BD09 for ; Thu, 27 Jun 2024 10:57:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E78A6B00A3; Thu, 27 Jun 2024 06:57:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 846246B00A7; Thu, 27 Jun 2024 06:57:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 49DF46B00A5; Thu, 27 Jun 2024 06:57:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 260B16B00A4 for ; Thu, 27 Jun 2024 06:57:38 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CBA8FA1C72 for ; Thu, 27 Jun 2024 10:57:37 +0000 (UTC) X-FDA: 82276367754.08.7F0FC1B Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by imf26.hostedemail.com (Postfix) with ESMTP id EC60A14000C for ; Thu, 27 Jun 2024 10:57:35 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="DLwDk/lz"; spf=pass (imf26.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.222.171 as permitted sender) smtp.mailfrom=usamaarif642@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=1719485843; 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=/jytiD3F6dVDoVcn3tgOCkYr8qgKU/Kw/DG4oKzaeY4=; b=lfFZJYOxWuiIuzQN9e/mwJ0rgyXGUFJQ2vzSZgAvZGHxinsM8X0krKxFTAl65hoYHuvbcg uwqPxOMC+yu44qmVHHu7vVkxjhO43jPjWGixy+eXL+su4W/FvwP+WJOzZb66qEwnc5VtRV MzcTynbcw++D0/dbXD7umtd/HsdMQ9M= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="DLwDk/lz"; spf=pass (imf26.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.222.171 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719485843; a=rsa-sha256; cv=none; b=X7y5vrFlwanoJuQoLwOCaJzv4JuBY185dWhpRyVaEY0R/Sxx5endn2Kt1xxU+8Whnd3CtX ZQVL7HwTR8LSCB9Fbnb8CBhRtJWkazr4a3GkiThdvEKU5m7dvk3+rt2gDSckvAcGZyisPq bLvSiRqEvMpHNWajevo+oZfAAe+jfdM= Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-79c054b65d4so156858085a.1 for ; Thu, 27 Jun 2024 03:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719485855; x=1720090655; 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=/jytiD3F6dVDoVcn3tgOCkYr8qgKU/Kw/DG4oKzaeY4=; b=DLwDk/lzDDnXJR8oV/ggTGcDFHrAeRpNbfbuh4jOZWFWIZkn3svg8nmbrvSO+ESfie Su6oH6J2O9eqpsv8sAV0lHc88OlRwpL9HuaDcThEM+IIMfMieJ7SKjyt7/4lpyDOrxa5 8vPrC9AEbM6hT0AyNIt9tKKqT5JNoIw1++DSSNDMJGF27rqZiuN5gsGCMYbkBulVVTzL 10JcNWs5LvaLJ+jIWSCavaQrzjENf6hFbEohKSg6TTTgHgCR4Z545QCU3nBigkgo/0BX yEYmyrVQBS6XlwDifvzy/sCRPJJ61GfA7JqWALCdHZ/RaxJn5bTe5zIHAHfCk8T3ukRM ZAPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719485855; x=1720090655; 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=/jytiD3F6dVDoVcn3tgOCkYr8qgKU/Kw/DG4oKzaeY4=; b=ilI4L26NIg5j93Cnao1v4o3ilLKmvHDc8Eun4GhaDb/xGNkwWkB95f7zDSVrbaaK8r nZKHEWA0vijsc1twrR2JOsQ6n6P6ED25RfqYFI2pMQDk4beLzItuNWls+ly6ZEfylKLk 7FWjgglYDEw93wh57ElSKcPC/e4OnVjkQ3RSRwol4KlS0Xgh9sx/C7TrA3gKM8ugnA5I lpb+Wz/wZSKIuTnJrREbrcTPebkk0awpbyGvXJmowrd1vmQRegAwpzx5/ESX4iLNTUaX /TT9v5S6UrIhUsgrHw8RC+dHCfB5kcVJWGvFuqm5SREKFUEpgUw3ljLLHYC2PR/Xm7MJ vKaw== X-Forwarded-Encrypted: i=1; AJvYcCXRsooCerlNkbzHZSokIgwd6HOFfKFKauHlT2M9CGLyMgMS/SxNiLDG2zw2YTK1/HI+FShy+jrpvx2lIzo57Dr1zEc= X-Gm-Message-State: AOJu0YyRgwhTMwrbLJLpLYqUIUGPjh6NL6EuWz3iN6N7kLXWq+O+TsL0 plzaU3c/BJyb8PAYW6/YKUYJ+lms5JWEMv7idFNIypNFNljrmyMi X-Google-Smtp-Source: AGHT+IFRSA2E/3cS18UczoHmhGiJ1yqas1kMncm42FdVDN8CvhCvuezJ9y6/uHNF847ZRU8aorvsYg== X-Received: by 2002:a05:620a:404d:b0:794:b302:96b5 with SMTP id af79cd13be357-79be0c62f1bmr1704032485a.36.1719485854953; Thu, 27 Jun 2024 03:57:34 -0700 (PDT) Received: from localhost (fwdproxy-ash-012.fbsv.net. [2a03:2880:20ff:c::face:b00c]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d5c8ba5b1sm43902985a.108.2024.06.27.03.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 03:57:34 -0700 (PDT) From: Usama Arif To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, shakeel.butt@linux.dev, david@redhat.com, ying.huang@intel.com, hughd@google.com, 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 , Andi Kleen Subject: [PATCH v7 2/2] mm: remove code to handle same filled pages Date: Thu, 27 Jun 2024 11:55:30 +0100 Message-ID: <20240627105730.3110705-3-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240627105730.3110705-1-usamaarif642@gmail.com> References: <20240627105730.3110705-1-usamaarif642@gmail.com> MIME-Version: 1.0 X-Stat-Signature: gcakqsd6g64ebhkyiif6jco3dnfj9pq3 X-Rspam-User: X-Rspamd-Queue-Id: EC60A14000C X-Rspamd-Server: rspam02 X-HE-Tag: 1719485855-611698 X-HE-Meta: U2FsdGVkX19q2NAgBo1oklYkA9Zs1ozWvl8BBLuY+lRBNx0YvDrcFsw2t8wDJA8sKHZmjNK0gVEqwNCrj4SVXH7YlD3qJjh7aawBcupP0Hgt+CWOAoZ/aToUjdxzujA1SCEtP19zlKgDPre8NNHVj96fAdkRL8a5cmYjuBUzWbPnjK+0gkSez0xYsdChhAXphubJNkeLGlku5sEHiMm4xgyL44A1/nvuL/fudokgzA9buH1wadY5Oi+r7/biXURhw4+MDbpw7/KWwq8nbHOBAwNFAAkjhcLfWGWPjxt+FOogEUEHiEjThmtWcBUiEFwddKsve3XtHss7/hIwziJeBGiKnLGRBWX6XQn0bZIT+1VdscP3Z/yVnDLEuFXEnMevad6sXkT8ckltFclZw6g+8zQPd3LQYOchKXqUDopcTBeNjnLbURxR332wgtXe2cGE3VguZTIS7NP/PAPyhXEroJfOonibBTQXPcD78clnT+N3zeLmM26kkP7YIQmpvNIdkd/b+qnmDtKHYvSOwr9LlfCBVp5iPUPRR6Fl9v47QFdjve1f+mjmCMtpFhdSuzPQUy42vzXcsEXr3YvO0sG1KQ5VNbeummFQ4wIanyuVrAPOGIJRAWodRXHxabRXPYDrgPibK8pIbLgdMREiA0BEjRDxCpMNBVvRq1lQdhZQVXslLg1RXrJ9TGRyfmVhvWRykX1AQP6bbGiNWtA7RgFmErBxgwVBYnKwiVdByBNNcPx08JLuNjLTnWETaeFNi0Wgjml1rhRdUSoz/6r/1QheFzcjcvI+TjnROhSnA9n7z4lsY6Gg2ighqlUtjVTWifoFoH6HPk6blJS2ur/cQXrWX0NstLszs7nLVdymliPNz8awgrlPuvjZnZZ1D4qwPFMcKjedoJHVh68xjrWCsVdTx0gUpJOVGPA6Za1jyIAL/TsldUn2IDLpYBTWAdGqBL3f+m7B1pqJh73mRty8dMk sNCLw952 WjgTKx1H0pQxPUNRSJwLULgMrAlej1y/5cL1kM3dvFrMS/XtXUdvNzSb6ldPxnfJbRsihHy74FIOB9H/i4R/eiOeeY/QcHa5xNu3UVNAz9uxbf1PYkOkLq8HiLFsAIafYF9UoHJrrgb1g89vpIbn0QXHfVZw3KHd9U8cEkGMmujHZdyvXuS/3EyeBfkdUteC4jZo9RdHZtV+/Bed3tdK9ZgNbXNB6anV1KXYlRldDIqYkuF0SrwbWlr9TYbQ5qGnduUXLunbWEt5T6CLxDtuqdTDQSe6wUHS8LsuNs10bn0fvlP/BqonBDVAoVF3wRItVJgSyD1Kk1ol8vVykpMOtPUc3b/ze0LDe/V+BTC6SUndiAcGuOMNNq9aRw2+uvUFQt/Hj9rHnzrZPfcj6jelwaH8FVq6AA6Va5aTwucscw5gym1Y8e7NhjyOddmP88oolShU2tGV13yEyxNIBJnduVROQiZ9NuubfVsF7aKqgHMKJ5WsTCyGtUo94WoI+SCU3LEUR33OKxNIZjkOd5IGRaPk6Lk/I5XdRckBzrkc26kAjfmkzHMqn5MfcA9guTuDrnL+nWH9xqCR7Qf8= 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 swap 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 Reviewed-by: Chengming Zhou Acked-by: Yosry Ahmed Reviewed-by: Nhat Pham Cc: Andi Kleen Cc: David Hildenbrand Cc: "Huang, Ying" Cc: Hugh Dickins Cc: Johannes Weiner Cc: Matthew Wilcox (Oracle) Cc: Shakeel Butt Signed-off-by: Andrew Morton Acked-by: Johannes Weiner --- mm/zswap.c | 86 +++++------------------------------------------------- 1 file changed, 8 insertions(+), 78 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index a546c01602aa..e25a6808c2ed 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 @@ -188,11 +186,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. */ @@ -200,10 +196,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; }; @@ -820,13 +813,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); @@ -1268,11 +1257,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); } @@ -1376,42 +1360,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 **********************************/ @@ -1423,7 +1371,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)); @@ -1456,13 +1403,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) @@ -1480,7 +1420,6 @@ bool zswap_store(struct folio *folio) if (!zswap_compress(folio, entry)) goto put_pool; -store_entry: entry->swpentry = swp; entry->objcg = objcg; @@ -1528,13 +1467,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: @@ -1597,10 +1532,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) @@ -1703,8 +1635,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; }