Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2758304lqp; Mon, 25 Mar 2024 08:26:39 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVf8gMwRD7y0Kkz7vt63Jb73lSg5wb/Oqu3zIFAp6usOlIRqNxPKxDnS1cYaOmER8gEoH7TUvjj11/3r65cuWa3qiumnS9hOUw+h2mlAQ== X-Google-Smtp-Source: AGHT+IFMChrcMxuOh/hn07RI4/7la2GfXXlXXBT1/U5PwUlX+E/Q6vuFVEk5wm8LZL1LfvkUzZ8s X-Received: by 2002:a05:6214:1c45:b0:690:b8d3:97b9 with SMTP id if5-20020a0562141c4500b00690b8d397b9mr9591009qvb.59.1711380399414; Mon, 25 Mar 2024 08:26:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711380399; cv=pass; d=google.com; s=arc-20160816; b=DIzayvnrcicr2xiIgv+mqluJjwJnJN9O2z3Vanr4R/qBvTi3mcFuNib6xeGcXEIvHh p59kzYYazPRUy5JlsR1VBOdNa52OCcx/a2gq7sXfmZ84VxKgGlenRQ9tG0+lUa8hRemy 5o/wiZ5bmGkYg09hDx3ufcPo8FAqsAX/hpeF4HNd916ZM9NFJ3BoQyTM+EEQdChUY/oU W6y4Womc/1GPdJvSpNaOk20uZh90p2Jal98Ni9yWtmFutpU/367yX9FFzkibIIbpYj5S AqkdP+XtHrs+WQyzOj8SKVjAX9GtfbiWuno6A/edOFiMS3VRdF/jZqpiNXp0ZUlEnmUq ZnwA== 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=TfVtUpv+bViU5SEY+5vl7RzuFH++KFzflA9vTjEeuyc=; fh=82Tkto9wLAThGWFPjMOHQAMNM/SHGFFIudThbRSmfJc=; b=vHIM8gzCsmUDKd+W+oAfeZPvbPsuguVAXHRAZdgZ8lfjPwFi8+kV/e3TM1QbFtnEfk /cN+p6gfWXQ55/5QPpQMiyOsB08BcL9gS9b/WhuzI6vQQeNpM9XbbrEmotFES886bc26 bgvJk0VBCry5NLWPTqBSzyKUi+HYXtNlzgzyP+q9cs1qxrm0J4FAMni0xqF1BtCySGKR /lvaERKXnXRE3Wfrvo2GX8SQcOM1mQDYqydIe4BN7qaJa4aFopvCqI03vObmihrDtiA3 2lJG5uIvdriJIMR0zeISPeL1jYL57iwqXI1Rrrh/57DPA2jkQToNitWPBZyjuYI6QDJG MppA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R4e1gCa0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-117047-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-117047-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id c14-20020ad45aee000000b00696899b4f6csi2910063qvh.441.2024.03.25.08.26.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 08:26:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-117047-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R4e1gCa0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-117047-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-117047-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 3B0271C32FFE for ; Mon, 25 Mar 2024 15:26:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 692316EB6F; Mon, 25 Mar 2024 12:46:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R4e1gCa0" 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 8ED69161915 for ; Mon, 25 Mar 2024 12:46:22 +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=1711370782; cv=none; b=EizvLf1OKFR1sW5EDekygIYio/CpFF1sm4no6JmCSZqngVQouCb7oymN5pWmzU+cdOO/JJ38N+MHcmBZSmRFuq0MRh++D83cmqtUSA1dhXSQVVQ4gKcNEsaVMNPHAp3puRgtn9z8qx0UprI/cMG6a+nysR9dqAcpOK9KZHC/nJk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711370782; c=relaxed/simple; bh=ZriKAGE58KVGgk3LtHqsYBhdOJzv7LI/X6J606D1xxw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lQAih6YkLXG6E+18PdHTVjPsmvdFhSEIVhIRsnUitj6sTnpNXyKdeP7rgWQhMN60gw0SL/krEW1LKYQv4tXk7tnAwUFN/gqWHeL73ea0+w0t9aV5uHBXOk5bTm7PJtiQK4ZIyDS1BQe4+i1URsWT8H7TKTDzcX0mq4Gne3FSm2g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R4e1gCa0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07108C43390; Mon, 25 Mar 2024 12:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711370782; bh=ZriKAGE58KVGgk3LtHqsYBhdOJzv7LI/X6J606D1xxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R4e1gCa0XXthXxDX1BVjSpCwAOrXN3yXEnOKgM7VQzdWV57yKkfcA6jTRuemNBpPk cB15ux/wXrKv9yHhvUufFYr2882U4OjiVTCQGdfIigsmAadPt7KopB0roJ8VFftt8a ui44vFdFuoIKw0rV7d8UOx42w2pV8KnpkkqT4L/pnhwDAT6g4KoPWYmZB8HemEl3hU bkNVVJKYJ6yao6nAcZx3Z4aDvnCRwp/dX041t87HyEv3ahSuOCQwKWNtjXiz/IZKxf F5ssZsBvG+eP5J/A2c32/8//4yXzJ6pe4Wgcr9nhm1SbFY4WMaTTMJVug1bcTPZTb4 EgwXN9kXAKISQ== 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, ryncsn@gmail.com Cc: "Alex Shi (tencent)" , Hugh Dickins , Chris Wright Subject: [PATCH v3 13/14] mm/ksm: use folio_set_stable_node in try_to_merge_one_page Date: Mon, 25 Mar 2024 20:49:00 +0800 Message-ID: <20240325124904.398913-14-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240325124904.398913-1-alexs@kernel.org> References: <20240325124904.398913-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)" Only single page could be reached where we set stable node after write protect, so use folio converted func to replace page's. Signed-off-by: Alex Shi (tencent) Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright --- mm/ksm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index 15a78a9bab59..d7c4cc4a0cc1 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1518,7 +1518,7 @@ static int try_to_merge_one_page(struct vm_area_struct *vma, * PageAnon+anon_vma to PageKsm+NULL stable_node: * stable_tree_insert() will update stable_node. */ - set_page_stable_node(page, NULL); + folio_set_stable_node(page_folio(page), NULL); mark_page_accessed(page); /* * Page reclaim just frees a clean page with no dirty -- 2.43.0