From nobody Sun Feb 8 12:32:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 588CF28C869 for ; Sun, 21 Dec 2025 12:26:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766320020; cv=none; b=bWCAh1dW30pXcAmUonady2DwnqfZwdjDK7XS11JShqsAPy15BVMC+246hs4YP8+LyAYgo0c/CjV79RzVZHDFIXaFUZHxl3wT+H+Xu3r/X3Yjfr3ov5ZqdoSjuSNEQGhUKRBuCsYYdcMsIARFIW9KYzYmoHnLfIisGQJ+lO7nIR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766320020; c=relaxed/simple; bh=B4sZdJG1t9EctDBIEt1ugcR+phuCjNoMUoxASwFgC4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hqf4H4FpJ38/QADdaqOWUM9k948lYZXil82fhXELGGJBfcs296qXRpW4HnKO5L1Ywmk9/n5tj05xs6vAB0LM422B2oUkDRqB4Q3+3V6jChRNZryuxnTdIpalHMq6AVvnWlR3cgo1BhImEgSWgd0Wfsb3sj6J7i6ouZ7NLN02KS8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GcoFNiwz; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GcoFNiwz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766320018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q/oaz55RIgwHHbP5HbFfkXnPCuvWreBFUWRc63qZ0WQ=; b=GcoFNiwztl+niIwsesJl/3gs49J4yAGhp5ipfMXlGQciAro42wn9suEI/sTdpOAVPhFzuC l6Y0HdK2W2YZFteYbHrVdHUfInJLDc+ZklV3NFSAw92IjbQRnGbyi9N42xhq9ym9T6zuFU CbqGJJhwKx7YBqdrqeJ6OFGJYfmuiNk= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-K90Ry8O3Os-k_MrDsuatRA-1; Sun, 21 Dec 2025 07:26:53 -0500 X-MC-Unique: K90Ry8O3Os-k_MrDsuatRA-1 X-Mimecast-MFC-AGG-ID: K90Ry8O3Os-k_MrDsuatRA_1766320011 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7DC6D1800358; Sun, 21 Dec 2025 12:26:51 +0000 (UTC) Received: from dell-per7425-02.rhts.eng.pek2.redhat.com (dell-per7425-02.rhts.eng.pek2.redhat.com [10.73.116.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9EFE119560B4; Sun, 21 Dec 2025 12:26:47 +0000 (UTC) From: Li Wang To: akpm@linux-foundation.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: David Hildenbrand , Mark Brown , Shuah Khan , Waiman Long Subject: [PATCH v3 1/3] selftests/mm/write_to_hugetlbfs: parse -s as size_t Date: Sun, 21 Dec 2025 20:26:37 +0800 Message-ID: <20251221122639.3168038-2-liwang@redhat.com> In-Reply-To: <20251221122639.3168038-1-liwang@redhat.com> References: <20251221122639.3168038-1-liwang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" write_to_hugetlbfs currently parses the -s size argument with atoi() into an int. This silently accepts malformed input, cannot report overflow, and can truncate large sizes. Acked-by: David Hildenbrand (Red Hat) Acked-by: Waiman Long --- Error log --- # uname -r 6.12.0-xxx.el10.aarch64+64k # ls /sys/kernel/mm/hugepages/hugepages-* hugepages-16777216kB/ hugepages-2048kB/ hugepages-524288kB/ #./charge_reserved_hugetlb.sh -cgroup-v2 # ----------------------------------------- ... # nr hugepages =3D 10 # writing cgroup limit: 5368709120 # writing reseravation limit: 5368709120 ... # Writing to this path: /mnt/huge/test # Writing this size: -1610612736 <-------- Switch the size variable to size_t and parse -s with sscanf("%zu", ...). Also print the size using %zu. This avoids incorrect behavior with large -s values and makes the utility more robust. Signed-off-by: Li Wang Cc: David Hildenbrand Cc: Mark Brown Cc: Shuah Khan Cc: Waiman Long Acked-by: David Hildenbrand (Red Hat) --- tools/testing/selftests/mm/write_to_hugetlbfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/mm/write_to_hugetlbfs.c b/tools/testin= g/selftests/mm/write_to_hugetlbfs.c index 34c91f7e6128..ecb5f7619960 100644 --- a/tools/testing/selftests/mm/write_to_hugetlbfs.c +++ b/tools/testing/selftests/mm/write_to_hugetlbfs.c @@ -68,7 +68,7 @@ int main(int argc, char **argv) int key =3D 0; int *ptr =3D NULL; int c =3D 0; - int size =3D 0; + size_t size =3D 0; char path[256] =3D ""; enum method method =3D MAX_METHOD; int want_sleep =3D 0, private =3D 0; @@ -86,7 +86,10 @@ int main(int argc, char **argv) while ((c =3D getopt(argc, argv, "s:p:m:owlrn")) !=3D -1) { switch (c) { case 's': - size =3D atoi(optarg); + if (sscanf(optarg, "%zu", &size) !=3D 1) { + perror("Invalid -s."); + exit_usage(); + } break; case 'p': strncpy(path, optarg, sizeof(path) - 1); @@ -131,7 +134,7 @@ int main(int argc, char **argv) } =20 if (size !=3D 0) { - printf("Writing this size: %d\n", size); + printf("Writing this size: %zu\n", size); } else { errno =3D EINVAL; perror("size not found"); --=20 2.49.0 From nobody Sun Feb 8 12:32:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA7462F60A1 for ; Sun, 21 Dec 2025 12:27:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766320024; cv=none; b=m4nUmaU0sUnR0U8E4p4kOGOlWbSpUew9Zlhn0U9PR7acpSvriIMbbophEzFYWK0ehUlkEpHzWXWrs1tRmNdkU9B6QgYqCcVMSw3SQ2y0E4l1MyrWJ2Sb2b5D9BhVUJ5VUVcqz99xSWFUNA02DJZkMG5rCvFgeMkegHD2c6iKgEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766320024; c=relaxed/simple; bh=UuDxqO4f80509EtE3sAw4GydzCwNOF1wxRxxWysFaPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rNl1nLSEx+KPyOdgdgosFzHYS3/Lq3X+jzdHbinvEgplB7F9Mv3pS5nT1gBGAZR2l3XoH4j0pHKDm77BkJBek5kaC9odiMDEE2uOlEY7dI0V7Z5QjpS91xcfFvp+Y79ewHA0hlQlkIfA5Y0Yu+rUkzAoexHPxvznxjtj8jjxJlM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FkIG4Kkj; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FkIG4Kkj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766320020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zzPxgBwMBIOV5Pem2xEekXV9hInqKLJADfIWievTtPI=; b=FkIG4KkjAKsh2oC6ed5i9Dw6xiDewA35pvEKTSODNqiD4Ptm0hi6QBi4WgRxHxYQZmaNsB pyf9w5A7RvoaNAj/30G6eOH59Z+7ZQKJLmDgzOOPVO+9j1DnBf13qaEjZLsOX+ZZpIpyTc 71j5vR8llayoIoFm96p7WatQhn995FY= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-ji7ZnnHKOGe1JeQVEFtGFw-1; Sun, 21 Dec 2025 07:26:57 -0500 X-MC-Unique: ji7ZnnHKOGe1JeQVEFtGFw-1 X-Mimecast-MFC-AGG-ID: ji7ZnnHKOGe1JeQVEFtGFw_1766320016 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B83F41800343; Sun, 21 Dec 2025 12:26:55 +0000 (UTC) Received: from dell-per7425-02.rhts.eng.pek2.redhat.com (dell-per7425-02.rhts.eng.pek2.redhat.com [10.73.116.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2CCA319560B4; Sun, 21 Dec 2025 12:26:51 +0000 (UTC) From: Li Wang To: akpm@linux-foundation.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: David Hildenbrand , Mark Brown , Shuah Khan , Waiman Long Subject: [PATCH v3 2/3] selftests/mm/charge_reserved_hugetlb: drop mount size for hugetlbfs Date: Sun, 21 Dec 2025 20:26:38 +0800 Message-ID: <20251221122639.3168038-3-liwang@redhat.com> In-Reply-To: <20251221122639.3168038-1-liwang@redhat.com> References: <20251221122639.3168038-1-liwang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" charge_reserved_hugetlb.sh mounts a hugetlbfs instance at /mnt/huge with a fixed size of 256M. On systems with large base hugepages (e.g. 512MB), this is smaller than a single hugepage, so the hugetlbfs mount ends up with zero capacity (often visible as size=3D0 in mount output). As a result, write_to_hugetlbfs fails with ENOMEM and the test can hang waiting for progress. --- Error log --- # uname -r 6.12.0-xxx.el10.aarch64+64k #./charge_reserved_hugetlb.sh -cgroup-v2 # ----------------------------------------- ... # nr hugepages =3D 10 # writing cgroup limit: 5368709120 # writing reseravation limit: 5368709120 ... # write_to_hugetlbfs: Error mapping the file: Cannot allocate memory # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 ... # mount |grep /mnt/huge none on /mnt/huge type hugetlbfs (rw,relatime,seclabel,pagesize=3D512M,si= ze=3D0) # grep -i huge /proc/meminfo ... HugePages_Total: 10 HugePages_Free: 10 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 524288 kB Hugetlb: 5242880 kB Drop the mount args with 'size=3D256M', so the filesystem capacity is suffi= cient regardless of HugeTLB page size. Fixes: 29750f71a9 ("hugetlb_cgroup: add hugetlb_cgroup reservation tests") Signed-off-by: Li Wang Cc: David Hildenbrand Cc: Mark Brown Cc: Shuah Khan Cc: Waiman Long --- tools/testing/selftests/mm/charge_reserved_hugetlb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh b/tools/= testing/selftests/mm/charge_reserved_hugetlb.sh index e1fe16bcbbe8..fa6713892d82 100755 --- a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh +++ b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh @@ -290,7 +290,7 @@ function run_test() { setup_cgroup "hugetlb_cgroup_test" "$cgroup_limit" "$reservation_limit" =20 mkdir -p /mnt/huge - mount -t hugetlbfs -o pagesize=3D${MB}M,size=3D256M none /mnt/huge + mount -t hugetlbfs -o pagesize=3D${MB}M none /mnt/huge =20 write_hugetlbfs_and_get_usage "hugetlb_cgroup_test" "$size" "$populate" \ "$write" "/mnt/huge/test" "$method" "$private" "$expect_failure" \ @@ -344,7 +344,7 @@ function run_multiple_cgroup_test() { setup_cgroup "hugetlb_cgroup_test2" "$cgroup_limit2" "$reservation_limit= 2" =20 mkdir -p /mnt/huge - mount -t hugetlbfs -o pagesize=3D${MB}M,size=3D256M none /mnt/huge + mount -t hugetlbfs -o pagesize=3D${MB}M none /mnt/huge =20 write_hugetlbfs_and_get_usage "hugetlb_cgroup_test1" "$size1" \ "$populate1" "$write1" "/mnt/huge/test1" "$method" "$private" \ --=20 2.49.0 From nobody Sun Feb 8 12:32:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9282629D289 for ; Sun, 21 Dec 2025 12:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766320031; cv=none; b=Xq98Yi+1LrZ0llKdc68VlBeAMoX0beJ/M+GWFybEpgrW9WNiIbZUjleZzer7/8FsFfM+nJN4ThvD5OeTkvWj9XVTqC2iTuXrABnF7zNnywNNYkqU/5MFHHMT3l07sXMs2Ma43qLgb8TVs7Nfvt+7V+jJXvjkLz32B7WDwohY3ls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766320031; c=relaxed/simple; bh=dssAo1wm/oL3Jcgr6l7Ic9p9gW3Hfq7tK4yorE2tUmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Us+22XcxE8OBCIcZaQG2D1D9PnZP4jgEkfp8pNvM1i9ROPZ5hONGxMddaYezvUA/1MGYejMMi3cPXzv+a50rsKY0DoO72nTAKvGjQyZ/EOqOUIYOcc5CPdLZaUSf9WnsbzleCOQEcJwfoVutz9vtnOcqOCfaBRJFZwNunw3c9JY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=d1oF61VL; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="d1oF61VL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766320025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JtTN5ZiIMcZwcQ+3hqBNVbiHLsjMQ/2q8VKQEGwo2qM=; b=d1oF61VLhliJ4jYGWDmxLFaVaef//yT305O4o7r+4QgOek0t4PYERzgfG0mpo940440Vpe kXoJozQKrYgf385hegl2lHujF7v65RW9VyplkNPAXPg+hkde/ak82Ct6C4jsVG9dSA3bm+ Mp/pryTYE54ddc9T41Nk+Y/8Is6Czvw= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-187-feTpn7toNdysIRCv0MgK9g-1; Sun, 21 Dec 2025 07:27:01 -0500 X-MC-Unique: feTpn7toNdysIRCv0MgK9g-1 X-Mimecast-MFC-AGG-ID: feTpn7toNdysIRCv0MgK9g_1766320020 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 238341956094; Sun, 21 Dec 2025 12:27:00 +0000 (UTC) Received: from dell-per7425-02.rhts.eng.pek2.redhat.com (dell-per7425-02.rhts.eng.pek2.redhat.com [10.73.116.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4EE9B19560B4; Sun, 21 Dec 2025 12:26:55 +0000 (UTC) From: Li Wang To: akpm@linux-foundation.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: David Hildenbrand , Mark Brown , Shuah Khan , Waiman Long Subject: [PATCH v3 3/3] selftests/mm/charge_reserved_hugetlb.sh: add waits with timeout helper Date: Sun, 21 Dec 2025 20:26:39 +0800 Message-ID: <20251221122639.3168038-4-liwang@redhat.com> In-Reply-To: <20251221122639.3168038-1-liwang@redhat.com> References: <20251221122639.3168038-1-liwang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" The hugetlb cgroup usage wait loops in charge_reserved_hugetlb.sh were unbounded and could hang forever if the expected cgroup file value never appears (e.g. due to write_to_hugetlbfs in Error mapping). --- Error log --- # uname -r 6.12.0-xxx.el10.aarch64+64k # ls /sys/kernel/mm/hugepages/hugepages-* hugepages-16777216kB/ hugepages-2048kB/ hugepages-524288kB/ #./charge_reserved_hugetlb.sh -cgroup-v2 # ----------------------------------------- ... # nr hugepages =3D 10 # writing cgroup limit: 5368709120 # writing reseravation limit: 5368709120 ... # write_to_hugetlbfs: Error mapping the file: Cannot allocate memory # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 # Waiting for hugetlb memory reservation to reach size 2684354560. # 0 ... Introduce a small helper, wait_for_file_value(), and use it for: - waiting for reservation usage to drop to 0, - waiting for reservation usage to reach a given size, - waiting for fault usage to reach a given size. This makes the waits consistent and adds a hard timeout (60 tries with 1s sleep) so the test fails instead of stalling indefinitely. Signed-off-by: Li Wang Cc: David Hildenbrand Cc: Mark Brown Cc: Shuah Khan Cc: Waiman Long --- .../selftests/mm/charge_reserved_hugetlb.sh | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh b/tools/= testing/selftests/mm/charge_reserved_hugetlb.sh index fa6713892d82..447769657634 100755 --- a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh +++ b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh @@ -100,7 +100,7 @@ function setup_cgroup() { echo writing cgroup limit: "$cgroup_limit" echo "$cgroup_limit" >$cgroup_path/$name/hugetlb.${MB}MB.$fault_limit_fi= le =20 - echo writing reseravation limit: "$reservation_limit" + echo writing reservation limit: "$reservation_limit" echo "$reservation_limit" > \ $cgroup_path/$name/hugetlb.${MB}MB.$reservation_limit_file =20 @@ -112,41 +112,50 @@ function setup_cgroup() { fi } =20 +function wait_for_file_value() { + local path=3D"$1" + local expect=3D"$2" + local max_tries=3D60 + + if [[ ! -r "$path" ]]; then + echo "ERROR: cannot read '$path', missing or permission denied" + return 1 + fi + + for ((i=3D1; i<=3Dmax_tries; i++)); do + local cur=3D"$(cat "$path")" + if [[ "$cur" =3D=3D "$expect" ]]; then + return 0 + fi + echo "Waiting for $path to become '$expect' (current: '$cur') (try $i/= $max_tries)" + sleep 1 + done + + echo "ERROR: timeout waiting for $path to become '$expect'" + return 1 +} + function wait_for_hugetlb_memory_to_get_depleted() { local cgroup=3D"$1" local path=3D"$cgroup_path/$cgroup/hugetlb.${MB}MB.$reservation_usage_fi= le" - # Wait for hugetlbfs memory to get depleted. - while [ $(cat $path) !=3D 0 ]; do - echo Waiting for hugetlb memory to get depleted. - cat $path - sleep 0.5 - done + + wait_for_file_value "$path" "0" } =20 function wait_for_hugetlb_memory_to_get_reserved() { local cgroup=3D"$1" local size=3D"$2" - local path=3D"$cgroup_path/$cgroup/hugetlb.${MB}MB.$reservation_usage_fi= le" - # Wait for hugetlbfs memory to get written. - while [ $(cat $path) !=3D $size ]; do - echo Waiting for hugetlb memory reservation to reach size $size. - cat $path - sleep 0.5 - done + + wait_for_file_value "$path" "$size" } =20 function wait_for_hugetlb_memory_to_get_written() { local cgroup=3D"$1" local size=3D"$2" - local path=3D"$cgroup_path/$cgroup/hugetlb.${MB}MB.$fault_usage_file" - # Wait for hugetlbfs memory to get written. - while [ $(cat $path) !=3D $size ]; do - echo Waiting for hugetlb memory to reach size $size. - cat $path - sleep 0.5 - done + + wait_for_file_value "$path" "$size" } =20 function write_hugetlbfs_and_get_usage() { --=20 2.49.0