Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp979151lqp; Fri, 22 Mar 2024 01:36:27 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUMDH3kICUQqveZPw5NJZBfqKELKisTiUrf2ZNlTk6w65ScNB0KoU1QLDn/vJxhxAX6Ux0ITAJdE48ebke/mYlbFZ6Le0GBomXDLtEtdg== X-Google-Smtp-Source: AGHT+IGzf3bKUe+1nvQJs7SJMZK0EMbjrSSHXK6r0ks+hczfnzRbbbgW4wOcVVlZOd94yKbK56R7 X-Received: by 2002:a05:6e02:12b1:b0:368:5247:c604 with SMTP id f17-20020a056e0212b100b003685247c604mr1771013ilr.27.1711096587695; Fri, 22 Mar 2024 01:36:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711096587; cv=pass; d=google.com; s=arc-20160816; b=bvBTy9cX/JHkj7Kh8sWWEjObTwrxlbN9GEfbAjgqSMXJM7iQ8DrOJyWFYLFf8HJUQI iksZM9Bq/ByIO85aWarReS6g26X9ldl6HOGKQLR1GnVsRmgDPQE0mGXeL3QQ609BG8xn 95kaipKLCKL4HdsmF7wqsyxUvGAWXJ03hyfrbcOtTu5+AxdkPzHwd8mkrYN+p9HvcXKs q1DTJ6FRgy4R2lAp/quVUJU4M47i7MvH5sjK2k6ZHAxAq0400UfRPYnmP6UuLqZQ5vE1 cd67Yi3/uLY27ShuIIwTIgbDVeAdDqCI0Gb+uPzGeJiFmZkIAXEGn5IhW3oc/wyRIpvF gnoQ== 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=fH8PCU7tcCjvM0wdZXSe9Jm35IXTtS/JFGEFHAYLlnc=; fh=CTFdFrbtP7Z7TCdMbqsgkrQi425Yz+qx6YS+cHHF8Sc=; b=Afop0cc+HytO9ZF6rAjAw/uhQeP7+qbicWTH7X/pobM1jgbGkRE/w1l02y/zrJhQZq k00uhpsCqeUS56+zqCqY6bMcHUbhP1KcI/EfceYrq2ISkkYlb0E6BIB0lDx6DHP7qW1i vlbAzAk65PwKJZyKm6jH/RRCwtG2K5th435cILAzQj2FOx0GaQvuZh+6ndOQ+ZqzcbNR mz4UgZSc0rt1NBvjk4jt2qgSuPHrf67V5qk4Qws6QIwenOHUul9v2qsvMVxl0g7ybXu1 SL+zhIU7TkOsLpqBrAIkcIByDqn9BMF4eW2HKeVe4H0v67lApx8B0qHudvw0Vkdg5T3H JLcg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iSqvlKnQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-111137-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111137-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 c18-20020a630d12000000b005dc1b5b386asi1590003pgl.339.2024.03.22.01.36.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 01:36:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-111137-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=iSqvlKnQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-111137-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111137-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 56B88283C24 for ; Fri, 22 Mar 2024 08:36:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B31ED20B27; Fri, 22 Mar 2024 08:34:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iSqvlKnQ" 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 DF35E1B7EF for ; Fri, 22 Mar 2024 08:34:54 +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=1711096495; cv=none; b=goo4azYaamFpw3io2TdZ08kFKRaNVkZ/EAcxZUrRTJBdH9nmA781K9FsjH8aaJpxqd1Zt9ownRYSaWWYiJ5271eq4edAF772omJLR5rMY1SftrOg6WG1YTnxoMsf3t2pCuMTAbQVaKgA6W3vz/Ek/jCWaZiowStOp48YmSNnNzY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711096495; c=relaxed/simple; bh=Czj2cXDjtWaQ7qWM/ntpEjf7pxB7Zlc771aFb0A0Wn0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7anrIuR4+nuwhWwq/bhqDwcBEV72LxdE8jOZKLt7hNL+dA9pE2s/lrpEyeyEAvgwZhJGME6dqVctAadgc5Z/Gfcep+k3mhAsGCYr0z19Q0B3i+W7IdBIJQ332OBz6BNX/IX8+A4zXdJ38jZ4mDA1ZMHzwzqJVwaMvBEU2DPuxE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iSqvlKnQ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45184C43399; Fri, 22 Mar 2024 08:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711096494; bh=Czj2cXDjtWaQ7qWM/ntpEjf7pxB7Zlc771aFb0A0Wn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSqvlKnQKbuzNlo/1UqKPoPip2scXPO84E9+9X8dNblrtlYt2FWgou2idLr2Cf624 8JDv38d4rMAdgz4MTUUko9xkN20vVseInMkafo4ridyT8QrSEK6mUIMSW1s2bGoCWb 2oA1/SD9crmzZec6ZPZSk2pUNViw39caL5q+bQOFPvg7lP7aJp0rZC7ZSkDGyd6tr1 fZxBXpnGQ83pK0lK/Su/GbJrSrPEaS2sLnmOcnErBD6joRlbQsbF4sqsMRfph6EfUs EJCIbyKNVbuK1tMDzHm/u1kuRYEqAnEIsJ/orGgHG7dy/Yqe89xaP0SuprV37NcFFC 2Stk7Cot+7HvA== 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 08/14] mm/ksm: Convert chain series funcs to use folio Date: Fri, 22 Mar 2024 16:36:55 +0800 Message-ID: <20240322083703.232364-9-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)" In ksm stable tree all page are single, let's convert them to use folios. Change return type to void is ugly, but for a series funcs, it's still a bit simpler than adding new funcs. And they will be changed to 'struct folio' soon. Signed-off-by: Alex Shi (tencent) Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright --- mm/ksm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index f41491cf13c6..30570e1f68ec 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1777,7 +1777,7 @@ static struct ksm_stable_node *stable_node_dup_any(struct ksm_stable_node *stabl * function and will be overwritten in all cases, the caller doesn't * need to initialize it. */ -static struct page *__stable_node_chain(struct ksm_stable_node **_stable_node_dup, +static void *__stable_node_chain(struct ksm_stable_node **_stable_node_dup, struct ksm_stable_node **_stable_node, struct rb_root *root, bool prune_stale_stable_nodes) @@ -1799,24 +1799,24 @@ static struct page *__stable_node_chain(struct ksm_stable_node **_stable_node_du prune_stale_stable_nodes); } -static __always_inline struct page *chain_prune(struct ksm_stable_node **s_n_d, +static __always_inline void *chain_prune(struct ksm_stable_node **s_n_d, struct ksm_stable_node **s_n, struct rb_root *root) { return __stable_node_chain(s_n_d, s_n, root, true); } -static __always_inline struct page *chain(struct ksm_stable_node **s_n_d, +static __always_inline void *chain(struct ksm_stable_node **s_n_d, struct ksm_stable_node *s_n, struct rb_root *root) { struct ksm_stable_node *old_stable_node = s_n; - struct page *tree_page; + struct folio *tree_folio; - tree_page = __stable_node_chain(s_n_d, &s_n, root, false); + tree_folio = __stable_node_chain(s_n_d, &s_n, root, false); /* not pruning dups so s_n cannot have changed */ VM_BUG_ON(s_n != old_stable_node); - return tree_page; + return tree_folio; } /* -- 2.43.0