From patchwork Mon Jun 24 14:01:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13709548 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 B4770C2BD09 for ; Mon, 24 Jun 2024 14:04:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 103556B0191; Mon, 24 Jun 2024 10:04:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0650C6B0194; Mon, 24 Jun 2024 10:04:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9A616B0191; Mon, 24 Jun 2024 10:04:46 -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 BBF636B018F for ; Mon, 24 Jun 2024 10:04:46 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 788FD140F6E for ; Mon, 24 Jun 2024 14:04:46 +0000 (UTC) X-FDA: 82265952972.28.507F272 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by imf16.hostedemail.com (Postfix) with ESMTP id EFECB18001D for ; Mon, 24 Jun 2024 14:04:42 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=OY2kPn2N; spf=pass (imf16.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.222.170 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=1719237869; 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=An+vqzJxAs1Y7MV78NqDixz6Z4p5FgiXkGCQ6W1Ubis=; b=cyyiRoRZxIl5BAC0VjpsYcj+fO0wW9QJoTG0iql9STA9e4BqZD5VreZPFJ0F6PYft6xvVn YNI/Zp03wZ6xAIyqNyz3+0XPgfRl/0HoGaFG+rJKXbmoCrZK/XtYQMWlyo8Snd7gwFOagc xVe8XeBcvFSf8LXlfoKfLjdovU5NeHg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719237869; a=rsa-sha256; cv=none; b=QNLh0Pisb7/nFQmjh7/O2WgBefQnBuPklCXkPdEooSG8S8C/Jx8F8jGqRKacUnCUrUImdv viBvEqyijyQvSqv9iXlrFkzwOvcL7RH4zfn2/Wf8iKlmIYftvhhM7ShU/67sggNLeTxlwd CiZdHeN/6Plx9/KI+vnZ8h0RU5o8OAA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=OY2kPn2N; spf=pass (imf16.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.222.170 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-797f2d8b408so292628685a.1 for ; Mon, 24 Jun 2024 07:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719237882; x=1719842682; 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=An+vqzJxAs1Y7MV78NqDixz6Z4p5FgiXkGCQ6W1Ubis=; b=OY2kPn2NripblytBqDJyGPMPYIsJJeeEVyv0oL99bUFYDTfV7ov99eP1Ozqdq0w2jE ZkWGpp14DWiSLyofcr5vDHghTZD1WsVxI8/PMBfET2CRQmSZHWOTEbqLtitg1nrP0nBB PK2sFUSaZbtqiWyJELe4uEVGFs7Me4+41uYhOzZOhu1ACEiso/CQLWEWvnFl87+59yeo drtrdAQfaty13hYa2laLJskKFsOwfSB7N4tBdeqt245hTajxkX4wmIHEDN/RjyplmtsO TA/iEB2AWTTt9q5tL43A0QuwYG2ukb++mF+kTFoeN7k4BGYwLbVUnDdtZtBTGZTxgjl1 0WDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719237882; x=1719842682; 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=An+vqzJxAs1Y7MV78NqDixz6Z4p5FgiXkGCQ6W1Ubis=; b=VNpj972ETsYw6In5T1vXPSv0SKaTDwHVrUNWy2QA0g5zQ5dF3a01uPkN3fTrkniQMV B1w+KH8VGMfl3XOxWm9mM2/RXw6ad1DFJGM4sm6hLD6L5QKozGYQo7yUTQx37GNRftPU cS5ar8LFhrIdhSsUKQ8LnTqqljr8wA3Wwx9mUZUFY4ERtWAJ9nfAGIWVDI2ZKEwWZWl5 UpIhRtwX+5HswdPSDiFJLmIs/hcn1s0OSn4LURyFg8mAJNR4MUNh85V0zNpX6NauSs9/ j9rJNTNPpYQUoaEpoj6LKNtOu4aejae4RHqZ4YzsPPIvWvF3rvH+NL+ZQbsklejhADou PGjQ== X-Forwarded-Encrypted: i=1; AJvYcCXwhk/9hc/G1NNmJWgJo6jaejNwzvhpdfSY0BCTcbAXI3UhOO9Gutm6T5tQNGtrEcRsmAbOhpYICrLlMWVAynDp5VE= X-Gm-Message-State: AOJu0YxCC8TkEPe850469YjQhrxh0/IpYqhydH4oQiqktUW76JpC4Kbw JGbBjlauRf8EGH40TPZMrXk08vfuF4XQr8s9NuHJdTpbTcbe9IkE X-Google-Smtp-Source: AGHT+IH3aFASAHDw+XSRgjC/6aa1Ac8XWACcX5t5iWt10sqj4F6XeBrfB1g921q9rxXzYeZBImiZvw== X-Received: by 2002:a05:620a:394c:b0:79b:eb0f:7781 with SMTP id af79cd13be357-79beb0f7ec3mr389710885a.53.1719237882004; Mon, 24 Jun 2024 07:04:42 -0700 (PDT) Received: from localhost (fwdproxy-ash-008.fbsv.net. [2a03:2880:20ff:8::face:b00c]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79bce8b0f3esm319945285a.29.2024.06.24.07.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 07:04:41 -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 v6 1/2] mm: store zero pages to be swapped out in a bitmap Date: Mon, 24 Jun 2024 15:01:28 +0100 Message-ID: <20240624140427.1334871-2-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240624140427.1334871-1-usamaarif642@gmail.com> References: <20240624140427.1334871-1-usamaarif642@gmail.com> MIME-Version: 1.0 X-Stat-Signature: wmfh8rizoynfktc7hipw6dkbue17s6xz X-Rspamd-Queue-Id: EFECB18001D X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1719237882-298571 X-HE-Meta: U2FsdGVkX1+ihHXhcrthQqHkG0881Jon2GhB3akUWtSEOdg7+RwW+yHgjZKxyHGlQpAeod1iJ+bzKcHfa5Yxou24URE7gtyhNW6qZd6NJvNNBQ7G/trO8HrkZMqY33gSJU3mdxAl/jHTIenmD//lRb6w1QLYlZb/VdxaavGuinKVVeGhtEMMbMemwngTN8UmWF61SMielMl/+agLmYpCZNAIHLs60hAC9JbRznS1dtEKfbgorMNrA5s9536U8U9lhd+fflRxbaNaXl+mZmmxsw1i5gQV3f90PwekiIvGfglNdFTNEvPWgacBGSVzQmgZ+c0KyNamVdOVzDZp4z/p4ybTr3evJXmXeGyX87r0tZ9fKA9PlhSyxc0ta/hbgII6yGe6mhsYzVlMflYBGAg01VuFiik4ZGbfE7y6nfjE9A790qTxsBPK919ul2Ee5/0QxA+F4F3kPvgdvnmQDKoTDwBWSTolr/uv0M32sU2xFtZZkzmgDJVtswmdLy+zwXH6Mmx0Kq7b7JS7mM2yWlFohMsHRsLQEyMG511EksQht5INDt/NASOBen5YBSjaaF/J3WWKewViz8HHB9MIDd7UdDPQtT+FFxBA7jOeSM6KT4cDhgNG+KKbjokfL1pIo96bPxZIKdW4nnP2pvnT1foSgU+D0aakG3wpugXuKexhhMjIHdt/PMik9Q0stxy9UHurA++WyeAMwxkSQG+9iUCeN6ftxzPBK0/JGciduDGBRc37lm04cZkGHVXPyWSBluDX2DXuQ6THMhZ/6di6Fgi+24K90hKMLZvKjbdr13FUR+TIgi1w9VbZLsIQ7Ue1CR4PS4I9u5M8kPqGicxCQOqneVakoCa6/Pu/2lN8pq3JGKG7iHiHno0CKC85zUlgoNT8o0T7vylP7B8g2/YUygMJSVCdV+wVZ2Dnm0BtY0GAGy15/cgx9m4ceZgjVNLAgele9Ksy0HNYt92aZiJ32x8 OkRc2n/f CB+mQA6xWRf7VgK8CrRKe1Zlsm8ESvXLqKLnFnSXYwHhWBbNTY2Wx5pSWdOBlUhbbw4q+0OB2Y/bFUxOIQMNP8mghAYECnZXTWVf676o7YZGovCsWDusrqp+yOoFU8kJpyPmYluxEPDSR83hXfitPCVPeSkTr1XT8YY3sIkgbkw/nhh3BsxAld2CgVRngoEi4j6iS+cJzrfL2g1/8eJbyixdi1WQiR6QUdST+HplL/Pjhs/ffv8+SHJ+i78RAxqUtKS57V5xt8gfVYD7Ok/vw84F2d7MCKINYInXti6O5pR+iqdcp8d/mK8b675weLRtZbPPgY5LXOzRnKJl8etQgOUE1IjWFKh0FKiOTDlcyRhMp0zDpsehhjjk/Gcz/cGQ4I7GgC0nUSVjJxR/Sd4mKiheIngx78jNnAjkKkBZ4DeuWsxqJKmC1jCQREILQVUm8P2xEZFTXW4efo6tcsCNWd6ZDG0ZdJudI7VStkBOGL+adS/tGUXLwgKlVcq5ENXnfQBUBE03Z/ME52QM79wh6gmN/tRsjI1hgMk6EliuDSs9lxYxLtklsePXnLv7Zdlog/Bx0i2OlRTptRR+LUMnt/oeryNm4KNMMVzg/9RlR5NkvKnWjM7h/5YqLuEqhDy13U9ODGwXgUH6cRg4= 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: 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/20171018104832epcms5p1b2232e2236258de3d03d1344dde9fce0@epcms5p1/ Signed-off-by: Usama Arif Reviewed-by: Chengming Zhou Reviewed-by: Yosry Ahmed Reviewed-by: Nhat Pham Cc: David Hildenbrand Cc: "Huang, Ying" Cc: Hugh Dickins Cc: Johannes Weiner Cc: Matthew Wilcox (Oracle) Cc: Shakeel Butt Cc: Usama Arif Cc: Andi Kleen Signed-off-by: Andrew Morton --- 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; } +static bool is_folio_page_zero_filled(struct folio *folio, int i) +{ + unsigned long *data; + unsigned int pos, last_pos = PAGE_SIZE / sizeof(*data) - 1; + bool ret = false; + + data = kmap_local_folio(folio, i * PAGE_SIZE); + if (data[last_pos]) + goto out; + for (pos = 0; pos < PAGE_SIZE / sizeof(*data); pos++) { + if (data[pos]) + goto out; + } + ret = true; +out: + kunmap_local(data); + return ret; +} + +static bool is_folio_zero_filled(struct folio *folio) +{ + unsigned int i; + + for (i = 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 = 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 = swp_swap_info(folio->swap); + swp_entry_t entry; + unsigned int i; + + for (i = 0; i < folio_nr_pages(folio); i++) { + entry = 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 = swp_swap_info(folio->swap); + swp_entry_t entry; + unsigned int i; + + for (i = 0; i < folio_nr_pages(folio); i++) { + entry = 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 = swp_swap_info(folio->swap); + swp_entry_t entry; + unsigned int i; + + for (i = 0; i < folio_nr_pages(folio); i++) { + entry = 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); } +static bool swap_read_folio_zeromap(struct folio *folio) +{ + unsigned int idx = swap_zeromap_folio_test(folio); + + if (idx == 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 **plug) { struct swap_info_struct *sis = swp_swap_info(folio->swap); @@ -514,7 +623,9 @@ void swap_read_folio(struct folio *folio, struct swap_iocb **plug) } delayacct_swapin_start(); - 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..2263f71baa31 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -747,6 +747,14 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset, unsigned long begin = offset; unsigned long end = 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 writes. + */ + for (i = 0; i < nr_entries; i++) + clear_bit(offset + i, si->zeromap); if (offset < si->lowest_bit) si->lowest_bit = offset; @@ -2635,6 +2643,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) free_percpu(p->cluster_next_cpu); p->cluster_next_cpu = NULL; vfree(swap_map); + kvfree(p->zeromap); kvfree(cluster_info); /* Destroy swap account information */ swap_cgroup_swapoff(p->type); @@ -3161,6 +3170,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap_unlock_inode; } + p->zeromap = kvzalloc(DIV_ROUND_UP(maxpages, 8), GFP_KERNEL); + if (!p->zeromap) { + error = -ENOMEM; + goto bad_swap_unlock_inode; + } + if (p->bdev && bdev_stable_writes(p->bdev)) p->flags |= SWP_STABLE_WRITES; From patchwork Mon Jun 24 14:01:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13709549 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 3B384C2D0D1 for ; Mon, 24 Jun 2024 14:04:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 624936B0196; Mon, 24 Jun 2024 10:04:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 585786B01A4; Mon, 24 Jun 2024 10:04:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 278426B0196; Mon, 24 Jun 2024 10:04:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EDE6A6B0190 for ; Mon, 24 Jun 2024 10:04:46 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 90FED121041 for ; Mon, 24 Jun 2024 14:04:46 +0000 (UTC) X-FDA: 82265952972.02.482169D Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by imf09.hostedemail.com (Postfix) with ESMTP id 9560D140032 for ; Mon, 24 Jun 2024 14:04:44 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dbyEDfXQ; spf=pass (imf09.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.160.173 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=1719237871; 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=ZbnE+11g72tFBc6z9kLBVG09E8+csi9JoSd8p0HDXdNcs0WmQUW9JFAKtUmbwQ1vPF5PZY 72+yEI2DUBUWc0HwznAOwJgxxfKUbDC2PyEDBC3Wz8h6/WEsuWabRfY5oCU0nuaHPjYSCv NVcLmu/N++Eau6b5kZMFIv0uo59ZBck= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719237871; a=rsa-sha256; cv=none; b=zrrZIIy3DbknkatG0jDC45s+HHHOaarLfoL1lOEG+rexbfPP7G+/8kLZ06wW4jNqcBdNBP NN68ql7PwFB3s+XAvRM/mcoxpYplP6SOIVDXW+UMvKPeiv+vVo48BGnEFp3W1mDXS5TWL/ /xRaUemx/x0GzOa7oNFBEGcQK2vj8g0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dbyEDfXQ; spf=pass (imf09.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.160.173 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-444af5c09e8so29344041cf.2 for ; Mon, 24 Jun 2024 07:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719237883; x=1719842683; 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=dbyEDfXQsqCR8Pe6GapfZug1G4FkjbGjMoFmsWrWHUJu2fXUoat9rwa0srbRhkyTYB j4n+U4skUfCqooK1fyaTkqXNUHmJNPqqFQvqLlyJHtILUipZn/Jt214v5VTzTJKMBD0q p5/kH2ExZxT/B3ekXa0oYkBFGeo673AthbIPL3FOf7HlqXsjolJEPJ3bwMgxIyo00aLU Qx5chpPRIRtAd140DO/85B87fj3D2lViLTxHxQKjvk78Gv44S+cAuMTfcSNL56pZSaJb tt+hwpgp4vSrKLkKFi5+qTkV1yYX5GNyn+42MUdMGwOZbfLcXBBPQz7tNR4uc4YBqbgJ 4PJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719237883; x=1719842683; 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=rLCkrZ14p1PcLt80gJ3piiQ5qEVOqXI8PikZpZT3eCZBxD9B0luGP7B5dEPABQmMyK euh0NPIlEoyy3SwbD0UgfG58EjLVsUqKsDv8n0TQT43W5DEyhqZHm+VTdKm70SwfS8+R c+7M3PMrZBKhKbrVEOSw0sSSvI6zHp16yo+RSBaW5U7u00AS6eyBQ5N44SrjrETevzvo S8OpeqQ9H1gg3ezVwRXFmVybnxHqG/7QOaF+aD2EN5L7BmpBS/fV5J4wPC8JjZ+q9T2F FFwaHfFQPKKGb7ujQufOhF0lqkeqnzOcjxddY8MW/3WF7apsUYyxccPsSuejtRZm/DLC Bplw== X-Forwarded-Encrypted: i=1; AJvYcCXnUEwYKhYl78O0w4Qcvd9VexqSlrLPD3RVN422gbw0QltXQtqyM3PLqOMyas2mcD4henJ/C9hs/JM7iR3lOnNsU8c= X-Gm-Message-State: AOJu0YwZHqgAGL5HOYW9xa0RUACuvfOFiinY6QGgiBXDN5qpzahle7jV MLLcghy3gk8mv4Tk39oVYc6sRkrnZNXyxYKYeuh7c9GcGw4hUCgf X-Google-Smtp-Source: AGHT+IH8eTzsM0NGhqpdclxPrtt3LxQ2HVXUK/jftjkCUoBUbWBrGhWoW+mmzJQ4EWpKi5yUZJT85A== X-Received: by 2002:ad4:4e2c:0:b0:6b5:403:ea7b with SMTP id 6a1803df08f44-6b5365393admr55125736d6.54.1719237883502; Mon, 24 Jun 2024 07:04:43 -0700 (PDT) Received: from localhost (fwdproxy-ash-126.fbsv.net. [2a03:2880:20ff:7e::face:b00c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b52d28dba1sm24165156d6.88.2024.06.24.07.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 07:04:43 -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 v6 2/2] mm: remove code to handle same filled pages Date: Mon, 24 Jun 2024 15:01:29 +0100 Message-ID: <20240624140427.1334871-3-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240624140427.1334871-1-usamaarif642@gmail.com> References: <20240624140427.1334871-1-usamaarif642@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9560D140032 X-Stat-Signature: 8x8ftdk5ekencgju35js1sgwqsqk86pj X-HE-Tag: 1719237884-981609 X-HE-Meta: U2FsdGVkX1/IrK1hwi0dFCbdkzwfZZGt0DKeqDSE1oWA+gZxXhkPnZLRVqeQ00u+yUntTzgF2l9bQ7dYl4pMUsC5aWzFMrgDdip01tlMLc41Og3rZsx9znB+bOruMCwVFORVxV2jeD9xcRxakjjpN6vBqHWu5vQG/H3erCjtziYJ8BOPAX1np8fwylpjnb/axlLUMdtf6ukDkC9h3RpRraqXpTnTX+B3Zvc51L2KapXAaxrP1YTH9CuKaJv9b3TJGllP9lWqY+nIgaPP2l/kReVshz7TOvWg03m+6J5oRgPWHj1JGX0LjlYaeLirXX+Pr6MNUM5FdtwwzX9uklT7ubgUtcR1DXIFA0/bWUg2f1ySFRazf1tMNgrCqOlE24MgOh3StnXNXkfpULQBONKWpNA8i8FlBpq4iy8H8h8Cfylgr+nw5kLlMDpmAn8wEFFzSDAj7CKK2txZ4magfMWRyCeeg2aYhjFwGitrYCK+Omqvq4loRLtVVfK5cd+rnpnJ9y17nFQCVspXQ9sdgkJAXs3RBoVzLZYV1im1Jl0oJSfErw/Hy+PtFzft4M6nZsSiKIPxfkrWTR9m0S9BYohyJl6eaI6p7J96nohTCqSvOJoPQiMznBPZsHN+0S5fH0ikwXEx83J0+1YDt5mYcmjiW+pzoK/yWfcY0h0rkCfe8S76m4z90rGxuoCIOpSwexViVNv/2/zi2eGTYVk/+FDNY3Uf0HB1biEC7euDAuWt9M073qedoqOIbSbRKr/aKbAtUls6xXejnrfbU7Bc2FvMTPPRSdsBzPIt8C3aQ4VnmcKtfdi1ftVQX4IoDxv7g1PaVOcfaz0m9shku9MYJrW9yTDIAHQewRUigKLrIxQwz4xzN+v7N/KLxs2zAqKU4e12gF79FEMDUm1JlicwfCMccQ59QKCqLupA2EuB5ztCvp3cyMjeJsSP1XReYMCEEvSK56M2FEUMLjDzW0E5P2u y0EmNedQ d8FmQxlZtdl1h5uZTKM+zwqHb8ZRO9muBrP1SNZMB8Bo+pnwYPlm688D+ooFZfRc3f8PjfnIboJLqZ5l0riZz4vJoLhAh3cY0FCNqQU6K9uN4fb5ZNY+dXhSccQl/mmM+h3hY1oPnUHRcb57G5SC+h4RpizBMkgpq5n8h1AjHdMwfZgvsm7DUqf/6xMiOI8SzZCH9gjOrK3+rY7EaBl15aA97tu26XSkxWCv1ZvsKRNFzrWQUYycSa9nzg7O50/EPktjISDLw8TXpE4AW30kduAX1RHDeKWGZuJbsGJ18qIw1vs9i5eiZXRu4BNNBMqonyV/Rv6RTM8Lb97sHfAakLMwRAjEycpqHT5Be6rdTQdsxq9Tqm4c2gv/NhYRZqPNaYr9G3GHOhlHFZmxipCRogt8SEITi3kb9pZcvxfvtQxQRPIHot+nMT52YJ+a5x9m8MfsgbyuK7gbzURDczNgS9iM8bF3nk9RDhpqq/CZEoeIUTmKkj2u89FU8uHKZeHWkSDkCTO1BZ6Xu4ROYN891gMlfzoCgIoBzpGk7/Z9vl7S3gZ8WSNgSF1cCCfg8f6pq8r9syHqN90KGFQU= 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 --- 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; }