From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f170.google.com (mail-dy1-f170.google.com [74.125.82.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEAF03F210C for ; Wed, 1 Jul 2026 11:47:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782906458; cv=none; b=P4DTOiMI8NycSBtAawxOGEFGMbfK7SBuBZMo51aAfIyrnybTYSDsloOrg6OHrcppR8tv8gJzv8ebC1ITA+H+FyobRpLwehtAQwJK+b9cuQqXE9S1Zr8cG84tjKtbjWUr6wBhqaTZaghnjcKLzc5hgXO7RokjR7dkdRYcPHoGZ3E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782906458; c=relaxed/simple; bh=2vAz1Pl6ji0h4kj5zdzc1WH8+uzU4qkb4LztP5YMcqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O2rjuAR8pF8KI+Njc8zq5ShaQlrzThMe7O/M7OPI5NQFAHJaBIYvEeG7vnB8wzvTWvRwdca56eBjltI0NYrOl86Kvlem6T1k7RdYToG0UIsSgD8BOcrYLYQbdZVYvph1ubvlYpxgFZc/i9+s5egTc67XJAgmBIAU4iHQorppqhU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=A6FiJcdr; arc=none smtp.client-ip=74.125.82.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="A6FiJcdr" Received: by mail-dy1-f170.google.com with SMTP id 5a478bee46e88-30cac93dfd7so1322380eec.1 for ; Wed, 01 Jul 2026 04:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782906456; x=1783511256; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X6atn2MDoT9tTt/oDby2aqEaUDrPUuFD6g1qMrGDKd0=; b=A6FiJcdrnYeFQj2drOpdLXZZ1APuv/sARzyMi5Na9ODWepj89rJy8SQ3/ctDCLcXE7 hiogdySEvrqI6ys2hFasJpo44tu7ZOuoF97EwUbRxPwQjGKVT6qnOw3yZGqnVXuAZmUc slhZf99OAYDSJ9eF2GPQ753ZRZ+kruuj9fCNb9wMVjLsDXiGH0vKac1oRLw4mXQgr6r0 W18gbsKUD9Scng5G1j43JQL3dNxEOUeAsOY8vNz6sZOtpkjtRKieTfk65Wjd8thvIMME I2TA+k0AG7MgQuURsSQAoJSq5nS8G9QIvb0o30f/mMGCFUoNa9LnGqDsP3ZsX1pk6lVI XkvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782906456; x=1783511256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=X6atn2MDoT9tTt/oDby2aqEaUDrPUuFD6g1qMrGDKd0=; b=V5itRZp8Td0yoLzqE1Qu8SUrHN0THVAmtQRjQs9KUpVBjLZIlT4jc2ZgfaMhmuQuvI +KGCci3u1SMq4yb6AAhx61nel0kTZ18rQw1aobjGnFMVdGdQ3cF6lTVNcXjF/nl0PloI a/jSYWsU2vLEJAbQ3QOoHgz1dALpFfXxcTwb1SoLFZp6fOfV30OUugmoLA92ATmLRKYF ClvBqdHXKiwdZmCewigWdutGVAgokc4SWDZLGvkAQUH/t61DVzKSdCDfLtHcO4NSSUK6 lp80VDD2Zv1qq/DNoC57StnnGeiMc5O8W4o/F7gY/hD73emXvG5HuwDmhW9bsvj6jt4l 8yig== X-Gm-Message-State: AOJu0YydRHW7AtZQdZcPrL8JZVNCyfY/u9MQn8gYkZmtczOyiTBNtTmr E1YFXbXe98efoG+fFDShL29wnrpDHhHleJ/1dAkiGJ/o1Mfttbs6TAmP X-Gm-Gg: AfdE7cl45W5qJVWWLlprU1lYNCU8TYMp/BDmFSlEYA6AVOfMseEO77y+6MMqFZFoZKB Vd+uL8r0Te8D8PrJ3A23nUrlZC8e15ukpril6GFKF9b5c/xeM8vYRFz/i02r+kER/Etb5tJfDMF hK7a3INdlhwo2k2WjG6P0NlR36A0r3a3AdKgkerk5kIULMP9xr3gim61L5itP7qrXpGehkFHV06 UYtR+DKDcQ5b/aH+yq6tHsJ0qxNoIVX5qiAOS5L0K6bgRMmSq3f9mfnB2CCjd4tv3Mj2ycJUe/v ImSJseDbC637IVQSjhpiiuxR+Ygk7hT/wEx/paJLjjILTewayyykSz8K856+Rm19KdSLB2SDLPZ tHxs9WAVmUylfWlok79o5B0oQzBtixlQyGrRchce9HuF08HJfl927P8C+9lr4p41Xxc02MCFYyO 2Dag== X-Received: by 2002:a05:7301:1001:b0:2d9:db50:c6ce with SMTP id 5a478bee46e88-30efe6d53d7mr1600277eec.3.1782906455878; Wed, 01 Jul 2026 04:47:35 -0700 (PDT) Received: from localhost.localdomain ([2607:f130:0:11a::31]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30ee327cea7sm22518169eec.31.2026.07.01.04.47.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 01 Jul 2026 04:47:35 -0700 (PDT) From: wang lian To: damon@lists.linux.dev, linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, sj@kernel.org, gutierrez.asier@huawei-partners.com, daichaobing@sangfor.com.cn, lianux.wang@processmission.com, Wang Lian , Kunwu Chan Subject: [PATCH v2 3/5] mm/damon/vaddr: implement mTHP-aware DAMOS_COLLAPSE handler Date: Wed, 1 Jul 2026 19:47:14 +0800 Message-ID: <20260701114716.56503-4-lianux.mm@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260701114716.56503-1-lianux.mm@gmail.com> References: <20260701114716.56503-1-lianux.mm@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wang Lian When target_order is set (non-zero), the DAMOS_COLLAPSE handler now calls damon_collapse_folio_range() to collapse pages into the requested mTHP size, iterating over the target region in order-aligned chunks. When target_order is 0 (default), the existing madvise(MADV_COLLAPSE) path is used, preserving backwards compatibility. Region boundaries are expanded outward to the covering aligned range (ALIGN_DOWN start, ALIGN end) so that collapse works even after kdamond_split_regions reduces region sizes below the chunk size. collapse_huge_page() internally validates VMA bounds, so expanding beyond the original region is safe. No external mmap lock is held: collapse_huge_page() acquires mmap_read_lock internally for validation, releases it, then acquires mmap_write_lock for the actual collapse. Holding an outer mmap_read_lock would cause a self-deadlock when the same thread attempts the inner mmap_write_lock. Co-developed-by: Kunwu Chan Signed-off-by: Kunwu Chan Signed-off-by: Wang Lian Signed-off-by: Wang Lian --- mm/damon/vaddr.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index d27147603564..2a3757c13bf0 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "../internal.h" #include "ops-common.h" @@ -899,6 +900,40 @@ static unsigned long damos_va_stat(struct damon_target *target, return 0; } +static unsigned long damos_va_collapse(struct damon_target *target, + struct damon_region *r, struct damos *s, + unsigned long *sz_filter_passed) +{ + unsigned long addr, end, chunk_sz; + unsigned int target_order = s->target_order; + unsigned long applied = 0; + struct mm_struct *mm; + int ret; + + if (target_order < 2 || target_order > HPAGE_PMD_ORDER) + return 0; + + chunk_sz = PAGE_SIZE << target_order; + addr = ALIGN_DOWN(r->ar.start, chunk_sz); + end = ALIGN(r->ar.end, chunk_sz); + + mm = damon_get_mm(target); + if (!mm) + return 0; + + while (addr < end) { + ret = damon_collapse_folio_range(mm, addr, target_order); + if (!ret) + applied += chunk_sz; + *sz_filter_passed += chunk_sz; + addr += chunk_sz; + cond_resched(); + } + + mmput(mm); + return applied; +} + static unsigned long damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, struct damon_region *r, struct damos *scheme, unsigned long *sz_filter_passed) @@ -922,6 +957,9 @@ static unsigned long damon_va_apply_scheme(struct damon_ctx *ctx, madv_action = MADV_NOHUGEPAGE; break; case DAMOS_COLLAPSE: + if (scheme->target_order) + return damos_va_collapse(t, r, scheme, + sz_filter_passed); madv_action = MADV_COLLAPSE; break; case DAMOS_MIGRATE_HOT: -- 2.50.1 (Apple Git-155)