From mboxrd@z Thu Jan 1 00:00:00 1970 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 5D1F92248A0 for ; Mon, 16 Mar 2026 03:51:46 +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=1773633107; cv=none; b=lGgurluCG3lEzNE/GwsHGRaYiu7QXwJRu7OpCyi1B0BP4zAw9vC36brDqBvWz9Av8i2a09xbtVjfNUv2w6Ot4UQuIR20OV9aiI2E99wqRhmCXLYzmiJYDSHGlRUHoqW+gfMHmRbvB8vTRiM+265AyZ43Ktsr95mZ4hAZJ3RlxWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773633107; c=relaxed/simple; bh=Yib7BuNxUtq9dqvQtY55ZnEbM1dRpzJvmBGI7K8YPjs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=HhH8izW32WZxkEZO9/eKFYU9CnKHQ1NiHyBdyD7D84VoMv+51f+C7sZll0QpMrpXjuufFz1y4m7eam4lpRgetuGOj2mB+i3noqJNDsuWHzHCoVLX2TpQtNbro1sGEwDBw0eWn4x5VaXgefwRIf3LSgLXljAfEK8KGnvk1jIp7dI= 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=FWoAPf4R; 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="FWoAPf4R" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773633105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U/bz/OlRIsr3yCmSufJAxeWqWIyBHqS7n7g2qlL+oDc=; b=FWoAPf4RcMO184n+qNwirtw0mN1iggJP5Bu0JkAL5YPKuwFHrOHXrBpb9CsBpjc4wl+FC9 Ht5JVnJ7alY7HBAwaJKg6qEq537xMAE4ykN+rLn5dLnYikmHz5XTLC+iJc7IxXF+zoY0nn cd9illLjgSGqbPZhZ/OqolqPvTFO41w= 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-647-gq2VcK39PcazRcXZAKMU3g-1; Sun, 15 Mar 2026 23:51:41 -0400 X-MC-Unique: gq2VcK39PcazRcXZAKMU3g-1 X-Mimecast-MFC-AGG-ID: gq2VcK39PcazRcXZAKMU3g_1773633098 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 93B901800365; Mon, 16 Mar 2026 03:51:38 +0000 (UTC) Received: from gmail.com (unknown [10.72.112.28]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A4AC8180035F; Mon, 16 Mar 2026 03:51:28 +0000 (UTC) Date: Mon, 16 Mar 2026 11:51:23 +0800 From: Chunyu Hu To: Zi Yan Cc: Mike Rapoport , akpm@linux-foundation.org, david@kernel.org, shuah@kernel.org, linux-mm@kvack.org, ljs@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, vbabka@suse.cz, surenb@google.com, mhocko@suse.com, baolin.wang@linux.alibaba.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev, Li Wang Subject: Re: [RESEND PATCH 3/4] selftests/mm: split_huge_page_test: skip the test when thp is not available Message-ID: References: <20260312114027.634559-1-chuhu@redhat.com> <20260312114027.634559-4-chuhu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 On Fri, Mar 13, 2026 at 11:27:30AM -0400, Zi Yan wrote: > On 13 Mar 2026, at 11:15, Mike Rapoport wrote: > > > On Thu, Mar 12, 2026 at 10:11:12AM -0400, Zi Yan wrote: > >> On 12 Mar 2026, at 7:40, Chunyu Hu wrote: > >> > >>> When thp is not enabled on some kernel config such as realtime kernel, the > >>> test will report failure. Fix the false positive by skipping the test > >>> directly when thp is not enabled. > >>> > >>> There's a naming conflict on write_file() function, both thp_settings.h and > >>> split_huge_page_test.c define it. To make use of thp_is_enabled() helper in > >>> the thp_settings.h, rename this local write_file to safe_write_file to > >>> avoid the conflict. The reason to use 'safe_' is it does some error check. > >> > >> Both write_file() do safe checks. Actually the code of both functions looks > >> almost identical except that the thp_settings one does exit() instead of > >> ksft_exit_fail_msg(). > >> > >> Can you rename the split_huge_page_test’s write_file() to write_file_local() > >> and add a comment above the function like > >> /* add _local to avoid a function conflict with thp_settings.h */? > > > > Looks like we can move the version that uses ksft_exit_fail_msg() to > > vm_util and drop the other one. > > Could work. > > tools/testing/selftests/mm/khugepaged.c uses the write_file() from > thp_settings.h in file_setup_area(), which is part of struct mem_ops. > I thought struct mem_ops was passed to some syscall, but it turns out > that it is used locally. The only downside is that file_setup_area() now > has this ksefltest friendly code. Someone might want to clean up > tools/testing/selftests/mm/khugepaged.c with kselftests APIs. :) It looks like work in my try, even before the cleanup with the kselftest APIs. > > > > > >> With that, feel free to add: > >> > >> Reviewed-by: Zi Yan > >> > >> Thanks. > >> > >>> > >>> Tested with thp disabled kernel: > >>> Before The fix: > >>> # -------------------------------------------------- > >>> # running ./split_huge_page_test /tmp/xfs_dir_Ywup9p > >>> # -------------------------------------------------- > >>> # TAP version 13 > >>> # Bail out! Reading PMD pagesize failed > >>> # # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:0 error:0 > >>> # [FAIL] > >>> not ok 61 split_huge_page_test /tmp/xfs_dir_Ywup9p # exit=1 > >>> > >>> After the fix: > >>> # -------------------------------------------------- > >>> # running ./split_huge_page_test /tmp/xfs_dir_YHPUPl > >>> # -------------------------------------------------- > >>> # TAP version 13 > >>> # 1..0 # SKIP Transparent Hugepages not available > >>> # [SKIP] > >>> ok 6 split_huge_page_test /tmp/xfs_dir_YHPUPl # SKIP > >>> > >>> CC: Li Wang > >>> Signed-off-by: Chunyu Hu > >>> --- > >>> tools/testing/selftests/mm/split_huge_page_test.c | 9 +++++++-- > >>> 1 file changed, 7 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c > >>> index e0167111bdd1..615b75ca62cc 100644 > >>> --- a/tools/testing/selftests/mm/split_huge_page_test.c > >>> +++ b/tools/testing/selftests/mm/split_huge_page_test.c > >>> @@ -21,6 +21,7 @@ > >>> #include > >>> #include "vm_util.h" > >>> #include "kselftest.h" > >>> +#include "thp_settings.h" > >>> > >>> uint64_t pagesize; > >>> unsigned int pageshift; > >>> @@ -255,7 +256,7 @@ static int check_after_split_folio_orders(char *vaddr_start, size_t len, > >>> return status; > >>> } > >>> > >>> -static void write_file(const char *path, const char *buf, size_t buflen) > >>> +static void safe_write_file(const char *path, const char *buf, size_t buflen) > >>> { > >>> int fd; > >>> ssize_t numwritten; > >>> @@ -283,7 +284,7 @@ static void write_debugfs(const char *fmt, ...) > >>> if (ret >= INPUT_MAX) > >>> ksft_exit_fail_msg("%s: Debugfs input is too long\n", __func__); > >>> > >>> - write_file(SPLIT_DEBUGFS, input, ret + 1); > >>> + safe_write_file(SPLIT_DEBUGFS, input, ret + 1); > >>> } > >>> > >>> static char *allocate_zero_filled_hugepage(size_t len) > >>> @@ -772,6 +773,10 @@ int main(int argc, char **argv) > >>> ksft_finished(); > >>> } > >>> > >>> + if (!thp_is_enabled()) { > >>> + ksft_exit_skip("Transparent Hugepages not available\n"); > >>> + } > >>> + > >>> if (argc > 1) > >>> optional_xfs_path = argv[1]; > >>> > >>> -- > >>> 2.53.0 > >> > >> > >> Best Regards, > >> Yan, Zi > > > > -- > > Sincerely yours, > > Mike. > > > Best Regards, > Yan, Zi >