From patchwork Fri Dec 30 07:08:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13084133 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 35174C3DA7C for ; Fri, 30 Dec 2022 06:53:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E9058E0007; Fri, 30 Dec 2022 01:53:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AAD38E0003; Fri, 30 Dec 2022 01:53:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D7288E0006; Fri, 30 Dec 2022 01:53:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0123E8E0003 for ; Fri, 30 Dec 2022 01:53:10 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BDFA61A05FE for ; Fri, 30 Dec 2022 06:53:10 +0000 (UTC) X-FDA: 80298055740.16.C4ECC05 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf01.hostedemail.com (Postfix) with ESMTP id 55A1540011 for ; Fri, 30 Dec 2022 06:53:07 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf01.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 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=1672383189; 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=d8xurHYRqkyzwiIcSquapIXZyDRtX/H4bwbioYUKqMQ=; b=wWd7tRVCYIIhovEapsFBvqgBM9kYBBFQXxqAWG3iE3mJSnYo98phHsSWuK7uBKTm9xaff3 EvjIteep5ocqjIKXEroTGQjLGVuYEL6nPpRlSLgrJrAiFD0/Rkf95Ft9K7YaK2kBg9mL5P 2zWtZLkD5ezoBoYAfCH3NGfV7WxRMdM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf01.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672383189; a=rsa-sha256; cv=none; b=lcKOmBezj4O5ADcQfIEuzD9siuDp7RxTrLs3CjyS4CmUjkU4Ynneb4jMO78lkV0cC3wuN8 O79PMfrX2IAkWYKs/bpurqQfbE6mgl1qQsnlpkOn3QWHmGUk8dX9/l8VwURPW9s4sqfQVn qk2ahAo7FP8ZIpAYjTQjOjpgrQSuClE= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NjwpZ1h2SzJpV1; Fri, 30 Dec 2022 14:49:10 +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:04 +0800 From: Kefeng Wang To: Andrew Morton , SeongJae Park CC: , , , , , Kefeng Wang Subject: [PATCH -next v4 5/8] mm/damon/paddr: convert damon_pa_*() to use a folio Date: Fri, 30 Dec 2022 15:08:46 +0800 Message-ID: <20221230070849.63358-6-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-Queue-Id: 55A1540011 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: xzme7szqmpfk71y1crprgnu4sy7egeik X-HE-Tag: 1672383187-775932 X-HE-Meta: U2FsdGVkX194CRcLJ/8R6nJvbOxUaKo2W7p9epEeC0MEte1D4R1yucOUfFSECK6V3S3sylgyboOQ/VA4pYLDf3JFAME4VdvhtOVA2ypqYAih3yHSCSHhw78TAY4dpEOY797W30LApKQLyBrCCIIJ28ndDw8LHuXwZKzcpaGncS1uhvRHqcr10sahbl5+RgY+esEhhn1V/4NEHDzCFsHNBv9mjX5LZfDYj/Nf/6pw9Q5A9zoevsHW9QD4NIgXsvWT6RCsgJWxoAjxnMh865z/pVvSE29cY1Oa0XHwPxEK/LMR0PhX4TTFdUMpcQxYkUtd5/adPLLhygKcviZUzZZXFCNI093bfr5NWLsQvzJEN0P+O3OGrw3pM6hLc9xcXMvEa32/2SbT87FIEAUSex2h2v8HfrnMo6T1enujMQry0Sj6kJKxThrXfY+cA851Wej+2EHbhZSzlnIyRCLUesep6ynHl2RlQP7kIthUVAid88SZVktKTplxJ2XJcdrkicFYH+aI7OoZkRV8TwA1qZdQiEpEzzt2dgodkYGvv8ZzGbK5Ifoi1KIXsqI/le2zQpQ4l2yoRzvV16RRReQlDkaWNRvefItTsJIzv0NDht8/Jw1eNM3tbbt7ftTIv+2jirQxBHVg4OfSeFAslk34Sm0kokUuzntNR7gczyH7Ks9MInzIze1ICGAneufK0PeSqYadfOdL396SZoJRw6xN0qDVa89i0yZ6JhWW5a1cJinIDXq5CdXGWnzlhOeYA09zT69mv295+WpwJDqh7lZlR5JXU2fN0UzuO7BFAZ2aX5hyjzPLFl/W2lvOPoVn6ZXiE6KlsWivhyz9dcCl+QANtIIg1RIal+0ESaS2sW7x+N5pFM/En05P033bofDnQUb55DO32dlTs54PwywyUpjIchi2D3QVdRxpjI3KxcOLTHKHwPphcjZ47S7i+EKBkcI6LVIq5tGzEeflLd31/hlENwa +82h/rMc +0GEYvisrGYfTilo= 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 all the damon_pa_*() to use a folio. Reviewed-by: SeongJae Park Signed-off-by: Kefeng Wang --- mm/damon/paddr.c | 58 ++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 6334c99e5152..99d4c357ef2b 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -33,17 +33,15 @@ static bool __damon_pa_mkold(struct folio *folio, struct vm_area_struct *vma, static void damon_pa_mkold(unsigned long paddr) { - struct folio *folio; - struct page *page = damon_get_page(PHYS_PFN(paddr)); + struct folio *folio = damon_get_folio(PHYS_PFN(paddr)); struct rmap_walk_control rwc = { .rmap_one = __damon_pa_mkold, .anon_lock = folio_lock_anon_vma_read, }; bool need_lock; - if (!page) + if (!folio) return; - folio = page_folio(page); if (!folio_mapped(folio) || !folio_raw_mapping(folio)) { folio_set_idle(folio); @@ -122,8 +120,7 @@ static bool __damon_pa_young(struct folio *folio, struct vm_area_struct *vma, static bool damon_pa_young(unsigned long paddr, unsigned long *page_sz) { - struct folio *folio; - struct page *page = damon_get_page(PHYS_PFN(paddr)); + struct folio *folio = damon_get_folio(PHYS_PFN(paddr)); struct damon_pa_access_chk_result result = { .page_sz = PAGE_SIZE, .accessed = false, @@ -135,9 +132,8 @@ static bool damon_pa_young(unsigned long paddr, unsigned long *page_sz) }; bool need_lock; - if (!page) + if (!folio) return false; - folio = page_folio(page); if (!folio_mapped(folio) || !folio_raw_mapping(folio)) { if (folio_test_idle(folio)) @@ -203,18 +199,18 @@ static unsigned int damon_pa_check_accesses(struct damon_ctx *ctx) } static bool __damos_pa_filter_out(struct damos_filter *filter, - struct page *page) + struct folio *folio) { bool matched = false; struct mem_cgroup *memcg; switch (filter->type) { case DAMOS_FILTER_TYPE_ANON: - matched = PageAnon(page); + matched = folio_test_anon(folio); break; case DAMOS_FILTER_TYPE_MEMCG: rcu_read_lock(); - memcg = page_memcg_check(page); + memcg = folio_memcg_check(folio); if (!memcg) matched = false; else @@ -231,12 +227,12 @@ static bool __damos_pa_filter_out(struct damos_filter *filter, /* * damos_pa_filter_out - Return true if the page should be filtered out. */ -static bool damos_pa_filter_out(struct damos *scheme, struct page *page) +static bool damos_pa_filter_out(struct damos *scheme, struct folio *folio) { struct damos_filter *filter; damos_for_each_filter(filter, scheme) { - if (__damos_pa_filter_out(filter, page)) + if (__damos_pa_filter_out(filter, folio)) return true; } return false; @@ -245,33 +241,33 @@ static bool damos_pa_filter_out(struct damos *scheme, struct page *page) static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s) { unsigned long addr, applied; - LIST_HEAD(page_list); + LIST_HEAD(folio_list); for (addr = r->ar.start; addr < r->ar.end; addr += PAGE_SIZE) { - struct page *page = damon_get_page(PHYS_PFN(addr)); + struct folio *folio = damon_get_folio(PHYS_PFN(addr)); - if (!page) + if (!folio) continue; - if (damos_pa_filter_out(s, page)) { - put_page(page); + if (damos_pa_filter_out(s, folio)) { + folio_put(folio); continue; } - ClearPageReferenced(page); - test_and_clear_page_young(page); - if (isolate_lru_page(page)) { - put_page(page); + folio_clear_referenced(folio); + folio_test_clear_young(folio); + if (folio_isolate_lru(folio)) { + folio_put(folio); continue; } - if (PageUnevictable(page)) { - putback_lru_page(page); + if (folio_test_unevictable(folio)) { + folio_putback_lru(folio); } else { - list_add(&page->lru, &page_list); - put_page(page); + list_add(&folio->lru, &folio_list); + folio_put(folio); } } - applied = reclaim_pages(&page_list); + applied = reclaim_pages(&folio_list); cond_resched(); return applied * PAGE_SIZE; } @@ -282,14 +278,12 @@ static inline unsigned long damon_pa_mark_accessed_or_deactivate( unsigned long addr, applied = 0; for (addr = r->ar.start; addr < r->ar.end; addr += PAGE_SIZE) { - struct page *page = damon_get_page(PHYS_PFN(addr)); - struct folio *folio; + struct folio *folio = damon_get_folio(PHYS_PFN(addr)); - if (!page) + if (!folio) continue; - folio = page_folio(page); - if (damos_pa_filter_out(s, &folio->page)) { + if (damos_pa_filter_out(s, folio)) { folio_put(folio); continue; }