FAILED: patch "[PATCH] mm/damon/stat: monitor all System RAM resources" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 84481e705ab07ed46e56587fe846af194acacafe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026032915-elastic-replay-88fe@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 84481e705ab07ed46e56587fe846af194acacafe Mon Sep 17 00:00:00 2001
From: SeongJae Park <[email protected]>
Date: Mon, 16 Mar 2026 16:51:17 -0700
Subject: [PATCH] mm/damon/stat: monitor all System RAM resources
DAMON_STAT usage document (Documentation/admin-guide/mm/damon/stat.rst) says it monitors the system's entire physical memory. But, it is monitoring only the biggest System RAM resource of the system. When there are multiple System RAM resources, this results in monitoring only an unexpectedly small fraction of the physical memory. For example, suppose the system has a 500 GiB System RAM, 10 MiB non-System RAM, and 500 GiB System RAM resources in order on the physical address space. DAMON_STAT will monitor only the first 500 GiB System RAM. This situation is particularly common on NUMA systems.
Select a physical address range that covers all System RAM areas of the system, to fix this issue and make it work as documented.
mm/damon/stat.c +50 -3
@@ -145,12 +145,59 @@ static int damon_stat_damon_call_fn(void *data)return 0 ; } +struct damon_stat_system_ram_range_walk_arg { +bool walked; +struct resource res; +}; + +static int damon_stat_system_ram_walk_fn (struct resource *res,void *arg) +{ +struct damon_stat_system_ram_range_walk_arg *a = arg; + +if (!a->walked) { + a->walked = true; + a->res.start = res->start; + } + a->res.end = res->end; +return 0 ; +} + +static unsigned long damon_stat_res_to_core_addr (resource_size_t ra, +unsigned long addr_unit) +{ +/* +* Use div_u64() for avoiding linking errors related with __udivdi3, +* __aeabi_uldivmod, or similar problems. This should also improve the +* performance optimization (read div_u64() comment for the detail). +*/ +if (sizeof (ra) ==8 &&sizeof (addr_unit) ==4 ) +return div_u64 (ra, addr_unit); +return ra / addr_unit; +} + +static int damon_stat_set_monitoring_region (struct damon_target *t, +unsigned long addr_unit,unsigned long min_region_sz) +{ +struct damon_addr_range addr_range; +struct damon_stat_system_ram_range_walk_arg arg = {}; + +walk_system_ram_res (0 ,-1 , &arg, damon_stat_system_ram_walk_fn); +if (!arg.walked) +return -EINVAL ; + addr_range.start =damon_stat_res_to_core_addr ( + arg.res.start, addr_unit); + addr_range.end =damon_stat_res_to_core_addr ( + arg.res.end +1 , addr_unit); +if (addr_range.end <= addr_range.start) +return -EINVAL ; +return damon_set_regions (t, &addr_range,1 , min_region_sz); +} +static struct damon_ctx *damon_stat_build_ctx (void ) {struct damon_ctx *ctx;struct damon_attrs attrs;struct damon_target *target; -unsigned long start =0 , end =0 ; ctx =damon_new_ctx ();if (!ctx)
@@ -180,8 +227,8 @@ static struct damon_ctx *damon_stat_build_ctx(void)if (!target) goto free_out;damon_add_target (ctx, target); -if (damon_set_region_biggest_system_ram_default (target, &start, &end, - ctx->min_region_sz)) +if (damon_stat_set_monitoring_region (target, ctx->addr_unit, + ctx->min_region_sz)) goto free_out;return ctx; free_out:
SeongJae Park
maintainerPATCH 1/1 mm/damon/stat: monitor all System RAM resources
DAMON_STAT usage document (Documentation/admin-guide/mm/damon/stat.rst) says it monitors the system's entire physical memory. But, it is monitoring only the biggest System RAM resource of the system. When there are multiple System RAM resources, this results in monitoring only an unexpectedly small fraction of the physical memory. For example, suppose the system has a 500 GiB System RAM, 10 MiB non-System RAM, and 500 GiB System RAM resources in order on the physical address space. DAMON_STAT will monitor only the first 500 GiB System RAM. This situation is particularly common on NUMA systems.
Select a physical address range that covers all System RAM areas of the system, to fix this issue and make it work as documented.
--- mm/damon/stat.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
mm/damon/stat.c +34 -2
@@ -145,12 +145,44 @@ static int damon_stat_damon_call_fn(void *data)return 0 ; } +struct damon_stat_system_ram_range_walk_arg { +bool walked; +struct resource res; +}; + +static int damon_stat_system_ram_walk_fn (struct resource *res,void *arg) +{ +struct damon_stat_system_ram_range_walk_arg *a = arg; + +if (!a->walked) { + a->walked = true; + a->res.start = res->start; + } + a->res.end = res->end; +return 0 ; +} + +static int damon_stat_set_monitoring_region (struct damon_target *t, +unsigned long addr_unit) +{ +struct damon_addr_range addr_range; +struct damon_stat_system_ram_range_walk_arg arg = {}; + +walk_system_ram_res (0 ,ULONG_MAX , &arg, damon_stat_system_ram_walk_fn); +if (!arg.walked) +return -EINVAL ; + addr_range.start = arg.res.start; + addr_range.end = arg.res.end +1 ; +if (addr_range.end <= addr_range.start) +return -EINVAL ; +return damon_set_regions (t, &addr_range,1 ,DAMON_MIN_REGION ); +} +static struct damon_ctx *damon_stat_build_ctx (void ) {struct damon_ctx *ctx;struct damon_attrs attrs;struct damon_target *target; -unsigned long start =0 , end =0 ; ctx =damon_new_ctx ();if (!ctx)
@@ -188,7 +220,7 @@ static struct damon_ctx *damon_stat_build_ctx(void)if (!target) goto free_out;damon_add_target (ctx, target); -if (damon_set_region_biggest_system_ram_default (target, &start, &end)) +if (damon_stat_set_monitoring_region (target, ctx->addr_unit)) goto free_out;return ctx; free_out:
Signature · 1 line
2.47.3