From patchwork Tue Oct 17 16:13:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13425597 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 E6DB5C41513 for ; Tue, 17 Oct 2023 16:13:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DF9480041; Tue, 17 Oct 2023 12:13:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 640BE8003F; Tue, 17 Oct 2023 12:13:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 494FB80041; Tue, 17 Oct 2023 12:13:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 394408003F for ; Tue, 17 Oct 2023 12:13:19 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0E4911A0DA7 for ; Tue, 17 Oct 2023 16:13:19 +0000 (UTC) X-FDA: 81355448118.22.C45D29D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 32C5C1C0004 for ; Tue, 17 Oct 2023 16:13:16 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697559197; 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; bh=T5B/w9PjZ4Jbft8qP7poeYP5gkQ7OZY5K0bvKoQXXpg=; b=pXul8l7UZffRvNurIGe9u0s3SSjmFP3LTdaHsDnKvXjABIqUWQ9G4wUvj2CQmr1FP3cYhT pGTtKEQAeCnbtFzwyMD8voHxpyo0dH/FcIIeL/snNoyMKuReXHfVi5RL4rh1WDDU4Vb4+t qH0bI7gJIXJSKPlgfYtT9d+xaZMipAk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697559197; a=rsa-sha256; cv=none; b=kexG35goFlGeWnxCV+hl4XsgwHcfpS7PSrkwn3mIkpNLdBWoiXcG9TxfRkQjjyY8hHB+gi wgvSkvo/dTjZPTnVBTuAWjM+xOn5unQvp8M59l6JsEqSfRq19F71+kQN2O7t9DaPaW8bgc nbLVmVCHFvGEQAmn1+aR1OLHq5ezxos= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E32661007; Tue, 17 Oct 2023 09:13:56 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BBAEF3F762; Tue, 17 Oct 2023 09:13:14 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , David Hildenbrand , Matthew Wilcox , Huang Ying , Gao Xiang , Yu Zhao , Yang Shi , Michal Hocko , Kefeng Wang Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 1/2] mm: swap: Remove CLUSTER_FLAG_HUGE from swap_cluster_info:flags Date: Tue, 17 Oct 2023 17:13:01 +0100 Message-Id: <20231017161302.2518826-2-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231017161302.2518826-1-ryan.roberts@arm.com> References: <20231017161302.2518826-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Stat-Signature: wiuzxx5njggb61fjogxg61cswyo95hdf X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 32C5C1C0004 X-Rspam-User: X-HE-Tag: 1697559196-657689 X-HE-Meta: U2FsdGVkX1/VQagGzvPYhn9Oh02KT7f511kvTlkVSjUjUcHeQ/Gp/niSQSUJdnDl1y1TRLDBmCsHWkbFaOHcnYa8NHcr0UEbzLnoR3j4y2uTnz2lLx+XJ+Jkzjq/Yeukx21fipayw/qBbo+RObsiI7CI4hnuQ5Xi7tEWg13qwi8uMHVDrJDbF9VePpSTLTkvZm2EztjvcCyvOHFwJ3XA3SO/jSRMfLEVP8yzt+NtqiI0MHVRqGamnnu/Ppzv0pf21DhVtPFUcwLfQ2CHZgTndgu5LTblmofGeN6B90pJpjAI0uCDw2QJwA1HQe+NoPpcHU8fgR/+mFH2ZtZnxhTLpAgM0MB93fQDDlQzpqkgqipW0/lXGlhB4BfOazhBVpxXSENd/HBg2KqhECLsfR9M2RnqmVs2rcHDtqpPP1I3nHgSCPI3ZrXVMBvXEP7rvoA5hJC4lpigM7Wk/k4waOZVr3rRFi17I2YqSKXYh2wu9WJ/NiDU6VlGBE+jnMdEX78V7tzkAAtWSYNhvKtkTZKNR8sRjH4y4QnBKm3PDDq5kF+k8b0m2wAB2zCajwyUSDVtwqFCokbqjoNkbvUFwgFdUWOllcqYr44mkhEmv/Inwd3DmybORIZtDW0YPAk/AI8l7VnAt5H2Td6UgHg7uRbwLXB1UkoY7nTftlFPM21GusfPviWyk1KQsLcpAU59llzdrwmSfeXaS0Ss5STaG4Xvp1471IXVz2sslSR6y5ZqDvYQMHowTUYgjpB73twJ80t7YxoPSorXI5z2xfTHgwsp1F4zAYLsVSE0c3c61/2GrWsjwE+NzUMOv8qEREVCpmwTvXrdL3ok95jGTU4rlA/xyldxg9ncBDrtd5c0WXsJzCBJ7uCzoppZkPCREZaAbyVhAEZaZ7YLdTn6XP1ntxcuQowbhJLH3JoNy56Pe2oJdfl1S4l8h9z7F6+F4YceNiSCToOSWfnS5i2HYy1uCOq paxrpN9G QqsQEPnstWW7yzR301iqEQ/lY4Q79vq2bm9yK+XqeqKgQX67USxRbEaSNx4FkrCuP2Ll9TvGxQjZnhR+bN/ZaL58+2pl8vRCdzVz12EvOAYLM3WZ+fLs8Li0lQh+YEhHOLMC/VTs+GYSlA4TUS81Bs68APBHnRZOztWb8lxhHuCjFHI8lhi75u16b9iAId3vsx1cUcXZxsqInmXU= 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: As preparation for supporting small-sized THP in the swap-out path, without first needing to split to order-0, Remove the CLUSTER_FLAG_HUGE, which, when present, always implies PMD-sized THP, which is the same as the cluster size. The only use of the flag was to determine whether a swap entry refers to a single page or a PMD-sized THP in swap_page_trans_huge_swapped(). Instead of relying on the flag, we now pass in nr_pages, which originates from the folio's number of pages. This allows the logic to work for folios of any order. The one snag is that one of the swap_page_trans_huge_swapped() call sites does not have the folio. But it was only being called there to avoid bothering to call __try_to_reclaim_swap() in some cases. __try_to_reclaim_swap() gets the folio and (via some other functions) calls swap_page_trans_huge_swapped(). So I've removed the problematic call site and believe the new logic should be equivalent. Removing CLUSTER_FLAG_HUGE also means we can remove split_swap_cluster() which used to be called during folio splitting, since split_swap_cluster()'s only job was to remove the flag. Signed-off-by: Ryan Roberts --- include/linux/swap.h | 10 ---------- mm/huge_memory.c | 3 --- mm/swapfile.c | 47 ++++++++------------------------------------ 3 files changed, 8 insertions(+), 52 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 19f30a29e1f1..a073366a227c 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -259,7 +259,6 @@ struct swap_cluster_info { }; #define CLUSTER_FLAG_FREE 1 /* This cluster is free */ #define CLUSTER_FLAG_NEXT_NULL 2 /* This cluster has no next cluster */ -#define CLUSTER_FLAG_HUGE 4 /* This cluster is backing a transparent huge page */ /* * We assign a cluster to each CPU, so each CPU can allocate swap entry from @@ -595,15 +594,6 @@ static inline int add_swap_extent(struct swap_info_struct *sis, } #endif /* CONFIG_SWAP */ -#ifdef CONFIG_THP_SWAP -extern int split_swap_cluster(swp_entry_t entry); -#else -static inline int split_swap_cluster(swp_entry_t entry) -{ - return 0; -} -#endif - #ifdef CONFIG_MEMCG static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) { diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c9cbcbf6697e..46b3fb943207 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2597,9 +2597,6 @@ static void __split_huge_page(struct page *page, struct list_head *list, shmem_uncharge(head->mapping->host, nr_dropped); remap_page(folio, nr); - if (folio_test_swapcache(folio)) - split_swap_cluster(folio->swap); - for (i = 0; i < nr; i++) { struct page *subpage = head + i; if (subpage == page) diff --git a/mm/swapfile.c b/mm/swapfile.c index e52f486834eb..b83ad77e04c0 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -342,18 +342,6 @@ static inline void cluster_set_null(struct swap_cluster_info *info) info->data = 0; } -static inline bool cluster_is_huge(struct swap_cluster_info *info) -{ - if (IS_ENABLED(CONFIG_THP_SWAP)) - return info->flags & CLUSTER_FLAG_HUGE; - return false; -} - -static inline void cluster_clear_huge(struct swap_cluster_info *info) -{ - info->flags &= ~CLUSTER_FLAG_HUGE; -} - static inline struct swap_cluster_info *lock_cluster(struct swap_info_struct *si, unsigned long offset) { @@ -1021,7 +1009,7 @@ static int swap_alloc_cluster(struct swap_info_struct *si, swp_entry_t *slot) offset = idx * SWAPFILE_CLUSTER; ci = lock_cluster(si, offset); alloc_cluster(si, idx); - cluster_set_count_flag(ci, SWAPFILE_CLUSTER, CLUSTER_FLAG_HUGE); + cluster_set_count(ci, SWAPFILE_CLUSTER); memset(si->swap_map + offset, SWAP_HAS_CACHE, SWAPFILE_CLUSTER); unlock_cluster(ci); @@ -1354,7 +1342,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) ci = lock_cluster_or_swap_info(si, offset); if (size == SWAPFILE_CLUSTER) { - VM_BUG_ON(!cluster_is_huge(ci)); map = si->swap_map + offset; for (i = 0; i < SWAPFILE_CLUSTER; i++) { val = map[i]; @@ -1362,7 +1349,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) if (val == SWAP_HAS_CACHE) free_entries++; } - cluster_clear_huge(ci); if (free_entries == SWAPFILE_CLUSTER) { unlock_cluster_or_swap_info(si, ci); spin_lock(&si->lock); @@ -1384,23 +1370,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) unlock_cluster_or_swap_info(si, ci); } -#ifdef CONFIG_THP_SWAP -int split_swap_cluster(swp_entry_t entry) -{ - struct swap_info_struct *si; - struct swap_cluster_info *ci; - unsigned long offset = swp_offset(entry); - - si = _swap_info_get(entry); - if (!si) - return -EBUSY; - ci = lock_cluster(si, offset); - cluster_clear_huge(ci); - unlock_cluster(ci); - return 0; -} -#endif - static int swp_entry_cmp(const void *ent1, const void *ent2) { const swp_entry_t *e1 = ent1, *e2 = ent2; @@ -1508,22 +1477,23 @@ int swp_swapcount(swp_entry_t entry) } static bool swap_page_trans_huge_swapped(struct swap_info_struct *si, - swp_entry_t entry) + swp_entry_t entry, + unsigned int nr_pages) { struct swap_cluster_info *ci; unsigned char *map = si->swap_map; unsigned long roffset = swp_offset(entry); - unsigned long offset = round_down(roffset, SWAPFILE_CLUSTER); + unsigned long offset = round_down(roffset, nr_pages); int i; bool ret = false; ci = lock_cluster_or_swap_info(si, offset); - if (!ci || !cluster_is_huge(ci)) { + if (!ci || nr_pages == 1) { if (swap_count(map[roffset])) ret = true; goto unlock_out; } - for (i = 0; i < SWAPFILE_CLUSTER; i++) { + for (i = 0; i < nr_pages; i++) { if (swap_count(map[offset + i])) { ret = true; break; @@ -1545,7 +1515,7 @@ static bool folio_swapped(struct folio *folio) if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio))) return swap_swapcount(si, entry) != 0; - return swap_page_trans_huge_swapped(si, entry); + return swap_page_trans_huge_swapped(si, entry, folio_nr_pages(folio)); } /** @@ -1606,8 +1576,7 @@ int free_swap_and_cache(swp_entry_t entry) p = _swap_info_get(entry); if (p) { count = __swap_entry_free(p, entry); - if (count == SWAP_HAS_CACHE && - !swap_page_trans_huge_swapped(p, entry)) + if (count == SWAP_HAS_CACHE) __try_to_reclaim_swap(p, swp_offset(entry), TTRS_UNMAPPED | TTRS_FULL); }