From mboxrd@z Thu Jan 1 00:00:00 1970 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 BA716C83F1A for ; Sun, 20 Jul 2025 17:17:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 935526B00A2; Sun, 20 Jul 2025 13:17:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 849F36B00A3; Sun, 20 Jul 2025 13:17:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69AE16B00A4; Sun, 20 Jul 2025 13:17:13 -0400 (EDT) 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 533986B00A2 for ; Sun, 20 Jul 2025 13:17:13 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D21B81DA1EF for ; Sun, 20 Jul 2025 17:17:12 +0000 (UTC) X-FDA: 83685298704.18.93E12BB Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf28.hostedemail.com (Postfix) with ESMTP id 48A2DC0007 for ; Sun, 20 Jul 2025 17:17:10 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=X+FErqnG; spf=pass (imf28.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=1753031830; 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=sKCV4MSyQUmLpNakvOGtC/k9XfQLNyB4NE+SD0QpJ0I=; b=wrMFCUsReA3QSneiLTJJnRBPr5aP/I46Kopek47AXe4p4euT/VDW6Uywo2y74q+M3jboV2 Hn7pHMb4jrv2XwMSbl6Oih2eq8lCIXzR4O7l+QKA3IS1y8QvInnZZ7Eh61Ezmy0OrrhfFi vJP+tdeaiMA3+1RVT1Ca/CNg55eS+v8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1753031830; a=rsa-sha256; cv=none; b=TPMVKcJd/XljDh2hUyR2645gqmxpYSWeF0uVxObvAwC71BJdH+qfmCGQCaSte9UsXu23LP cwYY+rB5ekZJqm9RFP1izmJi5sidwZmzKrmA8hOdnpCaThg2d9J0VmN2jx0HeiolmgxAEm OYPbv++4mIuMVMFzZx6jvW4W9N9RfVA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=X+FErqnG; spf=pass (imf28.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id CC061A5272C; Sun, 20 Jul 2025 17:17:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55046C4CEE7; Sun, 20 Jul 2025 17:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753031829; bh=5DVJPjAFv4Z5cR2LSqJtd6K261syubl14OoCYWIJf+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X+FErqnGuJLxgqC6IN+1c2UIPAD1gj80yPK72GJB7xmInTGtNcTMNLiRVAQagIPip IQrDEy+upWQgjgXm4Dzgl5eHwm9x79c6XwVyS8635JLr4+VXVLlx2GHsrYAIC+X5H8 AkQsUdhm7Uq8lfb9uliP90ZYj+6BgW1tKyuzI+XHgmB4dn6otjHE5W8beON+iynU1e SKO1X8kD+SP656xYtVD4yi74jBYN7eSszIlUg41NTsUe80HHQFhT16ag6fnKqYokmh mjCO7lus0/m43kwX3Y3iequsKlw6JMD0cvtnVZVaxpMmYQHqFWubyqtDHzATiw2RAz uHDbHVEMsm+vg== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , Shuah Khan , damon@lists.linux.dev, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 12/22] selftests/damon/sysfs.py: generalize DAMOS Watermarks commit assertion Date: Sun, 20 Jul 2025 10:16:42 -0700 Message-Id: <20250720171652.92309-13-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250720171652.92309-1-sj@kernel.org> References: <20250720171652.92309-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 48A2DC0007 X-Rspam-User: X-Rspamd-Server: rspam09 X-Stat-Signature: hdtjcn7d4o6phkt7bacrigknxrfa8uiy X-HE-Tag: 1753031830-954643 X-HE-Meta: U2FsdGVkX1+dyN0ZUWZO10WnVUw8U6rUhRauR2XFlaVYO2kMpmllQ3HvEB1eWgsZIlsAXSsgu41Oj1V8Qq41Ea4KjV8P7q6M8e9LQm//KgLGrV2OpYpLJ2NvmbiF2fQkjBGb9JpdsEYFDWMPXGCaBuQSI39Fic4gVtbXbnsJ/FHb9rE0l3zSmm+gct0DCyDX/Ue62wW/r/BmTpEatEMWcba2qJASvfedVgMWD0u6d2xERjOMZEFfoUCybsm5zlgdlvCWANAuWOt79ZFeLLTvLCA+KwW5W1LPZBmv7rNofW9mAFiq+KSVSMCiJsa26JBgQYSHm2l01Ffm3EERo6trI6AR5F3z66B3+JDGteO3DRGxFDN92grhHXpvZyLvO5UqPIg8xhnRUm3zfIRTBJLWVyy8xooJG3/Utb5Nt9sSpAivb2DO+9TFsRxXshCOP8Sc/EKCi9fXiEHyjqKfHoXlHBhbSbmJxVuo/kJA38levHUDh9MRQIx0jM50woqskVdnb5x7k4Uf3LPvMXix0qFz00LWB0Sz15U+q/ShC0kdN38J5hPuAjp7w48JAQ1e0eYcc1jVTxDA2CFWtND8md9u3QNyryeUnHWLJcChuYfaGdgoTrKrRcjtHFyTJH8QFuefjVwyaPpWjI/DYG9fysJcTjxZZwEkYXM9wU4cDVCYA3MMyN7BgRLDeRhoY1AHGxrO0Zh2wQaXoUQh0V/BPIVcyCwl9G8xuzng2bmwKMAQYTWkkQf4JLM7h609Cc0svuNEOsustoyEeeKETc6w+4E1GUUVY3ZOGEiPa8lrH01n20cmDA53Y6qpuD2vFCXyQdUV/v/oSmgQOoqy6lmyqZG2gU8VFFi4u8G3FxLppvv9pqc/4GV/zFS3PEXzMw7I5UaHuAAtRuKp1TGi3uw5D+epBhhuZllq3eg4QlqN+Dh+5r1u/131ywBFkvkkgKvGSCTEDTV12mvPcMGMrBuAOEZ EIrPM+k9 w75KqxfNLCbt3CMu6e3S38sFU7czvgqSNMp66PEZ4Gs7wHKNt4d0bYr9FIKw97QOMwO8RgiJlBF9o9lggW/hHSaly028ovbczF+4+jI4ek+w3nnjA1kfoBaQoG8OfmoOC4E7ahQrKDGBy0eN/TD1thE1HRaaF26lAhMGjZNjUNPH9W6NCD9w+j7lyTr0CN+8Bxy+4CnWyU0L6usljhZUiA5WjOucPOmi3hxCLoQjXPBbFvNg= 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: DamosWatermarks commitment assertion is hard-coded for a specific test case. Split it out into a general version that can be reused for different test cases. Signed-off-by: SeongJae Park --- tools/testing/selftests/damon/sysfs.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/damon/sysfs.py b/tools/testing/selftests/damon/sysfs.py index e67008fd055d..91a28d97b015 100755 --- a/tools/testing/selftests/damon/sysfs.py +++ b/tools/testing/selftests/damon/sysfs.py @@ -25,6 +25,22 @@ def fail(expectation, status): print(json.dumps(status, indent=4)) exit(1) +def assert_true(condition, expectation, status): + if condition is not True: + fail(expectation, status) + +def assert_watermarks_committed(watermarks, dump): + wmark_metric_val = { + 'none': 0, + 'free_mem_rate': 1, + } + assert_true(dump['metric'] == wmark_metric_val[watermarks.metric], + 'metric', dump) + assert_true(dump['interval'] == watermarks.interval, 'interval', dump) + assert_true(dump['high'] == watermarks.high, 'high', dump) + assert_true(dump['mid'] == watermarks.mid, 'mid', dump) + assert_true(dump['low'] == watermarks.low, 'low', dump) + def main(): kdamonds = _damon_sysfs.Kdamonds( [_damon_sysfs.Kdamond( @@ -100,14 +116,8 @@ def main(): }: fail('damos quota', status) - if scheme['wmarks'] != { - 'metric': 0, - 'interval': 0, - 'high': 0, - 'mid': 0, - 'low': 0, - }: - fail('damos wmarks', status) + assert_watermarks_committed(_damon_sysfs.DamosWatermarks(), + scheme['wmarks']) kdamonds.stop() -- 2.39.5