From patchwork Fri Dec 6 18:16:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13897545 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 97C20E77173 for ; Fri, 6 Dec 2024 18:16:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F1E676B02BA; Fri, 6 Dec 2024 13:16:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ECDBB6B02BB; Fri, 6 Dec 2024 13:16:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D952F6B02BC; Fri, 6 Dec 2024 13:16:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BAA7D6B02BA for ; Fri, 6 Dec 2024 13:16:56 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BA785C1D28 for ; Fri, 6 Dec 2024 18:16:49 +0000 (UTC) X-FDA: 82865339634.26.E80E638 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 89057180012 for ; Fri, 6 Dec 2024 18:16:30 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=P9pxE4Gg; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733508992; a=rsa-sha256; cv=none; b=vf4TXIEbwOWCFEyA2XkdDk/yu1aWwJ23siGhEu0dWlJlxreQn1/wC0HpiIRtDiVQb7JYdC 0I8DULcN9Qmq8yXv4vI4Xoj2kSEYaAT1y44vgANPqZngFJ39LutxdtGjLUFZt+jPOcpX1a TNYOLJ6jsZSxAc3hZmnugN0uARQY3yk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=P9pxE4Gg; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733508992; 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=N50jjB8+84d5yYCbht7ldez4XZXlKV1z7qS1TB7gkto=; b=g1dwphp93MyDKibec0jlu7cjhRir5oiAsu6lSZY9su5KIvtMgu8YWIPt39ODtr42JLH4ib n8Nj86hAf5hoXLACM0jyiqnnDoCbPY8ycraWz8TtC9JyM700+5Tf5Ol2UZYib9lWbkVDXS 0G6EWHREQAIqYmDmjS95ZUPlmgMMWbA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 78A5F5C4D7A; Fri, 6 Dec 2024 18:16:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93C15C4CED1; Fri, 6 Dec 2024 18:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733509006; bh=lGINZh+0lSO+fouVKk+htbdhq62SzZUm82oIXJU7XWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P9pxE4GgBC5HXHNSVIq9zZOVCAgT0XffH+dkwiQCo9OcjFcz3VYBd22OdR6uVr+5f enw4DQK6w6c5vpJpM755jmWxa7h1vwhFJigKEJ3XTjTA2TJwAM+1QNepx2J91ewqvS r3zp0tyMb2A/6ZO2BohYpiUpdtq0C4hxsz+wmmNS0neQn4WOI378HiU6a7+ZPWxt82 xOPq8C3RpxJmNEhpt7vxQ3Odn0qgAgJeMMFJtnGlmYvyze661Umr7QjuywxDukWiNu npq4lU9wNmr2GaB6wN72J0moTvFFmPd0ThX64AawhHw82vOMx1gXKXjNVYytaCZgtm V4IrBTMb4PcBg== From: SeongJae Park To: stable@vger.kernel.org Cc: Zheng Yejian , damon@lists.linux.dev, linux-mm@kvack.org, SeongJae Park , Fernand Sieber , Leonard Foerster , Shakeel Butt , Ye Weihua , Andrew Morton Subject: [PATCH 5.15.y 2/2] mm/damon/vaddr: fix issue in damon_va_evenly_split_region() Date: Fri, 6 Dec 2024 10:16:20 -0800 Message-Id: <20241206181620.91603-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241206181620.91603-1-sj@kernel.org> References: <2024120625-recycling-till-0cca@gregkh> <20241206181620.91603-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 89057180012 X-Stat-Signature: so4ykj7xb9o7rcawsfgqb7n5qi53a5mj X-Rspam-User: X-HE-Tag: 1733508990-151553 X-HE-Meta: U2FsdGVkX19T2bGghDrMqAwxXq7LEaRMeaBm++grFYO7YwiUU2ZKCdkWGUvzP7LIzsKVsn71ApS8KaQt1k9ghWOdSM0RuB1fHgSc767UQAVQ8aJQpMByYLx368Uv4Qa/RHOB4CDYob7yb5YaOvyC9Jx4P2EVbrO48P1fsPdGBz1by0j72DDf1GM06jS2v+8uy4XMf1BVoPSAV/vbUxhD2T19c1tBhiUdH4BGjnbhWvilBEP3RO6WhqILQa/EsDAm90/5WSrOxEH/7vNRWpSPshUPC0pVoG2YPSD9eiUcOTj9xLvqfkd/lV6wDXNFjdvZJM2h0Fyi9pR80qckKM2q6jQX/Rr+p1np0pYoXZDv2ydltCK9SlYuuXkzbNZZA5tahcBEBdqTUkPVYsWxU+aIWi612Jlh9JJ6dBUM+oSQWLKzZ+WSftdsmbmdUi2Km5umx93/FckLpOkHXpk3WWZhYmOB4TloajmpVE4bJVLKl1hfubeg16xCcbZShbwmR/XkUu5dv6L6J0aQujrbKOPy+APoJ7ityAOIjbyBBBzsyvrh4oXA7svxLZYmDWkxBMLbeZNo6Danwolcwt8b6OYaZa36qfYb6MyWzAEXuBYNqbzHBtBnAaiMqnfBqx5MQaOxb7nOozmUSUHbI4Z2oqNkYhQjqnIdtpby59I7VB7aBHio5bBuwn6/rorOzL7LnQhEElurrJyOYbyyE7RGdmxeFhzcaaMV2i0cwBPYRoCJpcjxIoTLa+phQ/TO6XdrghW4bjvM6Ne661aRoyjsvOw7zjsb4WRi30WwPjOGDMyZ6uzagrvwBXsSXzDFJsG7uH9VQwtgw6J2ZBVB7sGXeTEO++iJBvNBo7cdD9BrNyzBPX/cnO+1BRrC1rLdzofvGQl2/fNzsjxJC0PQn28wKeiZ/dcbl3YA4NR/AlymQ16l2A3YeldFKWztEPRwAABTucaXk8OIhVeMR+cAzKI1bde /5cd6PgV 8uNh4Fx8Yb/T3BABUuMAJjhy6bXgrCNyjhyZT39I/NNT+B04431vYQ55zSPGU8wfML9/kUNE8snORNzn8F3oD82nfmmZTMZxziR5FxsGgzrAdADfojZvUm8pg9bORP92/iYpdBY1LTbJBQTOYvSxn5ygltTGtmOogs0I4xdojJWmjzCWJEF7L3Q8E5Uv9f9H2kBjgT9PGeBbnNzEhPh9lPba7THLf6jSgVV8rek+ihnHRcofl9nf5etMygK9BD4XrLgHQmT9aFTi2DM3htvU3/6ifO73WINsIW5WKblBY28q6qKscLgK+9zyy1/u6C+iWvpVYHICrprMyZ5hQyx5NxW3p196WzmkYf5Pv+qs51pMk2NTTrHrWqjv6GlBfSDX5mpdhIfJjy0JHEr2Z9dNaFcEsMCEhNXE65JKN 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: From: Zheng Yejian Patch series "mm/damon/vaddr: Fix issue in damon_va_evenly_split_region()". v2. According to the logic of damon_va_evenly_split_region(), currently following split case would not meet the expectation: Suppose DAMON_MIN_REGION=0x1000, Case: Split [0x0, 0x3000) into 2 pieces, then the result would be acutually 3 regions: [0x0, 0x1000), [0x1000, 0x2000), [0x2000, 0x3000) but NOT the expected 2 regions: [0x0, 0x1000), [0x1000, 0x3000) !!! The root cause is that when calculating size of each split piece in damon_va_evenly_split_region(): `sz_piece = ALIGN_DOWN(sz_orig / nr_pieces, DAMON_MIN_REGION);` both the dividing and the ALIGN_DOWN may cause loss of precision, then each time split one piece of size 'sz_piece' from origin 'start' to 'end' would cause more pieces are split out than expected!!! To fix it, count for each piece split and make sure no more than 'nr_pieces'. In addition, add above case into damon_test_split_evenly(). And add 'nr_piece == 1' check in damon_va_evenly_split_region() for better code readability and add a corresponding kunit testcase. This patch (of 2): According to the logic of damon_va_evenly_split_region(), currently following split case would not meet the expectation: Suppose DAMON_MIN_REGION=0x1000, Case: Split [0x0, 0x3000) into 2 pieces, then the result would be acutually 3 regions: [0x0, 0x1000), [0x1000, 0x2000), [0x2000, 0x3000) but NOT the expected 2 regions: [0x0, 0x1000), [0x1000, 0x3000) !!! The root cause is that when calculating size of each split piece in damon_va_evenly_split_region(): `sz_piece = ALIGN_DOWN(sz_orig / nr_pieces, DAMON_MIN_REGION);` both the dividing and the ALIGN_DOWN may cause loss of precision, then each time split one piece of size 'sz_piece' from origin 'start' to 'end' would cause more pieces are split out than expected!!! To fix it, count for each piece split and make sure no more than 'nr_pieces'. In addition, add above case into damon_test_split_evenly(). After this patch, damon-operations test passed: # ./tools/testing/kunit/kunit.py run damon-operations [...] ============== damon-operations (6 subtests) =============== [PASSED] damon_test_three_regions_in_vmas [PASSED] damon_test_apply_three_regions1 [PASSED] damon_test_apply_three_regions2 [PASSED] damon_test_apply_three_regions3 [PASSED] damon_test_apply_three_regions4 [PASSED] damon_test_split_evenly ================ [PASSED] damon-operations ================= Link: https://lkml.kernel.org/r/20241022083927.3592237-1-zhengyejian@huaweicloud.com Link: https://lkml.kernel.org/r/20241022083927.3592237-2-zhengyejian@huaweicloud.com Fixes: 3f49584b262c ("mm/damon: implement primitives for the virtual memory address spaces") Signed-off-by: Zheng Yejian Reviewed-by: SeongJae Park Cc: Fernand Sieber Cc: Leonard Foerster Cc: Shakeel Butt Cc: Ye Weihua Cc: Signed-off-by: Andrew Morton (cherry picked from commit f3c7a1ede435e2e45177d7a490a85fb0a0ec96d1) --- mm/damon/vaddr-test.h | 1 + mm/damon/vaddr.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/damon/vaddr-test.h b/mm/damon/vaddr-test.h index 95ec362cdc37..5531766ff09f 100644 --- a/mm/damon/vaddr-test.h +++ b/mm/damon/vaddr-test.h @@ -306,6 +306,7 @@ static void damon_test_split_evenly(struct kunit *test) damon_test_split_evenly_fail(test, 0, 100, 0); damon_test_split_evenly_succ(test, 0, 100, 10); damon_test_split_evenly_succ(test, 5, 59, 5); + damon_test_split_evenly_succ(test, 0, 3, 2); damon_test_split_evenly_fail(test, 5, 6, 2); damon_destroy_ctx(c); diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index 6ad96da15081..6d8036671e60 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -69,6 +69,7 @@ static int damon_va_evenly_split_region(struct damon_target *t, unsigned long sz_orig, sz_piece, orig_end; struct damon_region *n = NULL, *next; unsigned long start; + unsigned int i; if (!r || !nr_pieces) return -EINVAL; @@ -82,8 +83,7 @@ static int damon_va_evenly_split_region(struct damon_target *t, r->ar.end = r->ar.start + sz_piece; next = damon_next_region(r); - for (start = r->ar.end; start + sz_piece <= orig_end; - start += sz_piece) { + for (start = r->ar.end, i = 1; i < nr_pieces; start += sz_piece, i++) { n = damon_new_region(start, start + sz_piece); if (!n) return -ENOMEM;