Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp978886lqp; Fri, 22 Mar 2024 01:35:44 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXYmwkJLiimazxdlzoVUNEU4pkbZEI3G96PnKoQsl22bVi6Lx/OBQf9xpOcR4ALV4UZjyd4RDqg52glv3NepwR74MEXb59S1ZW3nyj3CA== X-Google-Smtp-Source: AGHT+IGd6Z1Yw39x7FQN47kAL6A3D+Kqx++AV+EG23/rgJy0c6G0BsN8bEtYsj0EizjXn2gbZ1Ar X-Received: by 2002:a17:903:191:b0:1df:fda8:e103 with SMTP id z17-20020a170903019100b001dffda8e103mr2377362plg.23.1711096544476; Fri, 22 Mar 2024 01:35:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711096544; cv=pass; d=google.com; s=arc-20160816; b=0+yk0mQ1u9lO6SDz14oCnILxobCnRiTXyRL98hLrcB2gncf+co/5uhl9A+TtT0jY3T DCRizkCGog0Lwd71FjxL73F/OYmGOvXKXfmLK1/WcU125Ire/xPti69bx3u33pR2W9Al nFDlC1e0UpXNzeI+Jvj5UiT9qikEG1/XAP3MpSdGfUPYjypeZrGVkggKq4j2ln8CmuxO CqI9ided4d8SaciDB9+isLksZk/xKMA7ZJupf+mgkdFBOqp2o7dEuLy7o001h58ZHSaL oETITeiNYjpAL237Q6QH12DbH/n34XsFrljvTtvcX9zRC7Oj5Kek4mO86EqCq0MGHVRV DMfg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=abZKdZWqgpqATcN0E2cm42vDhXwfWSfcAYNHtPBFWlg=; fh=CTFdFrbtP7Z7TCdMbqsgkrQi425Yz+qx6YS+cHHF8Sc=; b=In8EA2UdvHcS+z8NgHiKpDilmYBjfyyEaEfrp2HeUYk10mrBdnEtmXXyB3lCb0Nmyb EUk+iIYgwAlcByBQzIEfCwNxI6k3jNxqySY7Hg7egv7qVpSMse9C8PXGKhcDoJxp4+wy O7zbDYOYLjo7CPqulrhT+bCM7DaV7wpOiUEk/NXw9scqrumcO9zQv3eCEJKGbxYM8vr4 2nk4L30K1cus/VK5+jVZOLaa3lcyXN7iBUpsghULUeymJ19yU1DK/UyQSfiJe8hkow/Z /0OP1jebELSzS7kHu+ughsrvGfsw8O+NcSuNifEexAQ7dOywxidY5/nbc89PWjJR2ydK NTIQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tGS9D7Rv; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-111134-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111134-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id k10-20020a170902d58a00b001dd772f0246si1533894plh.169.2024.03.22.01.35.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 01:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-111134-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tGS9D7Rv; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-111134-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111134-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 24904282DAA for ; Fri, 22 Mar 2024 08:35:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A1C638DE6; Fri, 22 Mar 2024 08:34:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tGS9D7Rv" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42624383AD for ; Fri, 22 Mar 2024 08:34:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711096486; cv=none; b=Gj8aAINrXWg6GGuULApgePjuJEox+QIN4y/v3arKnYyYE9KaM6kAu8VRzpFQviorZBJxcyFye8JzOPqIKeuiUM2YcvQdvOghmtfUuWW0ovr97fLlkJ3KFrfJF2owesgsROnKFNgHdx4ui4i+0QG3zNKjKUa7sQK53vKIaSYyhRs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711096486; c=relaxed/simple; bh=swBWDDTfKPZfIshmO9+8+Tzqpp1exgNxKwXg3dE2124=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bvDVumDV/iFnyRHvA2LYAwgEoj+q/5/obVi5PFGVOp84QxPNNeN71dYEHBXNTboudC/5P8mCCg9aNTAzp2S0cKbLAENXdb/jq7lzWJcOEqsoRx769vPzzLnWPCvN4oWa4wpb01v9ihXT2mhVocRRqwcMpSEXtWeD4hai/DbOz9A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tGS9D7Rv; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87C74C433C7; Fri, 22 Mar 2024 08:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711096485; bh=swBWDDTfKPZfIshmO9+8+Tzqpp1exgNxKwXg3dE2124=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tGS9D7RvKPTXxnlUVQ0m7lLcLgSe2JsQ/C16nFNsWIGdx4hoVu89jKYQPZ4pVIQkm LUZdfrNIl0j5qWWmh4/GQMYf3eOKTE6mHp5fIGtBMuuvvVAP+R5SFBNQbMPnw36m3V Rf2vKsB8o3WwISyorzm7bMYUo9LsItXJR25HAL8vwOxVRpln+3DCSY0tLqkFXpRFcx xS1EuUj37mxQQVQ1p71HaIYocf9QpwNj0O7EzfE4w/5f+JtGoz5o3C1LZy8CGETqLl Bm7PkXRuP6Zq38bMbL9QYNQNM6p9vGLqBrL3lahxrNBsWhLEtglFCySXScJBlQ1LDs bCd5xTUf+YRVA== 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 05/14] mm/ksm: use folio in stable_node_dup Date: Fri, 22 Mar 2024 16:36:52 +0800 Message-ID: <20240322083703.232364-6-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Alex Shi (tencent)" Use ksm_get_folio() and save 2 compound_head calls. Signed-off-by: Alex Shi (tencent) Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright --- mm/ksm.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index b6ee2bc7646f..a1e382ecd501 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1631,14 +1631,14 @@ bool is_page_sharing_candidate(struct ksm_stable_node *stable_node) return __is_page_sharing_candidate(stable_node, 0); } -static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup, - struct ksm_stable_node **_stable_node, - struct rb_root *root, - bool prune_stale_stable_nodes) +static void *stable_node_dup(struct ksm_stable_node **_stable_node_dup, + struct ksm_stable_node **_stable_node, + struct rb_root *root, + bool prune_stale_stable_nodes) { struct ksm_stable_node *dup, *found = NULL, *stable_node = *_stable_node; struct hlist_node *hlist_safe; - struct page *_tree_page, *tree_page = NULL; + struct folio *folio, *tree_folio = NULL; int nr = 0; int found_rmap_hlist_len; @@ -1663,18 +1663,18 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup, * stable_node parameter itself will be freed from * under us if it returns NULL. */ - _tree_page = get_ksm_page(dup, GET_KSM_PAGE_NOLOCK); - if (!_tree_page) + folio = ksm_get_folio(dup, GET_KSM_PAGE_NOLOCK); + if (!folio) continue; nr += 1; if (is_page_sharing_candidate(dup)) { if (!found || dup->rmap_hlist_len > found_rmap_hlist_len) { if (found) - put_page(tree_page); + folio_put(tree_folio); found = dup; found_rmap_hlist_len = found->rmap_hlist_len; - tree_page = _tree_page; + tree_folio = folio; /* skip put_page for found dup */ if (!prune_stale_stable_nodes) @@ -1682,7 +1682,7 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup, continue; } } - put_page(_tree_page); + folio_put(folio); } if (found) { @@ -1747,7 +1747,7 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup, } *_stable_node_dup = found; - return tree_page; + return tree_folio; } static struct ksm_stable_node *stable_node_dup_any(struct ksm_stable_node *stable_node, -- 2.43.0