From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 50DA6495517; Wed, 22 Jul 2026 09:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711559; cv=none; b=cfPjOsCznuwvL2u2N9el8F3QT7BqejEom4d7bUzFn64dmqJ7HStGwz3qFzpizM31nlKmIYEQb7dmVIW2HYs7C5tqhTPxyjfNkP5EDfGKh4jrkuvAgLgH+AAX4UhvwVcBK1zmqtJv4+qArueyCZQ9xbyhoG7syUi4NhJt0FlcaO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711559; c=relaxed/simple; bh=FcfLiMt+bHeoQiYgQH5BUPvM3W4w/RBin08nosAKQeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tMXhpzdcUvyZU22wad07H0rcZO7n7YExcI1wcQETG62CXmQmt1kxK+nTWojF8x9R8H+3w6n10jT6xeQjRTiVLQlbDD9f2nWuO43UBwLxls+uzsWayr6vY54ZIW6gtDJ9nsW5qQESXGDtbuKjGLMQ44u6lPOrCzRd2vOCRD/ybD4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=t5D8ftkW; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="t5D8ftkW" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F0C641595; Wed, 22 Jul 2026 02:12:32 -0700 (PDT) Received: from e142334-100.cambridge.arm.com (e142334-100.cambridge.arm.com [10.2.198.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0A48E3F86F; Wed, 22 Jul 2026 02:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784711557; bh=FcfLiMt+bHeoQiYgQH5BUPvM3W4w/RBin08nosAKQeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t5D8ftkWCpH0Wn6f4iz0gui8c3irSjSWBII9enx1vmobNdM98AaccGRsapWj/3DAU pfkC30kUr7+goUvx4twrTbq96meG8jPrtAXXN5JszxbxqQSc0afhMFDQJNGLOpG7Ij bA8RtIE92vtzRZycWvxm89X05Y14MVWCt44pZVfc= From: Muhammad Usama Anjum To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Miaohe Lin , Naoya Horiguchi , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Muhammad Usama Anjum Subject: [PATCH RESEND v1 3/5] selftests/mm: skip khugepaged swap tests without swap Date: Wed, 22 Jul 2026 10:11:37 +0100 Message-ID: <20260722091219.61504-4-usama.anjum@arm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260722091219.61504-1-usama.anjum@arm.com> References: <20260722091219.61504-1-usama.anjum@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit collapse_swapin_single_pte and collapse_max_ptes_swap require MADV_PAGEOUT to replace anonymous pages with swap entries. On swapless systems there is no backing store with which to create those entries, so check_swap() reports missing setup rather than broken khugepaged behavior. Swapless configurations are common on Android and other constrained test devices. Failing these cases obscures actionable results from the rest of the khugepaged suite. Check /proc/swaps before either swap-dependent case and skip when no active swap area exists. With swap present, retain the existing MADV_PAGEOUT and swap-entry assertions unchanged. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/mm/khugepaged.c | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c index 10e8dedcb087d..a152cec59fcbd 100644 --- a/tools/testing/selftests/mm/khugepaged.c +++ b/tools/testing/selftests/mm/khugepaged.c @@ -100,6 +100,28 @@ static void skip(const char *msg) exit_status = KSFT_SKIP; } +static bool is_swap_enabled(void) +{ + char buf[MAX_LINE_LENGTH]; + FILE *file; + bool enabled = false; + + file = fopen("/proc/swaps", "r"); + if (!file) + return false; + + if (!fgets(buf, sizeof(buf), file)) + goto out; + + /* Check for first active swap entry. */ + if (fgets(buf, sizeof(buf), file)) + enabled = true; + +out: + fclose(file); + return enabled; +} + static void save_settings(void) { ksft_print_msg("Save THP and khugepaged settings..."); @@ -734,6 +756,12 @@ static void collapse_swapin_single_pte(struct collapse_context *c, struct mem_op { void *p; + if (!is_swap_enabled()) { + skip("No active swap"); + ksft_test_result_report(exit_status, "%s\n", __func__); + return; + } + p = ops->setup_area(1); ops->fault(p, 0, hpage_pmd_size); @@ -760,6 +788,12 @@ static void collapse_max_ptes_swap(struct collapse_context *c, struct mem_ops *o int max_ptes_swap = thp_read_num("khugepaged/max_ptes_swap"); void *p; + if (!is_swap_enabled()) { + skip("No active swap"); + ksft_test_result_report(exit_status, "%s\n", __func__); + return; + } + p = ops->setup_area(1); ops->fault(p, 0, hpage_pmd_size); -- 2.47.3