From patchwork Fri Feb 7 21:20:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13965855 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 AEDCCC02196 for ; Fri, 7 Feb 2025 21:20:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A98C5280004; Fri, 7 Feb 2025 16:20:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D520280001; Fri, 7 Feb 2025 16:20:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 825C8280004; Fri, 7 Feb 2025 16:20:44 -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 619D5280001 for ; Fri, 7 Feb 2025 16:20:44 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BE09AA054F for ; Fri, 7 Feb 2025 21:20:43 +0000 (UTC) X-FDA: 83094417966.12.138630A Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf17.hostedemail.com (Postfix) with ESMTP id 1C9934000F for ; Fri, 7 Feb 2025 21:20:41 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fsdU3gjN; spf=pass (imf17.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738963242; a=rsa-sha256; cv=none; b=cdZ3y5D76sEOrsB6EFsHN7n4VRGp8fDYCzXUWrVvkNMGCDyErfoZ6UpJUgu0EvlWm+8N/Z SWXRmdWuvd9o+aMn/OybTUOFCgSDoL6Dsg/mK2l9pxtKDimvGNKW78fLz7YbZtbPHGQsbB SYnZPEEi4qPZ+uHT+5lvnTxv1NqlU5A= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fsdU3gjN; spf=pass (imf17.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738963242; 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=wVc7UjchyLnT12fk0LKrqIwV0YXlJpB5P2pQtFIRz2A=; b=xERCQyr27Aj5Et0kopjUxU3Ou57t/oCnRT/Ty8BV3QdijUM+jcC5akDRIGE4oFa8IqqaXR Q78ngLAGGkxRJIRabgzdKPoDWvPO2Jw7MfTCq5IWgSQmKJg0k+Mfzk68ppG+YSVBBn68HF EcqS+Q9DLs67EjrnoaasxUGeGzt/EaI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 7412DA43CA1; Fri, 7 Feb 2025 21:18:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4B9DC4CEE4; Fri, 7 Feb 2025 21:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738963241; bh=fyST1HHL6q047gB18uKbWH4029DtMjp2p7R3Opvgd7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fsdU3gjNMTuUnmQTkW1xAAT5TFFwXAoonivQvChRLfq+mJd3OPoHqQzNm5fBtIriI iTVfvestb/Xi8dhUqc8z7FMr/r1QkgUzUzSYpu19+ZmlsgvIEYsTExs65tzSFrKZl9 9bjYO2ZMXgaM0pmvOTHYHHVorxI6I5mowQSrhWPp8RacrQNqfWzQJOMmeZ4fpIObjv qKFPX9PYmbBPqAIWdJ0RU/QB4FJ3RYQAEngzGmiIjb3hfd7cljcRFbxhaUj79y2GJN X0U2soxDxFlnIXTIDyZ4KVpuivdhVUkYx8xtwE26faz03XyNC0Q14yKHywgwwbpbiH /HwVAArSqXyTg== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , Usama Arif , damon@lists.linux.dev, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org Subject: [PATCH 2/2] mm/damon: avoid applying DAMOS action to same entity multiple times Date: Fri, 7 Feb 2025 13:20:33 -0800 Message-Id: <20250207212033.45269-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207212033.45269-1-sj@kernel.org> References: <20250207212033.45269-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1C9934000F X-Stat-Signature: c6ifdxre63pjw34fuyj1ffy65fzx4jc5 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1738963241-867809 X-HE-Meta: U2FsdGVkX199OiGNCpUk3Lcw2DPYf6hsnwe4WpMB16UNH3+MNbhdAtyhMk/04lJ+MeLtafw4UIazvUkyIDhSvfrRWAKlbxdTuUM7glX8OrqXE0mgsBw5OEtmXyAK4jrmXHvqNZozaNb3PX5K21CIkEHqq8A2w+5XOnls+jxRdUWa+JCS5w2rtIGisd0Z7+sYfuU9sgAsPViQYayBb46f32kRXMohEuaKg+XfxNY7MwFhBJ29+Ff2fsXJt454tYf+rFOgOdUb3u0PLKVgPTLgCPlUlLs7PcOndfYQKBp3YpuAUTVRh0f1MnpbNe6l2aELp90zXszGDmBPsXlAfzVlvDThOauaVo6sc2vennBz46v72cPql3MASOnfqQKspL/06jIdaDIW2GKEiryVzqvR1zvGQ4Bq7xXvmHw6FayVcJj14eeR1D92VddK9wvPbmB4tG1iocHJ/XTXlgJMzKLZS4K6nEemvrCyxJ/LuBZsdkA06vNqRxslXmv0mFwoV3ulrn8KqSSb6eBDF7xKdmMz1qbPuWvtLnv0rw8gkauSn/SXagFC8n96SS5tVz4tlCXC8njKxZl6okGDct3xx0eN4BbaA20ZSpIr2LjwmAGYhFT3eV0FuZIDPO1a4i+beaPhreLLEoGruSy5Fv/be2DiBJT4Wns7pUQGksp6YO/7OrH1KcdytYmpiZVnRoKUbPFAo/hql8x4l34PdH3D6vIPo5Z5aYiGl1U+EMc02ahhmv0GzAt1r0/joX6RSHaVIvDDrIY0TtsixhcF74cfzMTb7PPgYZbhNUUlrcj4Kzohx9Cp1EMBjPCdk2S97cb6exzhy+gZv+7x7ExRS5A7QCccAB8p4tl7iLN6XM2cRSD/kQUSemPqhvyvgeSgPMiUycoIiv6GBXsIZcc7MrTtwM8eSlxZAZGPkEsPdNUR6z8X+APlGarB3lC6l9Oq3Z+Ftc5+Pqvaf4jmHhTLweGXxpc 6XcetS9O LhyyQW9t5o5FaIycGUPeDdJ4sy3elj2tvx+jNweuRF5scKQOPAgovuvgaUqyeN260Gl8x3QosLU/d8bQaTZnqZjHwZ3V2bRfdO4B4sFqpVNhbFW8XDrU3Uv3+3xHx8S9f38MI1uFKTbCt9XdJ2tcfAPeIBnlLa349gYTkbfg4V0hdLX6iOtKb3lp7QNzvE6BiltFsuPpJDpXtJFlOonDfDHZexs49kT0/Mom88M2E4aZXQSn/+VL7jZHTDTVNQc9s3ezD 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: List-Subscribe: List-Unsubscribe: 'paddr' DAMON operations set can apply a DAMOS scheme's action to a large folio multiple times in single DAMOS-regions-walk if the folio is laid on multiple DAMON regions. Add a field for DAMOS scheme object that can be used by the underlying ops to know what was the last entity that the scheme's action has applied. The core layer unsets the field when each DAMOS-regions-walk is done for the given scheme. And update 'paddr' ops to use the infrastructure to avoid the problem. Fixes: 57223ac29584 ("mm/damon/paddr: support the pageout scheme") Cc: Reported-by: Usama Arif Closes: https://lore.kernel.org/20250203225604.44742-3-usamaarif642@gmail.com Signed-off-by: SeongJae Park --- include/linux/damon.h | 11 +++++++++++ mm/damon/core.c | 1 + mm/damon/paddr.c | 39 +++++++++++++++++++++++++++------------ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index af525252b853..a390af84cf0f 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -432,6 +432,7 @@ struct damos_access_pattern { * @wmarks: Watermarks for automated (in)activation of this scheme. * @target_nid: Destination node if @action is "migrate_{hot,cold}". * @filters: Additional set of &struct damos_filter for &action. + * @last_applied: Last @action applied ops-managing entity. * @stat: Statistics of this scheme. * @list: List head for siblings. * @@ -454,6 +455,15 @@ struct damos_access_pattern { * implementation could check pages of the region and skip &action to respect * &filters * + * The minimum entity that @action can be applied depends on the underlying + * &struct damon_operations. Since it may not be aligned with the core layer + * abstract, namely &struct damon_region, &struct damon_operations could apply + * @action to same entity multiple times. Large folios that underlying on + * multiple &struct damon region objects could be such examples. The &struct + * damon_operations can use @last_applied to avoid that. DAMOS core logic + * unsets @last_applied when each regions walking for applying the scheme is + * finished. + * * After applying the &action to each region, &stat_count and &stat_sz is * updated to reflect the number of regions and total size of regions that the * &action is applied. @@ -477,6 +487,7 @@ struct damos { int target_nid; }; struct list_head filters; + void *last_applied; struct damos_stat stat; struct list_head list; }; diff --git a/mm/damon/core.c b/mm/damon/core.c index c7b981308862..1a4dd644949b 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -1851,6 +1851,7 @@ static void kdamond_apply_schemes(struct damon_ctx *c) s->next_apply_sis = c->passed_sample_intervals + (s->apply_interval_us ? s->apply_interval_us : c->attrs.aggr_interval) / sample_interval; + s->last_applied = NULL; } } diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 0fb61f6ddb8d..d64c6fe28667 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -243,6 +243,17 @@ static bool damos_pa_filter_out(struct damos *scheme, struct folio *folio) return false; } +static bool damon_pa_invalid_damos_folio(struct folio *folio, struct damos *s) +{ + if (!folio) + return true; + if (folio == s->last_applied) { + folio_put(folio); + return true; + } + return false; +} + static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s, unsigned long *sz_filter_passed) { @@ -250,6 +261,7 @@ static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s, LIST_HEAD(folio_list); bool install_young_filter = true; struct damos_filter *filter; + struct folio *folio; /* check access in page level again by default */ damos_for_each_filter(filter, s) { @@ -268,9 +280,8 @@ static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s, addr = r->ar.start; while (addr < r->ar.end) { - struct folio *folio = damon_get_folio(PHYS_PFN(addr)); - - if (!folio) { + folio = damon_get_folio(PHYS_PFN(addr)); + if (damon_pa_invalid_damos_folio(folio, s)) { addr += PAGE_SIZE; continue; } @@ -296,6 +307,7 @@ static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s, damos_destroy_filter(filter); applied = reclaim_pages(&folio_list); cond_resched(); + s->last_applied = folio; return applied * PAGE_SIZE; } @@ -304,12 +316,12 @@ static inline unsigned long damon_pa_mark_accessed_or_deactivate( unsigned long *sz_filter_passed) { unsigned long addr, applied = 0; + struct folio *folio; addr = r->ar.start; while (addr < r->ar.end) { - struct folio *folio = damon_get_folio(PHYS_PFN(addr)); - - if (!folio) { + folio = damon_get_folio(PHYS_PFN(addr)); + if (damon_pa_invalid_damos_folio(folio, s)) { addr += PAGE_SIZE; continue; } @@ -328,6 +340,7 @@ static inline unsigned long damon_pa_mark_accessed_or_deactivate( addr += folio_size(folio); folio_put(folio); } + s->last_applied = folio; return applied * PAGE_SIZE; } @@ -471,12 +484,12 @@ static unsigned long damon_pa_migrate(struct damon_region *r, struct damos *s, { unsigned long addr, applied; LIST_HEAD(folio_list); + struct folio *folio; addr = r->ar.start; while (addr < r->ar.end) { - struct folio *folio = damon_get_folio(PHYS_PFN(addr)); - - if (!folio) { + folio = damon_get_folio(PHYS_PFN(addr)); + if (damon_pa_invalid_damos_folio(folio, s)) { addr += PAGE_SIZE; continue; } @@ -495,6 +508,7 @@ static unsigned long damon_pa_migrate(struct damon_region *r, struct damos *s, } applied = damon_pa_migrate_pages(&folio_list, s->target_nid); cond_resched(); + s->last_applied = folio; return applied * PAGE_SIZE; } @@ -512,15 +526,15 @@ static unsigned long damon_pa_stat(struct damon_region *r, struct damos *s, { unsigned long addr; LIST_HEAD(folio_list); + struct folio *folio; if (!damon_pa_scheme_has_filter(s)) return 0; addr = r->ar.start; while (addr < r->ar.end) { - struct folio *folio = damon_get_folio(PHYS_PFN(addr)); - - if (!folio) { + folio = damon_get_folio(PHYS_PFN(addr)); + if (damon_pa_invalid_damos_folio(folio, s)) { addr += PAGE_SIZE; continue; } @@ -530,6 +544,7 @@ static unsigned long damon_pa_stat(struct damon_region *r, struct damos *s, addr += folio_size(folio); folio_put(folio); } + s->last_applied = folio; return 0; }