Received: by 2002:ab2:3350:0:b0:1f4:6588:b3a7 with SMTP id o16csp1856462lqe; Tue, 9 Apr 2024 02:26:21 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV7hLG2rMW538ok6Nc1ScD28iQZtFJN+95cS+UfT2nvf+UIQNry9V/clOv+uYTmZo1BQH6Q1/SJwz6HJR9HkMuqcCjKDfu79BJJ5ephIA== X-Google-Smtp-Source: AGHT+IE9yIXfLuBHNtNG7JJlLIEFC6pYZaxyIenLqU7AnL0ynnY9wh8EcYG0rwq627pDdhTPyrq2 X-Received: by 2002:a17:907:78d7:b0:a47:3b6a:a29b with SMTP id kv23-20020a17090778d700b00a473b6aa29bmr7958300ejc.13.1712654781523; Tue, 09 Apr 2024 02:26:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712654781; cv=pass; d=google.com; s=arc-20160816; b=k5yfiQgomInHs6MphiYuAyQWVTtNm+nHS7vX1ZZLNF7EYfpTDjQ204xvo8NGEgxOZH t82nQfa3Fd2cyJe9x4CKWBskkX1RGYsYLUeVMcP69AcIsq3jL0jbKlLs6EHWzs749l7+ eWY1mKsJB6ch6PDGZJ5YiCWwDbsKC2Q0bpb7W2RtzLuIhG5SITDjFKnkdHH4vr+auiCS 3PwLOjcABtdTw4/nO3GqxyIypHFbY+wZS+RfzbQzy1K0wk+6MHByubLDcxX3c+NSQ4QW mnSe3nyXnkWdSzFPZcX3sJRfdOfXss4tgx40X7kl8fV+RX7Vel6dv5lF4LqikXSa/F+P 8dkA== 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=jtkdWevEu3psN02cr3rISCmZfj2it3cnlRAxu8k3HO8=; fh=L4VNAxQbQYrcrdeHT1sPO3RlS0TogNvaAEf/71clfA0=; b=y0UF3sd7wtjiTO2kMaIEowBrsm9W39kWYjEAfJWjapcdJzk9WyhPj10ym+euWDvWe2 JzjxbaNqOk4dU/uchKWx5oZ+30o+mTglgKLdRPceRshbiMjNjWqR2Heu/G2lqp+yc3GZ +M/NaWJj8FVJ+TmwPHc+uj/HeHUojy88TD1qdfdj8+wt3kt/Fw9SpzwnVcuD3t60VMsC ECtmm8xKbRNYg09URs7ufasmZtCHTpS1Qu/SGzu/5GyJjE5bCT8swewctBPheoH4Nbjw u/g7HmXK6Tt0Gif3Hqfd6/AotAIj3yGI3kqZrwR8wVUhQdauQyR5uCQVNXWSRPqr4EAo DJAg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cHW5B7MG; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-136556-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-136556-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id nb18-20020a1709071c9200b00a51c770f1b8si2736973ejc.704.2024.04.09.02.26.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 02:26:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-136556-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cHW5B7MG; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-136556-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-136556-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 400AA1F23A1A for ; Tue, 9 Apr 2024 09:26:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C146A82D7F; Tue, 9 Apr 2024 09:25:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cHW5B7MG" 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 EFB2D823A2 for ; Tue, 9 Apr 2024 09:25: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=1712654723; cv=none; b=YUzzZIwqpnOdqjjeaADePbVarVtcm0U6//wu0p3uAgqO7FOXqqkkryFOzQFo0HAeljjBkPnlK0AuHhhPsaRBxoKqQPayb0/nWtO3zta04f5jicxgaLhxKZoZGEaa80+oYLCd2A/EKPNjEk7GRhA0kABYShtCQrHCcmSFeEtswEE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712654723; c=relaxed/simple; bh=h5mTUeVzSSO40P/dqunWDfKwvbrZ6ROf/OJsSV/+/Tc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AufyjW2xudqykNrEPzre+ISQvOq5CBDRpMzNo2zQRtzVMYL1eVGAKwnUCh+5Y/HLUpqQYZ0+KyHtgkkFKvhUdUPcyoYwO0VhmZArH7a9kUGRwPngA9EeOMEloQKvK3qWfqjAkwdFwUrQ1SXkj8ZbqPNjD5grf/3AfsBJSBGBJY4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cHW5B7MG; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66ADAC433B2; Tue, 9 Apr 2024 09:25:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712654722; bh=h5mTUeVzSSO40P/dqunWDfKwvbrZ6ROf/OJsSV/+/Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cHW5B7MG3rTIH2E0eZCzzevv5RY2jP8XktDsl8WLKbwItLlisGdKj492muL5NV4mm av+RdTMeEMaMoDsAGubCuRkp+hARu4OGfmFTc85AP7jc7sAxULjkUcM7mdviojnabW 1H9tHT4Y8NVSSOFaPSkMeCychOjudYI9JrQaQ3D6p9Q5kdA3d7F2Jw0WxPEVL771VY CIJC3gE5IJ3yIRUl1QFORzLz2EPuU1CDn00wT4HkyOjJ3kdBDjeOyZ8OPD/tcw9G9I JZWAIQHvQRvw/67Tmt0tYZYZtispL4c2DpDAYtoivh92pGDWgK0hFcj8zklPe3q91p IPnjllxt9U90w== From: alexs@kernel.org To: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: "Alex Shi (tencent)" , Izik Eidus , Matthew Wilcox , Andrea Arcangeli , Hugh Dickins , Chris Wright , David Hildenbrand Subject: [PATCH v4 3/9] mm/ksm: add folio_set_stable_node Date: Tue, 9 Apr 2024 17:28:18 +0800 Message-ID: <20240409092826.1733637-4-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240409092826.1733637-1-alexs@kernel.org> References: <20240409092826.1733637-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)" Turn set_page_stable_node() into a wrapper folio_set_stable_node, and then use it to replace the former. we will merge them together after all place converted to folio. Signed-off-by: Alex Shi (tencent) Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright Reviewed-by: David Hildenbrand --- mm/ksm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index ea3dabf71e47..c9b7c5701f22 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1109,6 +1109,12 @@ static inline void set_page_stable_node(struct page *page, page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM); } +static inline void folio_set_stable_node(struct folio *folio, + struct ksm_stable_node *stable_node) +{ + set_page_stable_node(&folio->page, stable_node); +} + #ifdef CONFIG_SYSFS /* * Only called through the sysfs control interface: @@ -3241,7 +3247,7 @@ void folio_migrate_ksm(struct folio *newfolio, struct folio *folio) * has gone stale (or that folio_test_swapcache has been cleared). */ smp_wmb(); - set_page_stable_node(&folio->page, NULL); + folio_set_stable_node(folio, NULL); } } #endif /* CONFIG_MIGRATION */ -- 2.43.0