From patchwork Fri Mar 22 08:36:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 13599738 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 19241C47DD9 for ; Fri, 22 Mar 2024 08:35:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B99D76B00A3; Fri, 22 Mar 2024 04:35:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B1D196B00A4; Fri, 22 Mar 2024 04:35:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 973146B00A5; Fri, 22 Mar 2024 04:35:06 -0400 (EDT) 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 773846B00A3 for ; Fri, 22 Mar 2024 04:35:06 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5763F81169 for ; Fri, 22 Mar 2024 08:35:06 +0000 (UTC) X-FDA: 81924015012.01.92BD4B9 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id AD84D2000A for ; Fri, 22 Mar 2024 08:35:04 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=FE8y6dUc; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711096504; 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=t4pGU2VEOwJh7Fxc7TNUW0udYTZDkgymt74V8DAfons=; b=BG/z6b3hw/oYAkDESADolaJvmyZnkmHg8IKZQsZxClASAtpbBVnWvlAinDBFUqKklcjyu1 P3NODfEHws4odLcDBwhayWHni4g+vbZr7MKqfGJPd3WQiC6Drw8MPdcOgruAsoqcGjRuoh svDiVnrR9h5fM8x0s+vosw5CeV2XnBk= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=FE8y6dUc; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711096504; a=rsa-sha256; cv=none; b=3XVB+YqEF9Irm6KP52IufMrmAy+wkTKYXQEFFvLT/EwbkSkwhpoPtEwp2LcbKjhUWytQ+9 ClZz8PacwuUhE4nTEV7AQHDv/a/Jgq+oS7Q7hzdG8NUtIPGR45RlBS4gMX8aCGWT3oZ7pY 600MDjVwuhO3Oft6LeLEFLZjkZ218ts= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id EB79E61407; Fri, 22 Mar 2024 08:35:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41FC4C43394; Fri, 22 Mar 2024 08:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711096503; bh=OQPoYyqG65JjgdV3GI4xIDPu6WE8F7QAfq111enlmHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FE8y6dUcnrwOvrjSqoZfUtGIkZA9NFddagJQg6rqBl50cP0LbOnPqZl8yV67gnyTr CFOsvYS3sekAjUnGaaf0UU8qaCwx5LZ6HR6A6vvSP8n7woojxWf/BiKg1RE14V0Dce k4NXLyenhP5ztZR71GJT6r+C2lQHpcVhLTmFJJY/fJ0KPu/LppQFfMKVvbxn45dkrr x21PByGcOiNgNiAjSexMAi2rleYLB9pwrCeyHivrhu35RHCgTV8k1DfTHAXX9ZptS5 YoChjPk4azvx5NCK/oZ9D1PR8YvKzDxNO4zgknce8OgmStaqwRit+uUyhOHMaubTG6 Myo3Bak3dkwwg== From: alexs@kernel.org To: Matthew Wilcox , Andrea Arcangeli , Izik Eidus , david@redhat.com, Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: "Alex Shi (tencent)" , Hugh Dickins , Chris Wright Subject: [PATCH v2 11/14] mm/ksm: remove get_ksm_page and related info Date: Fri, 22 Mar 2024 16:36:58 +0800 Message-ID: <20240322083703.232364-12-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322083703.232364-1-alexs@kernel.org> References: <20240322083703.232364-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: AD84D2000A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 8qf48fjiyhqihihdcncr37u71r4arhuw X-HE-Tag: 1711096504-333489 X-HE-Meta: U2FsdGVkX19hJHQHsavV1Uz/QXLqpVlKsHsKuh2Vye8uqLZgvyuwZcVfi6sAJ/H+CRGElE2BapvJpoD0LPD8QeFrIUyf8SanKE5gshgIjznlG2UtCVUJCvZsL4X0kH3zR+t+ImPgIO93SP7i4RI7f7l4ceVNR41AoYlNmAIxQmwOeLPaPUNLUvG7XiZdYS0diG9PX8yxy/35PoQsTEK0iWnWoMBnewEGZJsU0IaM8iXiPTSXZkqN8FdPFLuUfUXmu7PtkMIAsMzC3lFJrLunOHoh+pt7oNzQedIDGzWfpABSAWH657xPxfm7rIYMP4ll+jvfvJcmOL8CW+zuJQ9Iskrh3ZvVOn+EIWERHVpKVVHcFEJFJGtmozbTXkadbIxFKIrt1aQ41ajSh4i5sRMrEic+tS7pwgek4LXcmIOMq2hneQ6T1NKO4z/wTo1eOM3URrBR0Ho/nOr2BWdFkFMw1/UwTM4YNBw0+4leZ1j3DldSArtjo92Wf5M1FfgCdmQe3ldGfRlCzxP3TlLTO77HMgpSDRGimHS1k6TkAEkEb6tx9miaq3M6PbAncuEUOSGSxXX8eIzPOvvAj/tukQmNne98H5uFiajuf0iq5jweZ8aKxaNDnjzva8qT4W2E00CB/68XzxTSI6d/ovHZyyIy3o3QdeqPbjez8Sd4ZLiOzbqCL2TyFF2Un3TKWr4g5hJAoV6Gannc5S75oExwmOUHqHDYWMXXKy8awfJwuPvPecaKo78vWIyg9CsWRvaAjxgehyczlsOXBwlASkRq+b2LGl5p0acLZPexzXhlxmpg25HE9sywjUvpxrgKKIruo9UvHZgqkNmZfrj/x0XcCi8GxYlQL/lH1xbzU900xDNAWG7vUnVc3mMzVlZlIt5FH9GQQrSOZVyvKdFovUvbC7dGitODwUSk6b84vtt3wjYikNn8AkPtquNrRJAo7jxyVq5pHvNg3/yAlPFIf4BM55U QnxA8Q4C 1WywM/5PiO0mRWtOxqmOU/02hTxR3MR4//16T2eMPCF3g0IBYVqTWzj+bj9k6nkuDooQac14/iq31iBJ5UXxcXrxsGfpe/g08/YIigNI7a1PqI4DDpvEpPC6KzxgpLDDl4KZqG34rHldyZWu5B5Kwk0un+dVUeKdksDSWxNyS+4O5sTdd/vjZ6ERzWDTFFbEK2wN25hV+M8TtkAQuPb0O1wmVT1okX8W45bGL1C5LroDgPQ4DrHBB46Ae0rgCO0GHnXp1sbtuK+u6qXrid2754nKr2Q3eYtAm0jznDie0YM6+4sJF4VtxcD3KKO9ukXHJUedjH0TvA5A16F0avkVWxKcOVleNcPQ3OPFFicawQnZ5yIBdYGyvc7po8UEEIp7sUF0NXohzidzmunOj+WAbD5JH75cCSYfDUy0TwvWjJ9+ylw+SSdKnt8MyPZSVcR+0b/j9udzKEuOzCK4W23I4ICR7pgpUyxMPCYNxob+uQ3nqH0H2miZzt1EwRn9mKDcrFgd9 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: "Alex Shi (tencent)" Now since all caller are changed to ksm_get_folio, let's sync up the related usages with ksm_get_folio, and remove get_ksm_page. Signed-off-by: Alex Shi (tencent) Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright --- mm/ksm.c | 34 +++++++++++++--------------------- mm/migrate.c | 2 +- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 0692bede5ca6..afcf26510669 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -890,14 +890,14 @@ static void remove_node_from_stable_tree(struct ksm_stable_node *stable_node) free_stable_node(stable_node); } -enum get_ksm_page_flags { +enum ksm_get_folio_flags { GET_KSM_PAGE_NOLOCK, GET_KSM_PAGE_LOCK, GET_KSM_PAGE_TRYLOCK }; /* - * get_ksm_page: checks if the page indicated by the stable node + * ksm_get_folio: checks if the page indicated by the stable node * is still its ksm page, despite having held no reference to it. * In which case we can trust the content of the page, and it * returns the gotten page; but if the page has now been zapped, @@ -916,7 +916,7 @@ enum get_ksm_page_flags { * is on its way to being freed; but it is an anomaly to bear in mind. */ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node, - enum get_ksm_page_flags flags) + enum ksm_get_folio_flags flags) { struct folio *folio; void *expected_mapping; @@ -990,14 +990,6 @@ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node, return NULL; } -static struct page *get_ksm_page(struct ksm_stable_node *stable_node, - enum get_ksm_page_flags flags) -{ - struct folio *folio = ksm_get_folio(stable_node, flags); - - return &folio->page; -} - /* * Removing rmap_item from stable or unstable tree. * This function will clean the information from the stable/unstable tree. @@ -1127,7 +1119,7 @@ static int remove_stable_node(struct ksm_stable_node *stable_node) folio = ksm_get_folio(stable_node, GET_KSM_PAGE_LOCK); if (!folio) { /* - * get_ksm_page did remove_node_from_stable_tree itself. + * ksm_get_folio did remove_node_from_stable_tree itself. */ return 0; } @@ -1140,7 +1132,7 @@ static int remove_stable_node(struct ksm_stable_node *stable_node) err = -EBUSY; if (!folio_mapped(folio)) { /* - * The stable node did not yet appear stale to get_ksm_page(), + * The stable node did not yet appear stale to ksm_get_folio(), * since that allows for an unmapped ksm folio to be recognized * right up until it is freed; but the node is safe to remove. * This folio might be in an LRU cache waiting to be freed, @@ -1657,7 +1649,7 @@ static void *stable_node_dup(struct ksm_stable_node **_stable_node_dup, * We must walk all stable_node_dup to prune the stale * stable nodes during lookup. * - * get_ksm_page can drop the nodes from the + * ksm_get_folio can drop the nodes from the * stable_node->hlist if they point to freed pages * (that's why we do a _safe walk). The "dup" * stable_node parameter itself will be freed from @@ -1764,7 +1756,7 @@ static struct ksm_stable_node *stable_node_dup_any(struct ksm_stable_node *stabl } /* - * Like for get_ksm_page, this function can free the *_stable_node and + * Like for ksm_get_folio, this function can free the *_stable_node and * *_stable_node_dup if the returned tree_page is NULL. * * It can also free and overwrite *_stable_node with the found @@ -1786,7 +1778,7 @@ static void *__stable_node_chain(struct ksm_stable_node **_stable_node_dup, if (!is_stable_node_chain(stable_node)) { if (is_page_sharing_candidate(stable_node)) { *_stable_node_dup = stable_node; - return get_ksm_page(stable_node, GET_KSM_PAGE_NOLOCK); + return ksm_get_folio(stable_node, GET_KSM_PAGE_NOLOCK); } /* * _stable_node_dup set to NULL means the stable_node @@ -1900,7 +1892,7 @@ static void *stable_tree_search(struct page *page) if (!tree_folio) { /* * If we walked over a stale stable_node, - * get_ksm_page() will call rb_erase() and it + * ksm_get_folio() will call rb_erase() and it * may rebalance the tree from under us. So * restart the search from scratch. Returning * NULL would be safe too, but we'd generate @@ -2133,7 +2125,7 @@ static struct ksm_stable_node *stable_tree_insert(struct folio *kfolio) if (!tree_folio) { /* * If we walked over a stale stable_node, - * get_ksm_page() will call rb_erase() and it + * ksm_get_folio() will call rb_erase() and it * may rebalance the tree from under us. So * restart the search from scratch. Returning * NULL would be safe too, but we'd generate @@ -3245,7 +3237,7 @@ void folio_migrate_ksm(struct folio *newfolio, struct folio *folio) /* * newfolio->mapping was set in advance; now we need smp_wmb() * to make sure that the new stable_node->kpfn is visible - * to get_ksm_page() before it can see that folio->mapping + * to ksm_get_folio() before it can see that folio->mapping * has gone stale (or that folio_test_swapcache has been cleared). */ smp_wmb(); @@ -3272,7 +3264,7 @@ static bool stable_node_dup_remove_range(struct ksm_stable_node *stable_node, if (stable_node->kpfn >= start_pfn && stable_node->kpfn < end_pfn) { /* - * Don't get_ksm_page, page has already gone: + * Don't ksm_get_folio, page has already gone: * which is why we keep kpfn instead of page* */ remove_node_from_stable_tree(stable_node); @@ -3360,7 +3352,7 @@ static int ksm_memory_callback(struct notifier_block *self, * Most of the work is done by page migration; but there might * be a few stable_nodes left over, still pointing to struct * pages which have been offlined: prune those from the tree, - * otherwise get_ksm_page() might later try to access a + * otherwise ksm_get_folio() might later try to access a * non-existent struct page. */ ksm_check_stable_tree(mn->start_pfn, diff --git a/mm/migrate.c b/mm/migrate.c index 73a052a382f1..9f0494fd902c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -616,7 +616,7 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) folio_migrate_ksm(newfolio, folio); /* * Please do not reorder this without considering how mm/ksm.c's - * get_ksm_page() depends upon ksm_migrate_page() and PageSwapCache(). + * ksm_get_folio() depends upon ksm_migrate_page() and PageSwapCache(). */ if (folio_test_swapcache(folio)) folio_clear_swapcache(folio);