From nobody Thu Dec 18 11:25:29 2025 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D40D0192B9C for ; Fri, 14 Jun 2024 10:09:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718359752; cv=none; b=t0HqnX7ojD+EV2TjZiPZnYHibC3xt1Ts3nIAxYlb0W9JvhzKCvNQeMpMrARLci7CqqXo0G/r577C8QwBpNCfzkeqv1L2bS/dTzjfDfaM+8EpwqzuDhBbAA/RkfOYVVPnNuxF7x1ucrMlvAMWg7iSprdpRIX+JXEqEm382vIjGn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718359752; c=relaxed/simple; bh=1MT8xFKeBPw5AjOzcJOw/5QJHrl6H6hSaG9te/askVk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oSvTiy0n05iHCHuEczcOAGhdfWQVvp5EGMJcK/oLoH9BBFG8J0vYp6v926k9+dxsnnQkRjoyt2MbXzyZfC6Hiq37IVK8oOwUOzL/dDCJ25IbIdnAt91Kgbm1MFxBYMvQPZnZV8T5LfVy9Jyp440pEudCKJD84wNswoEjnDk8vEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DsMwyGiS; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DsMwyGiS" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7955ddc6516so127932185a.1 for ; Fri, 14 Jun 2024 03:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718359749; x=1718964549; darn=vger.kernel.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=O6fv8HdnUEDMg3BMIhTRciMdCxiiErbM6c3rC1OGOWE=; b=DsMwyGiSwBrl+nks53tYC6+hguMuUsi0YCkeMNrvP5T3+FetXx5Ih47hNzm5o/I9X0 Kq6XuVn+lw50DumuR2YKeZDdd2jbkSwKr7avEjaKshk6uacKO2fpbxd7ZQ7xBj67xxKs dgkkbvC5BMsW5TSSsWp2OAuERBZU0qICgNjE5LTBOTG2wYI5sQt+pqTOpnJwhovcTUBq vSLNZHPnDVEVZUUY9zGv0EXfXNK5R/TN2ectT4S2Tns/LWVdB2Ojg+4Ail2UnByXiVd5 YjvM3IbkWuXWo2+IrHMQHBCKXd9vztDfPzAK6UwdsZWZw53rMbrJI6sT1CjAtS/M39ri WICA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718359749; x=1718964549; 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=O6fv8HdnUEDMg3BMIhTRciMdCxiiErbM6c3rC1OGOWE=; b=bK+8OEl8gHCREry6VtEaBDS+T60kiIsQLoQwsx6Nn8jcj4xwEvFd6t0hp1vKc1GLab uAlGRorCjZZ8hnWmZiY7z5sFBlZBXV3RAV8rmb2TsZXMI7kQ7PdHi3eYqVdZV11BcfPm xQo0AFvf6X4JcGwPoMwyf6ak8pn8sTL2uKqfIFjhdY3hPfiyQPW7Wrg4HQKtONmGIvBN W91+53YLOJfaFSylpiPcirVO6aJGxQPmZZE2gKooZm3fKYRBB5FnjJn9zMnD2W7NqBmk VdUCeu73ql8rAUMXx0PKdddCIb+V051Et6Bf0HYfc2G8aQpvmJCBV9FRqrjfqC57ExPf +wCw== X-Forwarded-Encrypted: i=1; AJvYcCU8ahsBMrW/1AleF8G7xDtv0TcJCpYgzNDDLCr8roDKQXad3zfxStDsQzKmgusCTH+y23/0QyT8I+PHwNPCTeLI/4957aeXHEcjhLkk X-Gm-Message-State: AOJu0YzVY3kFSXN3/D/lTT53R9o+CTXZz5lISGs2S4F8PKsar6sDuhUY GTXd3tDVpQSlzdqL2pPdnYzBeYmDrADkQoHv6KXD2nhn+Dr2r2fD X-Google-Smtp-Source: AGHT+IGB51PlczTS+Q8lC/8MDqy7gI3RzP4surNROYc6BI+M5ZcIlbCQASDwUV5uflux1tzhLPLPaA== X-Received: by 2002:ad4:590c:0:b0:6b0:4542:e42e with SMTP id 6a1803df08f44-6b2afcc0ebfmr20182046d6.28.1718359748441; Fri, 14 Jun 2024 03:09:08 -0700 (PDT) Received: from localhost (fwdproxy-ash-116.fbsv.net. [2a03:2880:20ff:74::face:b00c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c1ceadsm16455526d6.43.2024.06.14.03.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jun 2024 03:09:07 -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 Subject: [PATCH v5 1/2] mm: store zero pages to be swapped out in a bitmap Date: Fri, 14 Jun 2024 11:07:05 +0100 Message-ID: <20240614100902.3469724-2-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240614100902.3469724-1-usamaarif642@gmail.com> References: <20240614100902.3469724-1-usamaarif642@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Approximately 10-20% of pages to be swapped out are zero pages [1]. Rather than reading/writing these pages to flash resulting in increased I/O and flash wear, a bitmap can be used to mark these pages as zero at write time, and the pages can be filled at read time if the bit corresponding to the page is set. With this patch, NVMe writes in Meta server fleet decreased by almost 10% with conventional swap setup (zswap disabled). [1] https://lore.kernel.org/all/20171018104832epcms5p1b2232e2236258de3d03d1= 344dde9fce0@epcms5p1/ Signed-off-by: Usama Arif Reviewed-by: Chengming Zhou Reviewed-by: Nhat Pham Reviewed-by: Yosry Ahmed --- include/linux/swap.h | 1 + mm/page_io.c | 113 ++++++++++++++++++++++++++++++++++++++++++- mm/swapfile.c | 15 ++++++ 3 files changed, 128 insertions(+), 1 deletion(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 3df75d62a835..ed03d421febd 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -299,6 +299,7 @@ struct swap_info_struct { signed char type; /* strange name for an index */ unsigned int max; /* extent of the swap_map */ unsigned char *swap_map; /* vmalloc'ed array of usage counts */ + unsigned long *zeromap; /* vmalloc'ed bitmap to track zero pages */ struct swap_cluster_info *cluster_info; /* cluster info. Only for SSD */ struct swap_cluster_list free_clusters; /* free clusters list */ unsigned int lowest_bit; /* index of first free in swap_map */ diff --git a/mm/page_io.c b/mm/page_io.c index 6c1c1828bb88..480b8f221d90 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -172,6 +172,88 @@ int generic_swapfile_activate(struct swap_info_struct = *sis, goto out; } =20 +static bool is_folio_page_zero_filled(struct folio *folio, int i) +{ + unsigned long *data; + unsigned int pos, last_pos =3D PAGE_SIZE / sizeof(*data) - 1; + bool ret =3D false; + + data =3D kmap_local_folio(folio, i * PAGE_SIZE); + if (data[last_pos]) + goto out; + for (pos =3D 0; pos < PAGE_SIZE / sizeof(*data); pos++) { + if (data[pos]) + goto out; + } + ret =3D true; +out: + kunmap_local(data); + return ret; +} + +static bool is_folio_zero_filled(struct folio *folio) +{ + unsigned int i; + + for (i =3D 0; i < folio_nr_pages(folio); i++) { + if (!is_folio_page_zero_filled(folio, i)) + return false; + } + return true; +} + +static void folio_zero_fill(struct folio *folio) +{ + unsigned int i; + + for (i =3D 0; i < folio_nr_pages(folio); i++) + clear_highpage(folio_page(folio, i)); +} + +static void swap_zeromap_folio_set(struct folio *folio) +{ + struct swap_info_struct *sis =3D swp_swap_info(folio->swap); + swp_entry_t entry; + unsigned int i; + + for (i =3D 0; i < folio_nr_pages(folio); i++) { + entry =3D page_swap_entry(folio_page(folio, i)); + set_bit(swp_offset(entry), sis->zeromap); + } +} + +static void swap_zeromap_folio_clear(struct folio *folio) +{ + struct swap_info_struct *sis =3D swp_swap_info(folio->swap); + swp_entry_t entry; + unsigned int i; + + for (i =3D 0; i < folio_nr_pages(folio); i++) { + entry =3D page_swap_entry(folio_page(folio, i)); + clear_bit(swp_offset(entry), sis->zeromap); + } +} + +/* + * Return the index of the first subpage which is not zero-filled + * according to swap_info_struct->zeromap. + * If all pages are zero-filled according to zeromap, it will return + * folio_nr_pages(folio). + */ +static unsigned int swap_zeromap_folio_test(struct folio *folio) +{ + struct swap_info_struct *sis =3D swp_swap_info(folio->swap); + swp_entry_t entry; + unsigned int i; + + for (i =3D 0; i < folio_nr_pages(folio); i++) { + entry =3D page_swap_entry(folio_page(folio, i)); + if (!test_bit(swp_offset(entry), sis->zeromap)) + return i; + } + return i; +} + /* * We may have stale swap cache pages in memory: notice * them here and get rid of the unnecessary final write. @@ -195,6 +277,13 @@ int swap_writepage(struct page *page, struct writeback= _control *wbc) folio_unlock(folio); return ret; } + + if (is_folio_zero_filled(folio)) { + swap_zeromap_folio_set(folio); + folio_unlock(folio); + return 0; + } + swap_zeromap_folio_clear(folio); if (zswap_store(folio)) { folio_unlock(folio); return 0; @@ -424,6 +513,26 @@ static void sio_read_complete(struct kiocb *iocb, long= ret) mempool_free(sio, sio_pool); } =20 +static bool swap_read_folio_zeromap(struct folio *folio) +{ + unsigned int idx =3D swap_zeromap_folio_test(folio); + + if (idx =3D=3D 0) + return false; + + /* + * Swapping in a large folio that is partially in the zeromap is not + * currently handled. Return true without marking the folio uptodate so + * that an IO error is emitted (e.g. do_swap_page() will sigbus). + */ + if (WARN_ON_ONCE(idx < folio_nr_pages(folio))) + return true; + + folio_zero_fill(folio); + folio_mark_uptodate(folio); + return true; +} + static void swap_read_folio_fs(struct folio *folio, struct swap_iocb **plu= g) { struct swap_info_struct *sis =3D swp_swap_info(folio->swap); @@ -514,7 +623,9 @@ void swap_read_folio(struct folio *folio, struct swap_i= ocb **plug) } delayacct_swapin_start(); =20 - if (zswap_load(folio)) { + if (swap_read_folio_zeromap(folio)) { + folio_unlock(folio); + } else if (zswap_load(folio)) { folio_unlock(folio); } else if (data_race(sis->flags & SWP_FS_OPS)) { swap_read_folio_fs(folio, plug); diff --git a/mm/swapfile.c b/mm/swapfile.c index 9c6d8e557c0f..0b8270359bcf 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -747,6 +747,14 @@ static void swap_range_free(struct swap_info_struct *s= i, unsigned long offset, unsigned long begin =3D offset; unsigned long end =3D offset + nr_entries - 1; void (*swap_slot_free_notify)(struct block_device *, unsigned long); + unsigned int i; + + /* + * Use atomic clear_bit operations only on zeromap instead of non-atomic + * bitmap_clear to prevent adjacent bits corruption due to simultaneous w= rites. + */ + for (i =3D 0; i < nr_entries; i++) + clear_bit(offset + i, si->zeromap); =20 if (offset < si->lowest_bit) si->lowest_bit =3D offset; @@ -2635,6 +2643,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, special= file) free_percpu(p->cluster_next_cpu); p->cluster_next_cpu =3D NULL; vfree(swap_map); + bitmap_free(p->zeromap); kvfree(cluster_info); /* Destroy swap account information */ swap_cgroup_swapoff(p->type); @@ -3161,6 +3170,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, special= file, int, swap_flags) goto bad_swap_unlock_inode; } =20 + p->zeromap =3D bitmap_zalloc(maxpages, GFP_KERNEL); + if (!p->zeromap) { + error =3D -ENOMEM; + goto bad_swap_unlock_inode; + } + if (p->bdev && bdev_stable_writes(p->bdev)) p->flags |=3D SWP_STABLE_WRITES; =20 --=20 2.43.0 From nobody Thu Dec 18 11:25:29 2025 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7978919308A for ; Fri, 14 Jun 2024 10:09:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718359754; cv=none; b=Xn+p1XXDqbW2nVqNAdX0oTZl1KydUma3o6y0zl9mz5y7BjMXJyv+57ZGH1VG4xm2Py87VrNxonLYkJZy4xoYhKsC/qXqpOFnez6Ckcl2uMjHwXBD/fqBne+lXMsewvdRB4DFVoDLIyJ7Z4spMGRs2Bm35fhH96W3DulanGe1F64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718359754; c=relaxed/simple; bh=EIfDIo1KyLwMz8ZfNtfaXYH0IGyvCXi7NcTQhonIcZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fmawHcYTM1yqf63YPkUVar9Zelmx/pzWysQ8QX+Yk4m+1T+duqJSV43JJAniSBGvQaaQmAW7Z/EYjRXuAgO9+VczPIqo4D0spwv8bKYUTjCcKx92hfwcPVVPrm7jUonnS0fosql15yYW6H6PLqist8Kk/f390z4kj7RIRoYyeU0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nD+IEc3W; arc=none smtp.client-ip=209.85.222.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nD+IEc3W" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-797dcb558ebso121034785a.2 for ; Fri, 14 Jun 2024 03:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718359751; x=1718964551; darn=vger.kernel.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=5EHezwSo6IEpdsNk9twdnn0QxPVkx1ShUAN5bWtyw3s=; b=nD+IEc3W+xD05ggs8pB/P37hRIVgd68+1AuqcdcQspS80noUVru2MuQGcy1pXGRQED yeVTMEZNEc4GBfAaH0jFu/0Q+aZtMZ9L8Q6wEOfUJj0n8OPT0pM0BGAt4vlme+E6ZJ6q gPPta3mBvseN73uOTBENP6PL0q964Q2d8PRCI7yVrhHKCMv8ItWxjvv2G44ROP0D5Z28 GL7v3TKMNL33OtjaS11Ahd83lSOGdueArTS4UjlAc8JFjZ2yGtNdasb/GghZHF11rBtd O8gAiad+Mh1nEV0/z1vyRJaFuDS6L4NxMhVjmPJPuRvy8BbWom7IlORsKYGSFMd3n0GO pd+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718359751; x=1718964551; 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=5EHezwSo6IEpdsNk9twdnn0QxPVkx1ShUAN5bWtyw3s=; b=bnav54SP7Z6pVRSX7WTL2uMxluKZJRLc5i+y0ushgjSpaa96GfL4f6fBAbFrWcchBj uqbLq8dl7ZrRPf8wncZu92N4eYLsdFJZMHJQta3RsDMpLNEYOo0deVG7LsFdUGqIpleL 9KXOlgIqPw90yjMc6cD+3tSxl2m9Dbv6V7Ys/ezPD/jfaJ9v3JJZLubfYeflKVSZEeXT y8MLi2AUOxbTxHGkhYhOUldHayRBlinsUrj0Ahhwh/mCA8d0yZnaGSc9SfP9baM0ZTAp bzEAzjZVVZUm3L+K5V2TxLLQMgwN6xvQMrnfornxxO0vMxws1d9PoqAqAsaXNYn7KiWl kVMQ== X-Forwarded-Encrypted: i=1; AJvYcCVVtYZW6h8nnPAMAHmr8mBTtU7FJVLGOovc+kaodzok+rw8YvtcsTESnXCdk4PAEf7IkM7xpk+MvV4zBmSYn+0lHArzn60eH/lbZ6on X-Gm-Message-State: AOJu0YwDRDliRFsQb8yNMc4YI9CA8e2Pzv75T1l8UtF8ZebtOFxRBggl K0hxWHhqUrszDtSVk+pMNl1ySkCsmGZvAuEsc5DD2dLyiz93G1JO X-Google-Smtp-Source: AGHT+IFJEvCuMkaEjbOYT08iEZ5+NTEUu3Vx5zj5E25wX7sKr7Vg2rxYQdpasbTkSVE2OkRKgL3q4g== X-Received: by 2002:a05:620a:444d:b0:795:4df4:d4f6 with SMTP id af79cd13be357-798d243b29fmr254496485a.46.1718359751276; Fri, 14 Jun 2024 03:09:11 -0700 (PDT) Received: from localhost (fwdproxy-ash-002.fbsv.net. [2a03:2880:20ff:2::face:b00c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-441f2fcc0b9sm14201161cf.65.2024.06.14.03.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jun 2024 03:09:10 -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 Subject: [PATCH v5 2/2] mm: remove code to handle same filled pages Date: Fri, 14 Jun 2024 11:07:06 +0100 Message-ID: <20240614100902.3469724-3-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240614100902.3469724-1-usamaarif642@gmail.com> References: <20240614100902.3469724-1-usamaarif642@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Yosry Ahmed Reviewed-by: Chengming Zhou Reviewed-by: Nhat Pham --- 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 =3D ATOMIC_INIT(0); -/* The number of same-value filled pages currently stored in zswap */ -static atomic_t zswap_same_filled_pages =3D ATOMIC_INIT(0); =20 /* * 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 b= oth - * 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_ent= ry *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 shr= inker *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); } =20 -/********************************* -* 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 =3D PAGE_SIZE / sizeof(*data) - 1; - bool ret =3D false; - - data =3D kmap_local_folio(folio, 0); - val =3D data[0]; - - if (val !=3D data[last_pos]) - goto out; - - for (pos =3D 1; pos < last_pos; pos++) { - if (val !=3D data[pos]) - goto out; - } - - *value =3D val; - ret =3D true; -out: - kunmap_local(data); - return ret; -} - -static void zswap_fill_folio(struct folio *folio, unsigned long value) -{ - unsigned long *data =3D 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 =3D NULL; struct mem_cgroup *memcg =3D NULL; - unsigned long value; =20 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; } =20 - if (zswap_is_folio_same_filled(folio, &value)) { - entry->length =3D 0; - entry->value =3D value; - atomic_inc(&zswap_same_filled_pages); - goto store_entry; - } - /* if entry is successfully added, it keeps the reference */ entry->pool =3D 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; =20 -store_entry: entry->swpentry =3D swp; entry->objcg =3D objcg; =20 @@ -1528,13 +1467,9 @@ bool zswap_store(struct folio *folio) return true; =20 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; =20 - if (entry->length) - zswap_decompress(entry, folio); - else - zswap_fill_folio(folio, entry->value); + zswap_decompress(entry, folio); =20 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); =20 return 0; } --=20 2.43.0