From mboxrd@z Thu Jan 1 00:00:00 1970 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 50D42C433F5 for ; Fri, 4 Feb 2022 19:59:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF9488D000A; Fri, 4 Feb 2022 14:59:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D8F88D000D; Fri, 4 Feb 2022 14:59:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 711608D000A; Fri, 4 Feb 2022 14:59:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id D05176B0098 for ; Fri, 4 Feb 2022 14:59:07 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 934879274B for ; Fri, 4 Feb 2022 19:59:07 +0000 (UTC) X-FDA: 79106161134.06.D7B210A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id 33348140004 for ; Fri, 4 Feb 2022 19:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=nu6DijrC8WBcPz39bB/vehblgzoM159H3giVCpWUnfU=; b=U5guoGdWSY/YcvOjl4Kcqes/Oz +L6KQv0zWwwgzL24RFOHVYmohQPCpAdr2aJoRkcGBJzIDxpdGJn3oLmzmxqT/pTTswbZ4Goy9nFgz p0xQYD+aznQUG+Q7dThzxepKdH8YXrUAkwffHIl62DUwxgTEhNuQ1RqnVkTvlvG2DBqSOhZxHwlJ7 eZjLYA/aVI8ctyW0txodD8KcGXv8R5JlgJdbJTfn8oPzzV9M19ihIig2F6h0N1iSUI3S35icpf4VU hBlnO1DbXKMWmlC/VMwmUbmSYTwLF5cW1YWy9qRkiR2Cb6JLN2pnU4e1W7PLlMVPrDQ8TtKvWEpSn E4/49sEQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jZ-007LpE-Pe; Fri, 04 Feb 2022 19:59:05 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH 56/75] mm/damon: Convert damon_pa_young() to use a folio Date: Fri, 4 Feb 2022 19:58:33 +0000 Message-Id: <20220204195852.1751729-57-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220204195852.1751729-1-willy@infradead.org> References: <20220204195852.1751729-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: smbwpwme338fcfaeehiqt1iojqcjy3st X-Rspam-User: nil Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=U5guoGdW; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 33348140004 X-HE-Tag: 1644004747-130065 Content-Transfer-Encoding: quoted-printable 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: Ensure that we're passing the entire folio to rmap_walk(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/damon/paddr.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index a92d8b146527..05e85a131a49 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -94,6 +94,7 @@ struct damon_pa_access_chk_result { static bool __damon_pa_young(struct page *page, struct vm_area_struct *v= ma, unsigned long addr, void *arg) { + struct folio *folio =3D page_folio(page); struct damon_pa_access_chk_result *result =3D arg; struct page_vma_mapped_walk pvmw =3D { .vma =3D vma, @@ -107,12 +108,12 @@ static bool __damon_pa_young(struct page *page, str= uct vm_area_struct *vma, addr =3D pvmw.address; if (pvmw.pte) { result->accessed =3D pte_young(*pvmw.pte) || - !page_is_idle(page) || + !folio_test_idle(folio) || mmu_notifier_test_young(vma->vm_mm, addr); } else { #ifdef CONFIG_TRANSPARENT_HUGEPAGE result->accessed =3D pmd_young(*pvmw.pmd) || - !page_is_idle(page) || + !folio_test_idle(folio) || mmu_notifier_test_young(vma->vm_mm, addr); result->page_sz =3D ((1UL) << HPAGE_PMD_SHIFT); #else @@ -131,6 +132,7 @@ static bool __damon_pa_young(struct page *page, struc= t vm_area_struct *vma, =20 static bool damon_pa_young(unsigned long paddr, unsigned long *page_sz) { + struct folio *folio; struct page *page =3D damon_get_page(PHYS_PFN(paddr)); struct damon_pa_access_chk_result result =3D { .page_sz =3D PAGE_SIZE, @@ -145,27 +147,28 @@ static bool damon_pa_young(unsigned long paddr, uns= igned long *page_sz) =20 if (!page) return false; + folio =3D page_folio(page); =20 - if (!page_mapped(page) || !page_rmapping(page)) { - if (page_is_idle(page)) + if (!folio_mapped(folio) || !folio_raw_mapping(folio)) { + if (folio_test_idle(folio)) result.accessed =3D false; else result.accessed =3D true; - put_page(page); + folio_put(folio); goto out; } =20 - need_lock =3D !PageAnon(page) || PageKsm(page); - if (need_lock && !trylock_page(page)) { - put_page(page); + need_lock =3D !folio_test_anon(folio) || folio_test_ksm(folio); + if (need_lock && !folio_trylock(folio)) { + folio_put(folio); return NULL; } =20 - rmap_walk(page, &rwc); + rmap_walk(&folio->page, &rwc); =20 if (need_lock) - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); =20 out: *page_sz =3D result.page_sz; --=20 2.34.1