From patchwork Thu Apr 10 10:07:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donet Tom X-Patchwork-Id: 14046266 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 4A5C2C3601E for ; Thu, 10 Apr 2025 10:08:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0A082800E8; Thu, 10 Apr 2025 06:08:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB9CF2800E7; Thu, 10 Apr 2025 06:08:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7F3F2800E8; Thu, 10 Apr 2025 06:08:14 -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 A7ECD2800E7 for ; Thu, 10 Apr 2025 06:08:14 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4286C1208B3 for ; Thu, 10 Apr 2025 10:08:15 +0000 (UTC) X-FDA: 83317708950.13.1A17277 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf01.hostedemail.com (Postfix) with ESMTP id 1B44B40008 for ; Thu, 10 Apr 2025 10:08:12 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=omPmcXAw; spf=pass (imf01.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744279693; 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:dkim-signature; bh=pk1XLmgBq5xVToKFE3tfnSHSmedA9cTbuIOl31OV778=; b=1oGwVy/Fq5UCERyYTpSW9UxVS67Jhxozsda2o+O9bb3tHZpWpPPriCygvfYvUsptA8Jn5Q uzoJ0g75ul+/Yhwjmx0KkJa9sSz7uElI8kHL/Wrynzn7HAOUums0im9pd9XQe8VMyXEayq c6mYNRNEkjGGQwrclwWHY5LtD6pFwgI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=omPmcXAw; spf=pass (imf01.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744279693; a=rsa-sha256; cv=none; b=MZ2RlskkUuke6pIyJYsTtGtY09tkS8/PAAZ5Gxwkl28NtQFHM/xCrj1EL1idjSf50i+qtJ Fw/VvdDan3dCkIQ9O3GD5UhWl5cEspbXFfPPigxflSJ5I/Ey+5Oz2AgPDu30i3FLv9SzWY ebnSmTumAOBHeHX8chM2mta7QM2Kdmk= Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A68Gpt022700; Thu, 10 Apr 2025 10:08:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=pk1XLmgBq5xVToKFE3tfnSHSmedA9cTbuIOl31OV7 78=; b=omPmcXAwAfiinxNP46AHR+Fp4sR+ximIsxnQfx6n6+buFUHYF+0c4v9bF XB0IkiG9DgjDvrK1i9qi9QSUzCkaOQ3jeKJYs0POA+OVOMJEWTD4glbcuKZAIvfi gf0mN1zYgsg4iAd57as0Y5muorxoF4ItAt2kva+HDK1y05QhrrvLt43QPopPL4uh ZFXA9ca+O+87B3HEcwAiJZoORX0j0VF0xbJxkn5MBTdkbmcVY40CjK11cB1b+S3v 6XbPuiWOKTiHxwlocHCvY5yWuuoRa6G7KRhf5yC9XcLzTLpXuaYPdsu8+choUKDi HejANgYofpGnXvLicfb63oG8LC+hg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45x02qbyv6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Apr 2025 10:08:03 +0000 (GMT) Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 53A9tCFQ009615; Thu, 10 Apr 2025 10:08:03 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45x02qbyv5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Apr 2025 10:08:03 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 53A8VZUM025518; Thu, 10 Apr 2025 10:08:02 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45ugbm5f1x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Apr 2025 10:08:02 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53AA808U60359016 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Apr 2025 10:08:00 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8822A2006A; Thu, 10 Apr 2025 10:08:00 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 409C520067; Thu, 10 Apr 2025 10:07:59 +0000 (GMT) Received: from ltcden14-lp2.aus.stglabs.ibm.com (unknown [9.53.174.194]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 10 Apr 2025 10:07:59 +0000 (GMT) From: Donet Tom To: Andrew Morton , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Shuah Khan Cc: Ritesh Harjani , longman@redhat.com, Li Wang , Donet Tom Subject: [PATCH] selftests/mm: Restore default nr_hugepages value during cleanup in hugetlb_reparenting_test.sh Date: Thu, 10 Apr 2025 05:07:48 -0500 Message-ID: <20250410100748.2310-1-donettom@linux.ibm.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: jE3lAz9X2QBh8-c-E2MYiYz_Zv8i7byW X-Proofpoint-ORIG-GUID: CYIl7eGH620ENht-QvGtXimSVd7UFAvw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-10_01,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=919 lowpriorityscore=0 spamscore=0 clxscore=1015 suspectscore=0 mlxscore=0 adultscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504100074 X-Rspamd-Queue-Id: 1B44B40008 X-Stat-Signature: qixh995az3fttekraamx4dxeohk7mjx8 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744279692-91638 X-HE-Meta: U2FsdGVkX1+MFrCu5xFCEcJsF2aivSKbhOOKtNq+l7CSUpfle9k2XjACP5Q9Ys0Ahy3TuIt6oQE1+HMhcA1ctJ63htyugXIpzdpohsB5suEASy8Y2dqjILFBA5gsQPNxkCKCeEGcSo5YsFdHsPSXYdXsbKGxwmz0Cs7SW4X+ow876prOVcQ+UnD1u/Meukdcm5z2yB1LnOwBlnP/c8UluF481S1uavJLbdIc9uDTOrqDuCNEneFWIJf2tx2+rCSaIpT2iVFywwKMx7FRvXi3MdUA6jD4mPIDHlH4oamZ6EclMePfjr8RMi8tMuv6oRosYq6P3O17rYLpltNQwohKZf+Rkq/OCy9OiMBThz3MlspKnUNAnkf3IyhrLDVWApBAs3jTj/0/X+81LU8wiZRcA5e5dqTAcPbB+GRn4n6jqnoqNyI/cVotiByv1wQ/7bSJRofxfX8bbiVzjY1SS3QGewUVoiqUayxsnxScS3w0xWetZa1+LhoLemcN4uOUEUpRPaAuTmQB1cEs/AczY3cb4T67Jm0RdaWtTIRcTavrM5W0Y4zp189gRUQjo9zUE56OwTQvtUnhdOblcLTxCKxCV/qeIm4j7s6g6LaLm91YUCX87LyHf7ta3oBsiOpNibfijmi2Lvydt3WhFX/hLjWlGb4Yy/LOpKcCQXtrD7yUE2Rm8J0B11Tanbk7JcLZKcH2AriBMguA9ShLqDu1/Hhv0CuyOWm3kib9SvXu627dHPrad2yAywkScp7qZT+waLqxm+U9g3jplNPiHfczR6YdTBEfDoftVTZsRFScxfJf7ydt+oD107pMDh8BIeVgsIKXPg2l41q78gbAAzTS1Z9wK9PItUwah1S2HQoibWAwTcwBbH4acayD56sBTP0lPEq4ZVQfHuh20/kCGDT6OnrQb45UJBq6cizZA/CKMtEtRSVbDZbqKhEvWbZitLLP7lu/jn0bmmTc3xkU3sntGZF 98mCc67c 341TK74ok4pz7uRV7nzEneh1qy39WtwGrQYha55nP3yggyvaGYv+WmKGRh9setEULI+VGSwJuy62d05GtFFv4lQ7qdQGj2vFX6sI9pU1fb4ybAzLDfC8GQ6InziMpCk5UqE+HscSN6gMwRJYiSczbkEmBEZomVf0/tsMqSVCGWGrRQ0jkpAbtCr3BQfJgxaddT43hG9QVBkvPWP4wcY05F1Kcl1gQkBrXkSD17Xw1AadD516ryVe8m99W5tBKKRbOd+hlv7Sw8sv1Wjawyz5U+7MKXcSJEU/mPjzrOhqrsc5XwAcwXGTsYxoD9zD/nwN46XPS 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: During cleanup, the value of /proc/sys/vm/nr_hugepages is currently being set to 0. At the end of the test, if all tests pass, the original nr_hugepages value is restored. However, if any test fails, it remains set to 0. With this patch, we ensure that the original nr_hugepages value is restored during cleanup, regardless of whether the test passes or fails. Fixes: 29750f71a9b4 ("hugetlb_cgroup: add hugetlb_cgroup reservation tests") Signed-off-by: Donet Tom --- tools/testing/selftests/mm/hugetlb_reparenting_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/hugetlb_reparenting_test.sh b/tools/testing/selftests/mm/hugetlb_reparenting_test.sh index 11f9bbe7dc22..114875a2b018 100755 --- a/tools/testing/selftests/mm/hugetlb_reparenting_test.sh +++ b/tools/testing/selftests/mm/hugetlb_reparenting_test.sh @@ -56,7 +56,7 @@ function cleanup() { rmdir "$CGROUP_ROOT"/a/b 2>/dev/null rmdir "$CGROUP_ROOT"/a 2>/dev/null rmdir "$CGROUP_ROOT"/test1 2>/dev/null - echo 0 >/proc/sys/vm/nr_hugepages + echo $nr_hugepgs >/proc/sys/vm/nr_hugepages set -e }