From patchwork Fri Dec 30 07:08:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13084138 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 03B75C4332F for ; Fri, 30 Dec 2022 06:53:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A796E8E000B; Fri, 30 Dec 2022 01:53:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A2B138E0006; Fri, 30 Dec 2022 01:53:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A2D38E000B; Fri, 30 Dec 2022 01:53:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7B7338E0006 for ; Fri, 30 Dec 2022 01:53:16 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 51A111A0550 for ; Fri, 30 Dec 2022 06:53:16 +0000 (UTC) X-FDA: 80298055992.13.4C81C52 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf18.hostedemail.com (Postfix) with ESMTP id 325B81C0007 for ; Fri, 30 Dec 2022 06:53:13 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672383194; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oSpxjdrx5WttBIyn/GUx2UUT2/CnGpbuNERYbxXuj0Y=; b=GDtasib89orBtomwBo0hhxUMt33VdWNjUVeQK9nAnye0lqPe1QviJwTEgduC7UdrPx58KU Iltq7qdIk1MnYax9rylRiJBB/WQk4Z2vJyDD9etWreIujz51rflQ86Dgqys7KRsx6z+e6u IoB8UB/ru+qSOyjMm4GOrFDoK3Q67f8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672383194; a=rsa-sha256; cv=none; b=K23+n3sJGpS/t2Py56zItrrpXUBcWIu0sB8QizXwTaGyvkYWUhnECKezM7/qW9QupG+bPN uOm8zhk1tomfS4k3jJlJFGVmzy0DKhciHKlKbTWgAIvR9wMLR0PXZhJSIy6we0B4jT0ONw MRwkOqReI5b0W17bjBY8p1NNtpqDt7o= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NjwsZ56w8zbc4G; Fri, 30 Dec 2022 14:51:46 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 30 Dec 2022 14:53:05 +0800 From: Kefeng Wang To: Andrew Morton , SeongJae Park CC: , , , , , Kefeng Wang Subject: [PATCH -next v4 8/8] mm/damon/vaddr: convert hugetlb related functions to use a folio Date: Fri, 30 Dec 2022 15:08:49 +0800 Message-ID: <20221230070849.63358-9-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221230070849.63358-1-wangkefeng.wang@huawei.com> References: <20221230070849.63358-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 325B81C0007 X-Rspam-User: X-Stat-Signature: autpeoppuhmmd187iu7uqkbaapx1kxxr X-HE-Tag: 1672383193-647741 X-HE-Meta: U2FsdGVkX1+M6Yj52FfpybWna4mHOZkC7JqD4f2122nTBR9pf5VzBP7WURx4BCRnDa4pMY4ZYpBRMUvcYdAqiv8zb0/LXla+J4HY/6RjRzNAqixr31mCO+ihikAWOic5ZH/UBdV7ijrmrR3orozNbSF3XjI5hs75Dz6qE1oeQ2nBAynTr1ba/dmOK7hAggqBHp758Yn+d/9/tjTtN4f3C4/ztXmwT2UPkD74UlGjEdqOiWiBvrX96q1Irp420zVW9aCkJtQ4swioepFmcYs7CWGJYlNmMIl65VPV6yzcD0MlUsh5fLFGzvnOij3vMurnGZXwn+MYfy1CtSkYB2j8QkTtDkw03DtGMJ8iJCr4n7nuN5JS2CA4IActac5YxzMBXGiVSTqkvUsa/KyHeKvAtRvUntZe6mazn+kSdwOVRHwIf/0Ffrk8OXJxgV513Xs1L33UikldFW4A12MG4hOeNbsEM+GnbVi0IN5o27KfSKH6/LKXVrlZbCu44r3EI4Eu1+imRqrnURHbI4iD8ZGOfO5K4qYsC+f/x+nsLT6Cl773eFkuQICTlL0nCelzpQ44Nr12r6QyXYHozplu32JJaCB98O04qTu7VRt9zGmKh6vWfGgkveKOe61TJ/3t7osuA0tnGbqam36qfk47mw8b1W8sCSjvGh+ZsiUsZ671TTWVLYXm+YvsH7OJ6+Rv90bVs/WY1K4docNfaCh1WOF0L5lbxnz/d2iXHj5BnKbL7OBXGK3uKKzCnYR2mood+14EOp1xvruLDds9SxpJjj39ejREpZxanQnHsGILbrMBT7Ima63qAORodzCTCrEP/bxlDjqAgAzTQhSKdNdVvKGSzQ/UyG475gViDg3eaSlqqAxFDLkGRxn1sgvdWJ4fhL6NP18cPSvAeIeEWeDNyeOWMfD9R5Q78Iemy8EOj34CTfVrUMf1C8KSew== 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: Convert damon_hugetlb_mkold() and damon_young_hugetlb_entry() to use a folio. Reviewed-by: SeongJae Park Signed-off-by: Kefeng Wang --- mm/damon/vaddr.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index 29227b7a6032..9d92c5eb3a1f 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -335,9 +335,9 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm, { bool referenced = false; pte_t entry = huge_ptep_get(pte); - struct page *page = pte_page(entry); + struct folio *folio = pfn_folio(pte_pfn(entry)); - get_page(page); + folio_get(folio); if (pte_young(entry)) { referenced = true; @@ -352,10 +352,10 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm, #endif /* CONFIG_MMU_NOTIFIER */ if (referenced) - set_page_young(page); + folio_set_young(folio); - set_page_idle(page); - put_page(page); + folio_set_idle(folio); + folio_put(folio); } static int damon_mkold_hugetlb_entry(pte_t *pte, unsigned long hmask, @@ -490,7 +490,7 @@ static int damon_young_hugetlb_entry(pte_t *pte, unsigned long hmask, { struct damon_young_walk_private *priv = walk->private; struct hstate *h = hstate_vma(walk->vma); - struct page *page; + struct folio *folio; spinlock_t *ptl; pte_t entry; @@ -499,16 +499,16 @@ static int damon_young_hugetlb_entry(pte_t *pte, unsigned long hmask, if (!pte_present(entry)) goto out; - page = pte_page(entry); - get_page(page); + folio = pfn_folio(pte_pfn(entry)); + folio_get(folio); - if (pte_young(entry) || !page_is_idle(page) || + if (pte_young(entry) || !folio_test_idle(folio) || mmu_notifier_test_young(walk->mm, addr)) { *priv->page_sz = huge_page_size(h); priv->young = true; } - put_page(page); + folio_put(folio); out: spin_unlock(ptl);