From patchwork Wed Dec 28 11:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13082865 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 74A0AC46467 for ; Wed, 28 Dec 2022 11:18:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 641F58E0009; Wed, 28 Dec 2022 06:18:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 43BB18E0008; Wed, 28 Dec 2022 06:18:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B9998E0003; Wed, 28 Dec 2022 06:18:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9907B8E0005 for ; Wed, 28 Dec 2022 06:18:32 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 71E751C5E57 for ; Wed, 28 Dec 2022 11:18:32 +0000 (UTC) X-FDA: 80291466864.21.4F37F13 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf11.hostedemail.com (Postfix) with ESMTP id 5316C40004 for ; Wed, 28 Dec 2022 11:18:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.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=1672226310; 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=rnhzB6T4tsOkxbilNdxJPGRrXwW2//vST41rcZs8s/g=; b=JbfjE3X6DJAHcwTS3ofEfFVjU3njZHTpo7d/IFrVJyVkhHLCMBBIUJ7+op2aPmNRp3U4nA RBiUQNX88x/0P+rKkRUO7mdABVO2nKi5dQYaNw38I7c5F97W1I0dT/rM7uixQcsT4kkhYW zY6i8JVle5sg1duSoqqbRueBO/IwwnY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.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=1672226310; a=rsa-sha256; cv=none; b=qTS+QtCzsDZdgD7XW9h0ROV+IV6soes+feAzW2sHyrdweGJJVlN6+cU+l0yJvyvu2qUyp7 nyzOI0w08z4IW4KsWfjKqdScs9VIfsDqNqW7BHw7clfANl25A0uwjjl52x0tE/1baD2PPP lpic1CtKn+SCmCmu+0hWyN3S/ej/+E4= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Nhpmx6t8PzkX3w; Wed, 28 Dec 2022 19:13:53 +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; Wed, 28 Dec 2022 19:18:25 +0800 From: Kefeng Wang To: Andrew Morton , SeongJae Park CC: , , , , , Kefeng Wang Subject: [PATCH -next v3 5/7] mm/damon/vaddr: convert damon_young_pmd_entry() to use folio Date: Wed, 28 Dec 2022 19:34:11 +0800 Message-ID: <20221228113413.10329-6-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221228113413.10329-1-wangkefeng.wang@huawei.com> References: <20221228113413.10329-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 5316C40004 X-Stat-Signature: 4dm8zq7qs83s4maoxyfqoikj1bnu6kd7 X-HE-Tag: 1672226308-415866 X-HE-Meta: U2FsdGVkX1+35kZwG/NB92QjMUXhupl9sIIlz+k8Cpj+i0V1+bLzH6mCGUAQWrcMJGQOQqQJPYRwceMmh1/aqrflux2dqPXQxMxaGzThDkEvAXAN3dRX9woWhvOicMwuIioZ0UTLkwt6kAbPyyZq0XvBiT98cIlnS3lEY/gyTtwp67H8s/0fGxzONkGpqrEccI0Fcfyl3TebBc1m7cEEuno8RV97ynOnDy5by2AXmREe/M0gFFg4vrR+r8d2MhoZ9K2TuKtEPhQUxpZSKZ51Lqri3kIRJpeNXnrljYxy4FobgN/rtTF6jxtGQi3vXCn0j9mB1CYyaMQwFjZznjZXgDAY8osZ3r7QibotC8czZFRiAGPQj2UX5cDBY2KRod4+kTLOaf66PR6bIJjqgcs87J/SQFbbicKt9aZlDcFl41a9F4p1skXeT/6UhqjoEPp1zxqY1rDt5vUaaMDSs0iMWU0Tdcjlei66CI4GnA8Q19qnMqPwCngurhMt7DIruQMd8v4bZSOpiQJEkM90PK2LBXU821z1xWXLNYK2xddBxMtFTMrV/94YfIggKfYP69jwTGGJwv+AdJuLSlh/yJcTxsPlsZTqhGSrztMcU3vAFHOT7ahDlsv9GSo56TycM8YmXJfj7J6yokAb3vqWAsI6QIRvOiL+TTF1Pbn+VTOs/a9ckZ6cconps8xDIUapOfPz5MqiBdEgTgbkRnnPxA+YgLg+aKs0D3jPubIoAqWYy8U+rmRgOqL+lVzJCqyP6pWYLkRe+YUcK89rZ6S0k4W8P6YTMRB9zuP8mTBEbcCY/wH1QuqdkRrtQ+9H4qwN7mZ24pspNL55ooZgsUhZl3nuARIRoaE1g5rqT1eegJiRWptEqG1ZoC52xCwgJJiv9ZusYMHcTdRcvZupVBSCfLbkzyrVoUsWlZZ9l96E63hze05uUT0v5ELuxxZrN/8WG5hmK8r+DzZy9cd4DJ4BYR7 gPNaIaoE DCDn8GAaszSQJV70= 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: With damon_get_folio(), let's convert damon_young_pmd_entry() to use folios. Signed-off-by: Kefeng Wang --- mm/damon/vaddr.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index 15f03df66db6..29227b7a6032 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -431,7 +431,7 @@ static int damon_young_pmd_entry(pmd_t *pmd, unsigned long addr, { pte_t *pte; spinlock_t *ptl; - struct page *page; + struct folio *folio; struct damon_young_walk_private *priv = walk->private; #ifdef CONFIG_TRANSPARENT_HUGEPAGE @@ -446,16 +446,16 @@ static int damon_young_pmd_entry(pmd_t *pmd, unsigned long addr, spin_unlock(ptl); goto regular_page; } - page = damon_get_page(pmd_pfn(*pmd)); - if (!page) + folio = damon_get_folio(pmd_pfn(*pmd)); + if (!folio) goto huge_out; - if (pmd_young(*pmd) || !page_is_idle(page) || + if (pmd_young(*pmd) || !folio_test_idle(folio) || mmu_notifier_test_young(walk->mm, addr)) { *priv->page_sz = HPAGE_PMD_SIZE; priv->young = true; } - put_page(page); + folio_put(folio); huge_out: spin_unlock(ptl); return 0; @@ -469,15 +469,15 @@ static int damon_young_pmd_entry(pmd_t *pmd, unsigned long addr, pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); if (!pte_present(*pte)) goto out; - page = damon_get_page(pte_pfn(*pte)); - if (!page) + folio = damon_get_folio(pte_pfn(*pte)); + if (!folio) goto out; - if (pte_young(*pte) || !page_is_idle(page) || + if (pte_young(*pte) || !folio_test_idle(folio) || mmu_notifier_test_young(walk->mm, addr)) { *priv->page_sz = PAGE_SIZE; priv->young = true; } - put_page(page); + folio_put(folio); out: pte_unmap_unlock(pte, ptl); return 0;