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 3FF39C433EF for ; Fri, 4 Feb 2022 20:22:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44D868D0012; Fri, 4 Feb 2022 15:21:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D5B38D0007; Fri, 4 Feb 2022 15:21:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 279758D0012; Fri, 4 Feb 2022 15:21:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0170.hostedemail.com [216.40.44.170]) by kanga.kvack.org (Postfix) with ESMTP id 0DAAB8D0007 for ; Fri, 4 Feb 2022 15:21:44 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C57E318270826 for ; Fri, 4 Feb 2022 20:21:43 +0000 (UTC) X-FDA: 79106218086.05.FC43EFD Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 4290320002 for ; Fri, 4 Feb 2022 20:21:43 +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=tAlp5bd8C5vytOPTINuNcDJ98zbTyIQpNVjwT2Tt/6A=; b=VzvZxECHLB/Uio/a0kGT0n1wKi XfS2JeQAwVBSHV1/WcPaX2OKMrvxbs6Vj9hGGbVRRRSyTQ/0CwUDZl0SuMK7nAMgOnKjUlOg7lB8I SF2ZQJdXalWrBS51TbMUaI56SLX/PawfBZT8WbCWkMoQypG8hGz1t6dwvYfh+x7bk8Rv3amiGjDlw RoQ6DK8yHxHRMyPya4oNTvGUxr9lER8u1dBh/eflBwD6d7lxHwRoRco1bcwTf29ecRsPSQhDetj6N +QkMd7GAA5MIr63Q+6AnEG12vG9FtB2OXbuYxGYlRIXxpZqWHLoYGDawW92/rb2pgAfD23aLIBMcM D8D2GJWA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jZ-007Lp6-KP; 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 55/75] mm/damon: Convert damon_pa_mkold() to use a folio Date: Fri, 4 Feb 2022 19:58:32 +0000 Message-Id: <20220204195852.1751729-56-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-Rspam-User: nil X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 4290320002 X-Stat-Signature: tm7yy1un9tj7yxuoo83gfbgkhc5megjn Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VzvZxECH; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1644006103-838643 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 4e27d64abbb7..a92d8b146527 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -37,6 +37,7 @@ static bool __damon_pa_mkold(struct page *page, struct = vm_area_struct *vma, =20 static void damon_pa_mkold(unsigned long paddr) { + struct folio *folio; struct page *page =3D damon_get_page(PHYS_PFN(paddr)); struct rmap_walk_control rwc =3D { .rmap_one =3D __damon_pa_mkold, @@ -46,23 +47,24 @@ static void damon_pa_mkold(unsigned long paddr) =20 if (!page) return; + folio =3D page_folio(page); =20 - if (!page_mapped(page) || !page_rmapping(page)) { - set_page_idle(page); + if (!folio_mapped(folio) || !folio_raw_mapping(folio)) { + folio_set_idle(folio); goto out; } =20 - need_lock =3D !PageAnon(page) || PageKsm(page); - if (need_lock && !trylock_page(page)) + need_lock =3D !folio_test_anon(folio) || folio_test_ksm(folio); + if (need_lock && !folio_trylock(folio)) goto out; =20 - rmap_walk(page, &rwc); + rmap_walk(&folio->page, &rwc); =20 if (need_lock) - unlock_page(page); + folio_unlock(folio); =20 out: - put_page(page); + folio_put(folio); } =20 static void __damon_pa_prepare_access_check(struct damon_ctx *ctx, --=20 2.34.1