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 C66BCC83F1A for ; Fri, 18 Jul 2025 06:42:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5445E6B00BC; Fri, 18 Jul 2025 02:42:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F42B6B00BD; Fri, 18 Jul 2025 02:42:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E43A6B00BE; Fri, 18 Jul 2025 02:42:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2C7736B00BC for ; Fri, 18 Jul 2025 02:42:42 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 940FE12DE17 for ; Fri, 18 Jul 2025 06:42:41 +0000 (UTC) X-FDA: 83676442122.17.398FBC2 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf18.hostedemail.com (Postfix) with ESMTP id C93791C0006 for ; Fri, 18 Jul 2025 06:42:38 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; spf=pass (imf18.hostedemail.com: domain of lienze@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=lienze@kylinos.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752820959; 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:references; bh=jOJV2V1NFd4OCb2vbN1lF/fxSS6D5mjYh1JEDmu1VLU=; b=BgS3r12593dXAYdzp6jueFAC3XA5htzK6cqyTOuckBpNMPEQPn1yyFC/EwCalnExKlyTxR PQUp8wwOflciffN6pkWOouB0bm2UV2XxdJHIlf9QdtTiGlgA6CII9yeAidnRLkzkRqmcl2 AK08LP5s1/MgIG0T3N6eX0T9darqg5g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752820959; a=rsa-sha256; cv=none; b=774gLFJeqqDwrk9jS1/GnTF+asUwUDtxngucd97iOcEIPLvYwZCu887SM0NwM/5Vpa/Y5q Y7pZ/8la3P3SWhnDIID8+xOqE49/zrnoY3RYwi4FpUhf2uT55DJ3CcxzMWXsLehI24TpCQ oJAiKVn/h0VKBfoTV+ziV5IvAB6vmn8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.hostedemail.com: domain of lienze@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=lienze@kylinos.cn X-UUID: 6067299463a211f0b29709d653e92f7d-20250718 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED SA_EXISTED, SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS DMARC_NOPASS, CIE_BAD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_T1, AMN_GOOD, AMN_C_TI, AMN_C_BU ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:0b93e3ed-f1d2-4165-b08a-b2fe95025b82,IP:10, URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-5 X-CID-INFO: VERSION:1.1.45,REQID:0b93e3ed-f1d2-4165-b08a-b2fe95025b82,IP:10,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6493067,CLOUDID:f183cdfe0d039c935fec25ffa11447a3,BulkI D:250718144232YJLJ6S73,BulkQuantity:0,Recheck:0,SF:17|19|24|44|66|78|102,T C:nil,Content:0|50,EDM:-3,IP:-2,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC: nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI X-UUID: 6067299463a211f0b29709d653e92f7d-20250718 X-User: lienze@kylinos.cn Received: from kylin.. [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1014749217; Fri, 18 Jul 2025 14:42:30 +0800 From: Enze Li To: sj@kernel.org, shuah@kernel.org Cc: damon@lists.linux.dev, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, enze.li@gmx.com, Enze Li Subject: [PATCH v2] selftests/damon: introduce _common.sh to host shared function Date: Fri, 18 Jul 2025 14:42:17 +0800 Message-ID: <20250718064217.299300-1-lienze@kylinos.cn> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C93791C0006 X-Rspam-User: X-Rspamd-Server: rspam09 X-Stat-Signature: 73bkzkupkzzmu3uedpa6wrtwjk1fg1ep X-HE-Tag: 1752820958-350057 X-HE-Meta: U2FsdGVkX19ioiYCJkKF4tqdKmd9wHT++Y1yQsPIyRyKKWMUoPeCpxd4JBnsCVUF51a/uj2+DvGnwzav32oEJ2IwWbG1uyuGJAcsqvJkqgxjIkbgfJ4AgZ2VsS85iiZ4bifQFMMljgBFUpWC/lxyRtxGr5QTiqAJig6dAt4ALfERNJw/LXfhI+I7A49Bubm3lP9xLZUa/fRgHf8iv3mVKq3rDpxMpukzpBfSUydYKlPf0lpIiCx76X1M6EftTe/6ffHk1/jjLnFjBlIgBoabqGgKxFDhTcLujELGZ4K4XiYywxlXXitlAatdtfaB+IMeE873EtsEKVwqeprAf3gzOd2SHZhQCDzrxqbpUKstvzYpVLuHvMGQzYPtJNLBs/WgfhzB0z2mPU3/3ej7OSCJ1XnmXILsB0GP5S6g3mHr/WU/x+qeiUWpHQrahFbYBC4VT6xNOzIl2bDEe0tlQRrdqFWqcDKf9GbRQcd5/xMmaGJx1CQrpk3qzTD4DcsfS6RQfK83DSFbKPUIwwmIrJU5RFyouiTY2BUXhhMmxbrJvhhurUnwzvJah9gi/+U2Ij14KxImMQSnctQrypYNaYV45xZIq38EqNley2EP1ZMjek/GEkLeJV8qAJdbD6pmqfUB1KZzNyzDstg4JHt844WY0XGpssgTTMB0DVraSdQsiUQKC0g6QtdHfT2CzKuKBBzE8UnvYBoBe4QD67hLAReYaPdzBETA7AtonQ2b8EnUPc5MsaLY/YZi9q6Y+dQaxQcpoAd9OpDKhAqbef0sgnk/hRQzOXSNpjGgqHuklos/VEetluc3ZVw2qFieVuSQAPzg8X4RBdSst+p/xRLOVpXj10WqkrUw3sip0OEsLtBAWWxKiVpLBdJEI3JvyyDt01V1CHwaPFMHm83qh/ra4dh4Y6oUpJQC0edQmZEB98MOSnZFsbORF+4aPSGXGh6lgFz6Mt3YkxDYqfdQBnFOPnw uyiE5iYY ZDLBpR+EUBQJhkrpKwWoIxLIniZhatDt4VgFh6IgHnsH7QVY= 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: The current test scripts contain duplicated root permission checks in multiple locations. This patch consolidates these checks into _common.sh to eliminate code redundancy. Signed-off-by: Enze Li --- tools/testing/selftests/damon/_common.sh | 11 +++++++++++ tools/testing/selftests/damon/lru_sort.sh | 8 +++----- tools/testing/selftests/damon/reclaim.sh | 8 +++----- tools/testing/selftests/damon/sysfs.sh | 11 ++--------- .../damon/sysfs_update_removed_scheme_dir.sh | 8 +++----- 5 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 tools/testing/selftests/damon/_common.sh diff --git a/tools/testing/selftests/damon/_common.sh b/tools/testing/selftests/damon/_common.sh new file mode 100644 index 000000000000..0279698f733e --- /dev/null +++ b/tools/testing/selftests/damon/_common.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +check_dependencies() +{ + if [ $EUID -ne 0 ] + then + echo "Run as root" + exit $ksft_skip + fi +} diff --git a/tools/testing/selftests/damon/lru_sort.sh b/tools/testing/selftests/damon/lru_sort.sh index 61b80197c896..1e4849db78a9 100755 --- a/tools/testing/selftests/damon/lru_sort.sh +++ b/tools/testing/selftests/damon/lru_sort.sh @@ -1,14 +1,12 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 +source _common.sh + # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 -if [ $EUID -ne 0 ] -then - echo "Run as root" - exit $ksft_skip -fi +check_dependencies damon_lru_sort_enabled="/sys/module/damon_lru_sort/parameters/enabled" if [ ! -f "$damon_lru_sort_enabled" ] diff --git a/tools/testing/selftests/damon/reclaim.sh b/tools/testing/selftests/damon/reclaim.sh index 78dbc2334cbe..e56ceb035129 100755 --- a/tools/testing/selftests/damon/reclaim.sh +++ b/tools/testing/selftests/damon/reclaim.sh @@ -1,14 +1,12 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 +source _common.sh + # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 -if [ $EUID -ne 0 ] -then - echo "Run as root" - exit $ksft_skip -fi +check_dependencies damon_reclaim_enabled="/sys/module/damon_reclaim/parameters/enabled" if [ ! -f "$damon_reclaim_enabled" ] diff --git a/tools/testing/selftests/damon/sysfs.sh b/tools/testing/selftests/damon/sysfs.sh index e9a976d296e2..83e3b7f63d81 100755 --- a/tools/testing/selftests/damon/sysfs.sh +++ b/tools/testing/selftests/damon/sysfs.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 +source _common.sh + # Kselftest frmework requirement - SKIP code is 4. ksft_skip=4 @@ -364,14 +366,5 @@ test_damon_sysfs() test_kdamonds "$damon_sysfs/kdamonds" } -check_dependencies() -{ - if [ $EUID -ne 0 ] - then - echo "Run as root" - exit $ksft_skip - fi -} - check_dependencies test_damon_sysfs "/sys/kernel/mm/damon/admin" diff --git a/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh b/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh index ade35576e748..35fc32beeaf7 100755 --- a/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh +++ b/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh @@ -1,14 +1,12 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 +source _common.sh + # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 -if [ $EUID -ne 0 ] -then - echo "Run as root" - exit $ksft_skip -fi +check_dependencies damon_sysfs="/sys/kernel/mm/damon/admin" if [ ! -d "$damon_sysfs" ] base-commit: e2291551827fe5d2d3758c435c191d32b6d1350e -- 2.43.0