From patchwork Mon Jan 9 21:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13094368 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 CCD4FC54EBE for ; Mon, 9 Jan 2023 21:33:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E36BD8E0001; Mon, 9 Jan 2023 16:33:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DC084900002; Mon, 9 Jan 2023 16:33:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BEBE18E0008; Mon, 9 Jan 2023 16:33:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A877F8E0001 for ; Mon, 9 Jan 2023 16:33:51 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 820CE41020 for ; Mon, 9 Jan 2023 21:33:51 +0000 (UTC) X-FDA: 80336563062.08.AA2E7B6 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id F2B741C000A for ; Mon, 9 Jan 2023 21:33:49 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CkayMLf4; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673300030; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=N0iiOREKjAiI6kLAk02vCa4VECye4nwxU8RPiP9HoGQ=; b=8HaGdXo9tPw32HCcPN8+ro0Dbgx9F0urHr7civuzoBnZ4o6iJnFg+7LwtRI6E3DJ7DwTSM OCrc1eSGIkYzwBPK7wMFhXbteMnqAjvcYkda5TCkrLawD8C/qlMPCR9AjjP1S54DBVa9y8 SzD9v9y1kceM3sy+jrhTaTZW6uzTSF4= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CkayMLf4; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673300030; a=rsa-sha256; cv=none; b=l1YkEyAULKhu4XCPtYNRpXNutx1EknxvGWG+VoEvbhi+X9l1TpHn3Cluus7VeOzVN/2drP 4iA9PFhXUO26B7lh4B6gYpJFCpDAhyzE8/txy7C7fb9EWXh7d7EDQ9CFthegDyCyUOpWhw oYIrRBmpUKf9K3YQl+VDE9/cTmcpzL8= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0F82561448; Mon, 9 Jan 2023 21:33:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3813C433F2; Mon, 9 Jan 2023 21:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673300028; bh=CFEeibNvvYAHsooB/GZxZzGLeG1gUo5uWWp85VJYZOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CkayMLf4IhwPE5yfzgDGZfwtnsgWnvEkfeAXD5O25NOF846s/PGNbZIBST+o9XJfu YTzFb7YVkNVDpiaxedFNYwJ5bGBdaSZlzL0dJifZseNQaZ9fVWqVQmyDdHhV+vKXja HASc/1EM1sgLdlweKLpxJWF0NKPshrKc8IjLEngSJK+LCP2VWTSJxuduVYw99ul/ij NzCuJU0/oB5GhgMqwXkr0/VEu2XMLuavwrhnAr0bYcTbsg9oa3xyQuy7Jd7rGl+BIG b/Aw174M8zeE6Hi9q4YH1GA+PwK7bX+GynKfII38j5rrg51mvQfOX0XcBjXRTshqIX 7XmdlB/xwMVHg== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] mm/damon/paddr: rename 'damon_pa_access_chk_result->page_sz' to 'folio_sz' Date: Mon, 9 Jan 2023 21:33:33 +0000 Message-Id: <20230109213335.62525-5-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230109213335.62525-1-sj@kernel.org> References: <20230109213335.62525-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: F2B741C000A X-Rspam-User: X-Stat-Signature: 35jg48xrwib9tk3uf3894r3ekb8ez9dw X-HE-Tag: 1673300029-539408 X-HE-Meta: U2FsdGVkX189EQfJwZHXSaMFFhNoExlQ0hR9ebUJIA/yXXMEDoxy0uNAIj6ymgbJ0PLNw3QxomANrbjKjXbWBzco8WA+elsQt3hmzQ2KwRdBpm8yFA1l6M6Tv6e8d+Dz6bPBpg7nG5seN55y3FfW6aAaBOfLCQfClLg6qHe/f48uDhF7IUoYw9tlXUOpTA8E653FCosN8uQ1kD97b8Se00hpc6nWuxg/VsNKlq+XKWebGWFxZOOxN0B8SFzPAy/FiCLvspgiFQh7+Ymzf+TYd4pxhY/U3tUt17r1Dm5EPunQXQqXiqpvc+bAIb3O8KGYyomv6KYW9i+YM0TMo/3xnvxL3QLMoiqAnXkcFT/G05/zoQ+AKEUrvqbI5zDXqVjho45TjVUwzUCBmSLFuV/KZf6iHQq+3i96MEfwKTBhNhntebB2dTJCrpWAjwSEqId8H7xxOU4bKpWso3kKtXLP59zOA0q6pA0NHD5aFwXqZUOysv4LOBUbiRE4jj1x0OTWZv3Lypyk70tG6LjEgqeHvBui8u1U4/2/Bd6qmoD3N/+wpldw5k1EFURql32CXuRg5itocvUQuduF7COGmQOW7y1opS0tT4Dpzmt2wRvoENv/jwvHgFWlvJxtft+EiVXzOLBw002zBefqQ3rQlexAOZT285ujzvhgPT8tIud2wY584SABvYf2kxGpzuaJ8snRtG6R+SiBuPoCKByf/vq+UnP1fBNWXkG9vkbEcF7biCT7nD6VeGz+r1AV91zgrMV+SNUDrDBdVrJtvNCie8Rz1BLJm9I07Gd6CRD+Lz1F1qB4mmZZQHTXfe+qVeSiLgmVEKK/S37QJYIBw4pGg6sv0LAwOGSN8fZKV5Mhn5gaLV3E3oea9X5Pv/xwEBPwmAGOWYoTZEmV4UMMMU+0atok2fRY947Trdqu1XCgGlCueziw5xR8GsZWJfc409tiX6W7tT0631gdBGmWMBpGgl7 0ai+MRz8 DJC6Lub5eJ/luxGMlywPkAPHTqBOaaVb67USqNLP/ijTwhy+c0YnL4Il1gLkRZ4lNq77YJdjlG1ZcO+Bd856TwLYT/Z3SYvzGTvsstr8rv6a/voFrn09bwPrM7g== 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: DAMON's physical address space monitoring operations set is using folio now. Rename 'damon_pa_access_chk_result->page_sz' to reflect the fact. Signed-off-by: SeongJae Park --- mm/damon/paddr.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 99d4c357ef2b..65c1e0f91535 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -80,7 +80,8 @@ static void damon_pa_prepare_access_checks(struct damon_ctx *ctx) } struct damon_pa_access_chk_result { - unsigned long page_sz; + /* size of the folio for the access checked physical memory address */ + unsigned long folio_sz; bool accessed; }; @@ -91,7 +92,7 @@ static bool __damon_pa_young(struct folio *folio, struct vm_area_struct *vma, DEFINE_FOLIO_VMA_WALK(pvmw, folio, vma, addr, 0); result->accessed = false; - result->page_sz = PAGE_SIZE; + result->folio_sz = PAGE_SIZE; while (page_vma_mapped_walk(&pvmw)) { addr = pvmw.address; if (pvmw.pte) { @@ -103,7 +104,7 @@ static bool __damon_pa_young(struct folio *folio, struct vm_area_struct *vma, result->accessed = pmd_young(*pvmw.pmd) || !folio_test_idle(folio) || mmu_notifier_test_young(vma->vm_mm, addr); - result->page_sz = HPAGE_PMD_SIZE; + result->folio_sz = HPAGE_PMD_SIZE; #else WARN_ON_ONCE(1); #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ @@ -118,11 +119,11 @@ static bool __damon_pa_young(struct folio *folio, struct vm_area_struct *vma, return !result->accessed; } -static bool damon_pa_young(unsigned long paddr, unsigned long *page_sz) +static bool damon_pa_young(unsigned long paddr, unsigned long *folio_sz) { struct folio *folio = damon_get_folio(PHYS_PFN(paddr)); struct damon_pa_access_chk_result result = { - .page_sz = PAGE_SIZE, + .folio_sz = PAGE_SIZE, .accessed = false, }; struct rmap_walk_control rwc = { @@ -157,25 +158,25 @@ static bool damon_pa_young(unsigned long paddr, unsigned long *page_sz) folio_put(folio); out: - *page_sz = result.page_sz; + *folio_sz = result.folio_sz; return result.accessed; } static void __damon_pa_check_access(struct damon_region *r) { static unsigned long last_addr; - static unsigned long last_page_sz = PAGE_SIZE; + static unsigned long last_folio_sz = PAGE_SIZE; static bool last_accessed; /* If the region is in the last checked page, reuse the result */ - if (ALIGN_DOWN(last_addr, last_page_sz) == - ALIGN_DOWN(r->sampling_addr, last_page_sz)) { + if (ALIGN_DOWN(last_addr, last_folio_sz) == + ALIGN_DOWN(r->sampling_addr, last_folio_sz)) { if (last_accessed) r->nr_accesses++; return; } - last_accessed = damon_pa_young(r->sampling_addr, &last_page_sz); + last_accessed = damon_pa_young(r->sampling_addr, &last_folio_sz); if (last_accessed) r->nr_accesses++;