From patchwork Tue Dec 27 12:27:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13082244 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 0554BC4332F for ; Tue, 27 Dec 2022 12:11:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCDBC8E0006; Tue, 27 Dec 2022 07:11:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D7CC88E0001; Tue, 27 Dec 2022 07:11:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C40FA8E000B; Tue, 27 Dec 2022 07:11:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8F3F38E0001 for ; Tue, 27 Dec 2022 07:11:41 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 643CCC0891 for ; Tue, 27 Dec 2022 12:11:41 +0000 (UTC) X-FDA: 80287972002.09.D2F2239 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf17.hostedemail.com (Postfix) with ESMTP id 510BE40016 for ; Tue, 27 Dec 2022 12:11:38 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf17.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=1672143099; 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=tta+7/oGBxKDm73NTZEGvNoLjVSrzGThVYa6iqTnTLU=; b=2Hha6BF5eaECystHYybSDrPD2w7OobzAQcsMGALn7sNbRKiTRt50iKzm6E7L4Q5nupttw+ ky5O1TvZkqHRCsb5XKkPRBJXPphlKrEEgUQep5RvDlLC6dc6QxGxv7DysBbmHab/Xlpzg3 k7kHKtXivJBs6xiKgg5bk0eH2cn7LUg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf17.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=1672143099; a=rsa-sha256; cv=none; b=V67ac9XHXG8JYAv5P/uytMR0l7dH0NgpIouOEYdAA6Y20d8iFblD4o1lHZpPv6VJNdCQUk AGoXk3Qe0J1JPpGqYFAhPgnHcCSMUg+H18+Z/sB3gvFd94eE/mHkqcAh2NJ7l46oA0gmL9 RbqPlRBdx6lv1M+/sLxeZAtEPXcc2uc= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NhD0m722MzkWv6; Tue, 27 Dec 2022 20:07:04 +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; Tue, 27 Dec 2022 20:11:35 +0800 From: Kefeng Wang To: Andrew Morton , SeongJae Park CC: , , , , , Kefeng Wang Subject: [PATCH -next v2 7/7] mm: damon: vaddr: convert hugetlb related function to use folios Date: Tue, 27 Dec 2022 20:27:14 +0800 Message-ID: <20221227122714.161224-8-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221227122714.161224-1-wangkefeng.wang@huawei.com> References: <20221227122714.161224-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 510BE40016 X-Stat-Signature: nqcrtnigkokwsh7psk3sq8t1buep4m3u X-Rspam-User: X-HE-Tag: 1672143098-401267 X-HE-Meta: U2FsdGVkX1+pttqIUaNQMVipu+ilo/r68WqZtRt5RLiOgUIU4QGa39AKPEMoAkwpDWV5xD1GdkLSY/NCJKX4HTNmvCGnxBtaMXcKp5DHSEhIHsSdVYwlDVQQQGLet01Uhjhs4ZnLfmq2io0cmHcs4QXi5eFTTlLCUEoi5JG8gVpB465oprsmGVWpDmGZo0SyY4dZh4fzlpiFWfCjsrGFAfg5ktujqLoKCvNBiDxB6psyJ4Sgg9zZA36Y8oiyXmWxMeiV2+I0lqJ6taLXnkgagIGB164jS3uHmRkKl5+bn2DlhGgO+G1/GenHnv3lTgjzt2HvuHQRlDPMltBr4D0V0OOpEZ56XzUKVSiR8q+hvjPNc3CJ68GrLkRymdNMBaDnU6bLjHZQ2Cek41hpaa1h/WEar7U2a6pg6+xPqCV6X5Gfigt5+o+b3Oe5OeQr7SfhbLJAQCkjmmmNS3h+/OO/ThEpHfR2cKH8H1CUWe2Cfe5elVcgmpynv+GMN3fRUts0yDuI66L3b9i7PbJhbjcyEjS6i39lwv228Drtvt33WbarmllZOZnJ2/pu0lE8zNT4SDCvSnA0qDsI9kjcPgyH93bOB1Opzawe0/7psH0yJkZIp+6s5y/GEcsEQwAgJMOWfWt/9C81at7ZpyDKhF2Rcm5Hw91T+09NpcX4Nb9K8gpLLtAFKjQm+TYwy1MX/UFfo6axDW1VTJgiygWVQVQY2GpGhQKSG1EkDSTrNcvN0IZjh5YuyzsQD1ax/Klx46LCCeogcvBkdp1rKSjyM+poDYznBjHybyHKdT+dAzihdszFzGXfxw3t3w7D1PpYfI3ZQpwRpjogxN8cA7+ohSsGTTz6+VteB1U8tQP6kxC2ihUqExS0hW55PTSXBEzHFSclBs5iEWC8tzFlZdujn1YgLsvVyQskteEwzNklYhkY1OZNkx6ZlIv/jg== 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 folios. 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);