From mboxrd@z Thu Jan 1 00:00:00 1970 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 14A38E77188 for ; Mon, 30 Dec 2024 17:46:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E74C6B0095; Mon, 30 Dec 2024 12:46:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 996AE6B0096; Mon, 30 Dec 2024 12:46:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83A336B0098; Mon, 30 Dec 2024 12:46:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5D5BB6B0095 for ; Mon, 30 Dec 2024 12:46:57 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D86FD141A42 for ; Mon, 30 Dec 2024 17:46:56 +0000 (UTC) X-FDA: 82952355612.29.4DDA685 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf06.hostedemail.com (Postfix) with ESMTP id 04D42180004 for ; Mon, 30 Dec 2024 17:46:21 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=TEPlt6v4; spf=pass (imf06.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=ryncsn@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=1735580760; h=from:from:sender:reply-to: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=Idy65dfr5WN3najE9anQu5aYPiPB7lVQ4jR/dYnd8YQ=; b=JvtJUOFv87WPQuStiEKAWKnIPmrBnbZwOpN96NQ+jlceYF63rX29aqSvEgIaI6VrRUJQUA QfPvfNmcgklswNqu+fxcVEgG8BHQdBy0aw8IpWc09mHyJmH1uZ7bXERT9YrtsmE6LRl/sk Ftt/2hfkQGeYtetX67U4seHNiKh/npQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735580760; a=rsa-sha256; cv=none; b=nsUdEFW7XfKNGcn6VVQwsaTE1yJprhkc9MwCXCC1tzN5ENmXmftK1RedCJeqDNvj7q6VNE srU4NyqP1qjY7il9DiMt5fUYUPN7xQwGBJD8pQlDBImxf+piQbx1H2DQhi6yiq1OHD7ikG gJsV0MCBBiuxsXGEG14WH1BDbqqF4+E= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=TEPlt6v4; spf=pass (imf06.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2f42992f608so9860737a91.0 for ; Mon, 30 Dec 2024 09:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735580813; x=1736185613; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Idy65dfr5WN3najE9anQu5aYPiPB7lVQ4jR/dYnd8YQ=; b=TEPlt6v44qBu8WgzU3XhfqEQRzCJMJL4ZUHSll6A1VG3erW0ZmDp4VHvK9sdc6fTgb MexW+vVp4ApAHg9e27rahj7+D+kuldjKiZRjbd+FsHeGPKu5/vMlfSts+2cm93UoPAF9 9BBR9vaozw+Wc7EBb17HgfphiLWdPsAWVQQk3aLLOffS6yPWHDtDbtSU8aNTWKBJycSG C+CqAYUNp3810vSZQHcO0MTfEGa0TQRPMWYevWnOlCUjG2tE4XEFk6QKAm2bmUVL6//P eSs+Aao0q+r9yHFDYcEhoUOl5cL+xnWjsEXnrl15GNDWZ3OqZ3jT0MyEBBS03rHJH/Zd 4ltQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735580813; x=1736185613; h=content-transfer-encoding:mime-version:reply-to: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=Idy65dfr5WN3najE9anQu5aYPiPB7lVQ4jR/dYnd8YQ=; b=MAcBI9OEaYO+83pXN0dRr4NpnYr3e4x1cQA2tEby5U72exkRys1zRzIuY5Hep9hX2z 7TXauWmg2+MQE7zhBbpPPhEbQGwRm0TRVYWj4cm65+Rvlzr8eOU8z1vkpQP8/A1O5U0L wzculmsu+R/swjQ8brmcyLZvOY/1oOzFWFzrKGJOKfgneFF1J3b64cI59tbY1acEuEdO u5CY6/ga2wloigdZ3hlthK+GPU+k7AHvNMtk2K2u17atUV4vN+96HoiKSPLv4/TtYN3E NOETbddryUloxteljByQOz2C0K8Z/akYHVfy8r4Ue1O8ptN5/E07FfTwMQfH7yUjet+3 x2Zg== X-Gm-Message-State: AOJu0YwVSeDvx3rMn2quBYxgrvzc5VCeTl+vo02X4rnykj4JngBW6TUf ILy/aUJk1Q6cx50NvMbiX1oMHc34khfgD4PJfntArYFNBJ5aj4KJYxPK3V3Loap/0A== X-Gm-Gg: ASbGncvShz8BQ+Ztay9Jrl8Pc2WxalmDSwDnczlI7rXovh6VYIjAEPRLS/LPqS5izQR mvchyK3qZzJ1b5BnI49wKRPDrRIbncH3nkU3ZApJ2dsZoPC19ywH8hoMMm1QIWJ0x+M+kJgvmmy MCSBLEXTyYTGwQ+WM9uoIAjS8zgjLYE2ROtSZejn1SQ1FgHf94Ldfzh9409j53a5gDJLvE4hKfW ExntP3YGwDehGt5iUXRnvIL7TOKHf7WzMen93ikV2YpAggZvIOv+eZLnjEq0g2so0zQ4HiRIFWI X-Google-Smtp-Source: AGHT+IEQMORLmqDUOV9cIFC9JLDz+Se8etjGzr6PUsuS8hxQ6iulv6lXBZdEsO+Isww9JZz3ariPsQ== X-Received: by 2002:a17:90b:538e:b0:2ee:f80c:6884 with SMTP id 98e67ed59e1d1-2f452eed77emr55167864a91.33.1735580813257; Mon, 30 Dec 2024 09:46:53 -0800 (PST) Received: from KASONG-MC4.tencent.com ([1.203.117.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9cdf25sm180687695ad.118.2024.12.30.09.46.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 Dec 2024 09:46:52 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Ryan Roberts , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3 05/13] mm, swap: clean up device availability check Date: Tue, 31 Dec 2024 01:46:13 +0800 Message-ID: <20241230174621.61185-6-ryncsn@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241230174621.61185-1-ryncsn@gmail.com> References: <20241230174621.61185-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 04D42180004 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: gxnuqtpwn4nz1ccojh6eai6dbg3rkydn X-HE-Tag: 1735580781-259222 X-HE-Meta: U2FsdGVkX1/7BKQ31GT5Rx5p6SvuWq4WMhjqFCxnqZhm0MB/RQis9/oB7OSPUPWhg2LE1cm1+dGJr/u4d5yBMaNtCKuFV14VQ6SOulw6tXWNgC3EYMJHvAD69iQdPik8dwpSBt1ow5FdGTJ6XRszlzRZ3z5P3/wWCIRTuek603r5l1BO9EQOys4u4fXFYT91r6cCA3qCvmGYCCFpepYdCqUBqOnGzKFVMRD43Dq0NIuBMAFF8svZxFChMrJyLDBnB80UwCVibILeL40jQ0mor4cm1fFgULWK/RmBZFs/l0bU7pcPlkrTpDqBFgAeYcOsxd35+cqhKB7GNVwiwOUtzFE5POSKSXW6YnCwlGbPani7fFg0vqBsaPJBKp0gQHyyGIvgXgygtvGvnHYRON4vg7zDIzosl3UZw7nNGZu5Y+5rNPS522xNfDAi5NI2pvUDcTBrZ6Lz1iX4bfL9uLi6WEroM8o3OOYIF/uSaPFLfTjUginwH8m6wHGOoWTDsB7YF47IXiiSm2pl+TAArRNfkJyCC1/Q7lg6xT3OLlHB8ly0UzWE1qItsW2L28PleFT32NiqtKwUDQeKrKcWFNmC3DJ/UBTtUKssxcy1nLr9cI+U7NyWwVUnTNEdziSSf3WOIf7sOoj3MNew+nruZHS+idT2RV6pyLel0QdMEvP8zvSzkmxnvrwFGlc/rqng9u/lNJeJ0s4yMOSzVD2CR25GTTvfleIz6ujd18wOPGCRAmBKi/lZgTxTKehYw8SKsf3E1/DGDY60q6bCUkMD8uleAZc2jD9Z4q1jvGJdyznLOA+q+hmuGfeEuASt9Qs1M5xbvTmrHSwQjZCtawagROnKcT005Gu8bpKgYAtgdmwUYwDDHPfVVXvmKmwmZ5QCR6+R7SHaODT1eP/JZH+pNN3NE5vZlNQiQbn2ZvtnnnGTy4uhss9rb8kWB/CnftnYIGn3OmtEoEEnsNX39VNPtzT 7kQI2W2y 4cZ4/AyBq5STB9f87LY0zivLtwtDtojo/OBvtJTYEroLd6g3O3jR9oxgFmb7iEUQmVqoLeIE1+uN/Lfs7Vd0lx9W0ViQDnV4smK3vv3LkXoHsSHBa/QQ1ijDypzbuoDM53+7lDqe01VPnGQacDkSqfy4fSAgiWyEy7+JKINgFXRX+mtEFVGZFkYW5+DRi+rZppwbWXaaqvLNPzN+NT8qTHc2i4thv/UbdHvIAyQYhd/kkpyysSg4cNJ4K00Rh9xIprW/cuHAnn+orN+P6rZKIBmL4y7eRT7fPu4Ief6tLLGJVlgmi6Hp6XvtjLB49UVJFhl3IPHOtnRTAEX8n6HodbVYtGhGaUwxHYiGJJLIUpSadC43TaE6bH8QcPet/awTS0lgGwsnipd2fXS9P+gaFF61X/tqAJkPkz6CzSx7VyWql8I78QItrx203xPMH0/vVJLlToKw2VcLRmmeX95TfK3bEhZSZXEwM0deB8DNddf9lCJA4MxtY8qfsTDTd3FigWcqcQf0A9FqGKhDbWZy+0eKjZA== 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: From: Kairui Song Remove highest_bit and lowest_bit. After the HDD allocation path has been removed, the only purpose of these two fields is to determine whether the device is full or not, which can instead be determined by checking the inuse_pages. Signed-off-by: Kairui Song --- fs/btrfs/inode.c | 1 - fs/f2fs/data.c | 1 - fs/iomap/swapfile.c | 1 - include/linux/swap.h | 2 -- mm/page_io.c | 1 - mm/swapfile.c | 38 ++++++++------------------------------ 6 files changed, 8 insertions(+), 36 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 488edca8333a..a1ba78afab2c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10044,7 +10044,6 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file, *span = bsi.highest_ppage - bsi.lowest_ppage + 1; sis->max = bsi.nr_pages; sis->pages = bsi.nr_pages - 1; - sis->highest_bit = bsi.nr_pages - 1; return bsi.nr_extents; } #else diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index a2478c2afb3a..a9eddd782dbc 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -4043,7 +4043,6 @@ static int check_swap_activate(struct swap_info_struct *sis, cur_lblock = 1; /* force Empty message */ sis->max = cur_lblock; sis->pages = cur_lblock - 1; - sis->highest_bit = cur_lblock - 1; out: if (not_aligned) f2fs_warn(sbi, "Swapfile (%u) is not align to section: 1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate(%lu * N)", diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c index 5fc0ac36dee3..b90d0eda9e51 100644 --- a/fs/iomap/swapfile.c +++ b/fs/iomap/swapfile.c @@ -189,7 +189,6 @@ int iomap_swapfile_activate(struct swap_info_struct *sis, *pagespan = 1 + isi.highest_ppage - isi.lowest_ppage; sis->max = isi.nr_pages; sis->pages = isi.nr_pages - 1; - sis->highest_bit = isi.nr_pages - 1; return isi.nr_extents; } EXPORT_SYMBOL_GPL(iomap_swapfile_activate); diff --git a/include/linux/swap.h b/include/linux/swap.h index 0c681aa5cb98..0c222017b5c6 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -306,8 +306,6 @@ struct swap_info_struct { struct list_head frag_clusters[SWAP_NR_ORDERS]; /* list of cluster that are fragmented or contented */ unsigned int frag_cluster_nr[SWAP_NR_ORDERS]; - unsigned int lowest_bit; /* index of first free in swap_map */ - unsigned int highest_bit; /* index of last free in swap_map */ unsigned int pages; /* total of usable pages of swap */ unsigned int inuse_pages; /* number of those currently in use */ struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap location */ diff --git a/mm/page_io.c b/mm/page_io.c index 4b4ea8e49cf6..9b983de351f9 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -163,7 +163,6 @@ int generic_swapfile_activate(struct swap_info_struct *sis, page_no = 1; /* force Empty message */ sis->max = page_no; sis->pages = page_no - 1; - sis->highest_bit = page_no - 1; out: return ret; bad_bmap: diff --git a/mm/swapfile.c b/mm/swapfile.c index d0e5b9fa0c48..7963a0c646a4 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -55,7 +55,7 @@ static bool swap_count_continued(struct swap_info_struct *, pgoff_t, static void free_swap_count_continuations(struct swap_info_struct *); static void swap_entry_range_free(struct swap_info_struct *si, swp_entry_t entry, unsigned int nr_pages); -static void swap_range_alloc(struct swap_info_struct *si, unsigned long offset, +static void swap_range_alloc(struct swap_info_struct *si, unsigned int nr_entries); static bool folio_swapcache_freeable(struct folio *folio); static struct swap_cluster_info *lock_cluster(struct swap_info_struct *si, @@ -650,7 +650,7 @@ static bool cluster_alloc_range(struct swap_info_struct *si, struct swap_cluster } memset(si->swap_map + start, usage, nr_pages); - swap_range_alloc(si, start, nr_pages); + swap_range_alloc(si, nr_pages); ci->count += nr_pages; if (ci->count == SWAPFILE_CLUSTER) { @@ -888,19 +888,11 @@ static void del_from_avail_list(struct swap_info_struct *si) spin_unlock(&swap_avail_lock); } -static void swap_range_alloc(struct swap_info_struct *si, unsigned long offset, +static void swap_range_alloc(struct swap_info_struct *si, unsigned int nr_entries) { - unsigned int end = offset + nr_entries - 1; - - if (offset == si->lowest_bit) - si->lowest_bit += nr_entries; - if (end == si->highest_bit) - WRITE_ONCE(si->highest_bit, si->highest_bit - nr_entries); WRITE_ONCE(si->inuse_pages, si->inuse_pages + nr_entries); if (si->inuse_pages == si->pages) { - si->lowest_bit = si->max; - si->highest_bit = 0; del_from_avail_list(si); if (si->cluster_info && vm_swap_full()) @@ -933,15 +925,8 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset, for (i = 0; i < nr_entries; i++) clear_bit(offset + i, si->zeromap); - if (offset < si->lowest_bit) - si->lowest_bit = offset; - if (end > si->highest_bit) { - bool was_full = !si->highest_bit; - - WRITE_ONCE(si->highest_bit, end); - if (was_full && (si->flags & SWP_WRITEOK)) - add_to_avail_list(si); - } + if (si->inuse_pages == si->pages) + add_to_avail_list(si); if (si->flags & SWP_BLKDEV) swap_slot_free_notify = si->bdev->bd_disk->fops->swap_slot_free_notify; @@ -1051,15 +1036,12 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_order) plist_requeue(&si->avail_lists[node], &swap_avail_heads[node]); spin_unlock(&swap_avail_lock); spin_lock(&si->lock); - if (!si->highest_bit || !(si->flags & SWP_WRITEOK)) { + if ((si->inuse_pages == si->pages) || !(si->flags & SWP_WRITEOK)) { spin_lock(&swap_avail_lock); if (plist_node_empty(&si->avail_lists[node])) { spin_unlock(&si->lock); goto nextsi; } - WARN(!si->highest_bit, - "swap_info %d in list but !highest_bit\n", - si->type); WARN(!(si->flags & SWP_WRITEOK), "swap_info %d in list but !SWP_WRITEOK\n", si->type); @@ -2441,8 +2423,8 @@ static void _enable_swap_info(struct swap_info_struct *si) */ plist_add(&si->list, &swap_active_head); - /* add to available list iff swap device is not full */ - if (si->highest_bit) + /* add to available list if swap device is not full */ + if (si->inuse_pages < si->pages) add_to_avail_list(si); } @@ -2606,7 +2588,6 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) drain_mmlist(); /* wait for anyone still in scan_swap_map_slots */ - p->highest_bit = 0; /* cuts scans short */ while (p->flags >= SWP_SCANNING) { spin_unlock(&p->lock); spin_unlock(&swap_lock); @@ -2941,8 +2922,6 @@ static unsigned long read_swap_header(struct swap_info_struct *si, return 0; } - si->lowest_bit = 1; - maxpages = swapfile_maximum_size; last_page = swap_header->info.last_page; if (!last_page) { @@ -2959,7 +2938,6 @@ static unsigned long read_swap_header(struct swap_info_struct *si, if ((unsigned int)maxpages == 0) maxpages = UINT_MAX; } - si->highest_bit = maxpages - 1; if (!maxpages) return 0; -- 2.47.1