From patchwork Tue Jan 23 07:36:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 190763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp174859dyi; Mon, 22 Jan 2024 23:38:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IG5BV4k0+HWkDMoKdTpzLz7/ba2aoPsSlZkA6NDk+jzGl6ab3b6VOQKxTNDY87sZEjWGQGv X-Received: by 2002:a05:6871:10b:b0:210:9d54:e388 with SMTP id y11-20020a056871010b00b002109d54e388mr1174939oab.32.1705995517566; Mon, 22 Jan 2024 23:38:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705995517; cv=pass; d=google.com; s=arc-20160816; b=pd5maZeYFYMBhCchpo2nlXFkx+FlnGvu/y95Bqcx4i5fSgGSwEdJWkh3nGoo58Hv7u oW/n6UIyw0usJuWEr1rDlX9x714WDYGAN3fzuKdvscCAbdSzbSaTEocdYwGVahiG9F11 hZyTLUa4d7t0sYs1rVn+ea5GDFP0jooO3qExpVTBey/pyTlKaD9NLEKJ+I71x7YU+RpE c3FQ7oPuLT2I0aOMsQZkZriWyU6QuxJyOqkbfy79i47LIbhxHdwVKyouDCJg5RdlCaR1 BuFNSSy8OXvayP7MFma+LWXk5/Uzdisuws4D0yuJh9vDHCPVW2BPrYzMBXeRpYgBZ533 CgaA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=EfuS2Tt+4WI6cHfeaps0egdh+qgxoxbNgqJrrsMe6q8=; fh=GI+QUBHPqwETgj91+OjmAHfGmBmxeZg5KGm08En4mD4=; b=lzAHzgwOXaAU9GYvD86QIG1QTMZjJ22DoHQunyShvHK+VqRv7Q4/ymQwGX3N+4aayG xtPyJLWv9Ej/nu0hxNExTBuDADnRJMESjqn8sOkFLCxULPULzdaTGTdBcyAohBkk0DVH Yjsdb31XaDDSRPZLN1CGMwZPFDbBu0XadTeAsZ9mSJ0lu/ugH5XvA3vcEQ/yTHu2v8Wg GcEZFQugFMRmD8Slki/0Qa5T92KY7JSot70gWbhXUPzoGgu33uqP7eBX0fhSM+L0CPcO ZTeRsQqL02INNelUj48RXZFRjfb7Jz9491tccNxmoiR4ZqnNzXn/qRFZIsV84z9Ap/vT qeuw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="XJBKv2O/"; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-34830-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34830-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k75-20020a636f4e000000b005cdfef7fc5fsi9260012pgc.499.2024.01.22.23.38.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 23:38:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-34830-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="XJBKv2O/"; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-34830-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34830-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 505C028549C for ; Tue, 23 Jan 2024 07:37:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 47BE356468; Tue, 23 Jan 2024 07:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="XJBKv2O/" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 DF86451C3A; Tue, 23 Jan 2024 07:36:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705995386; cv=none; b=H7wao4Sm4Oe7EOdrP6UzZVwN2I4bkRMFTv6kQSXE0kaWPx8w/2yAOoMCcg+h2NJE3dWGRVrXGa+5FRjOmZRMaqaF/jaKPzJpKQIXgO65QoR1aHZ6KTDU6KifEaq1tp+RNJi0Bu7YLo7Ira4kS27ObV3y5XBosJEsTnpydtrquwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705995386; c=relaxed/simple; bh=UjyihoPyN6SOPFC4hXvckN7LSDeJ3FDGKGRL79wdbrI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=J8tKh+f9XwjLHyaQjH3KQPhv60ZXVdaA2A0DTcztzNF2IrTmbX9k7LecL+n9I30BZ9/jNIyD69hVChHZtgUWjIfjjsAv1teQARyV/DENK1nRyGYuqcMBsKKLE9Fzollxd1uMI6g87TXEzOP52wL6PRAXcsVxb8XPNfUosjVuy3s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=XJBKv2O/; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1705995378; bh=UjyihoPyN6SOPFC4hXvckN7LSDeJ3FDGKGRL79wdbrI=; h=From:To:Cc:Subject:Date:From; b=XJBKv2O/lbViF3stGvXrhrgD6QAkY3LkvT2znhJvBl8JwewmKA+W0sDCCN4Tnsm6c D1nUuRlb5LJ1l5RbF72JT4R0Mby8v1FB5Fpw0U2caKcFedUzPcv0AV6rKJEnUtTlGO 29DCJMwu7QHL9vYlv7mJ151n+deebekBZGkRqXpAhcm0EyC4GG3Tcbux290jKc3u/e epJslm+MhXD5jwfuncizu2PfPCTAR1vQtxUYNFP4y9ui8vwDtcGlwUOUBoZjWW3DpW hjCSW80jWtpD7ohV4IR2LR+61z0XAUPoOhNBCL+dPDvVMFch+iBex9eUAojH5tTPRS ju3FJeDlSJWJA== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 91D033782039; Tue, 23 Jan 2024 07:36:16 +0000 (UTC) From: Muhammad Usama Anjum To: Andrew Morton , Shuah Khan Cc: Muhammad Usama Anjum , kernel@collabora.com, Ryan Roberts , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] selftests/mm: run_vmtests.sh: add missing tests Date: Tue, 23 Jan 2024 12:36:13 +0500 Message-ID: <20240123073615.920324-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788865955943287698 X-GMAIL-MSGID: 1788865955943287698 Add missing tests to run_vmtests.sh. The mm kselftests are run through run_vmtests.sh. If a test isn't present in this script, it'll not run with run_tests or `make -C tools/testing/selftests/mm run_tests`. Cc: Ryan Roberts Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Copy the original scripts and their dependence script to install directory as well --- tools/testing/selftests/mm/Makefile | 3 +++ tools/testing/selftests/mm/run_vmtests.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 2453add65d12f..c9c8112a7262e 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -114,6 +114,9 @@ TEST_PROGS := run_vmtests.sh TEST_FILES := test_vmalloc.sh TEST_FILES += test_hmm.sh TEST_FILES += va_high_addr_switch.sh +TEST_FILES += charge_reserved_hugetlb.sh +TEST_FILES += write_hugetlb_memory.sh +TEST_FILES += hugetlb_reparenting_test.sh include ../lib.mk diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 246d53a5d7f28..12754af00b39c 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -248,6 +248,9 @@ CATEGORY="hugetlb" run_test ./map_hugetlb CATEGORY="hugetlb" run_test ./hugepage-mremap CATEGORY="hugetlb" run_test ./hugepage-vmemmap CATEGORY="hugetlb" run_test ./hugetlb-madvise +CATEGORY="hugetlb" run_test ./charge_reserved_hugetlb.sh -cgroup-v2 +CATEGORY="hugetlb" run_test ./hugetlb_reparenting_test.sh -cgroup-v2 +CATEGORY="hugetlb" run_test ./hugetlb-read-hwpoison nr_hugepages_tmp=$(cat /proc/sys/vm/nr_hugepages) # For this test, we need one and just one huge page From patchwork Tue Jan 23 07:36:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 190762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp174684dyi; Mon, 22 Jan 2024 23:38:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlytYSJNhUxPL6xFesU0ZayVVpEktS/++7oaDJ0ooIvtCtPlS/fQul+6FggSUXTIbwb8qI X-Received: by 2002:a05:6a00:1146:b0:6db:605c:b9e4 with SMTP id b6-20020a056a00114600b006db605cb9e4mr3313398pfm.31.1705995486293; Mon, 22 Jan 2024 23:38:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705995486; cv=pass; d=google.com; s=arc-20160816; b=qCysWfN7L02q2K/e/cbjtqmd8JlAFmAfV8/mnwDG4km0UoSnc4FH9/q2OD10lukv/n F9/R0OB3MkMzdQUzwck3KiWdqF4d11nu7oTO6Sb21CBrZ9JuZAjYLcihcPoJ7zDO2Bbz 7W7y/dtzCp3NfTxFMiPJXLlQx2zW4MlABb6gi8Gpj+uiiVELIkFPphlcaeZe4d1/Sbn9 KxxXyvy8k+WBD2X/GM7bVR5M7uMpN1MJCZBYm1gFow+puwBT5QC2/q57ETuwI1f73Ub4 Snx4rwV/J1X3lYHEnLl3mt84yfYXFjyClcKLObKwoc77QoFVT2FkRsJ4ncPrFJFlLXD7 K+WA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2asjm0ZjDvC80Vx/BmtTl2lfNKtG9TYBO3r55xTxbaM=; fh=mVBrUHkdhr4FdAuGFuDLONjpBFXQ76Q1/p1ghTG2QxI=; b=pQ3EtK0O6YF4OsY3lhm0AC+EgS83cWS/hAb2ixzNxfjqYNUm+j7c0oQgFe4plLZ98n GHA0uqnkoNAN7W7vaehK4vegEfcBeN5VOY5olPdqrsWVmdntVcM9Svw0dJ8Of59pLbKD ogTSyuLzDBdJ/0ujkWFXfiU5AkjU/QbXxZD+0xaVJ+pFlmCwyqHElort8DqO4p20R0M0 vSNwb+vQ1Bnr7516kTUH+yc72D7pqsOpKq7R7H1I6bVmsLTFeD4umbNy9tY6Dpyn4+ko xg2CLcTuiWMZ7HeB9peJCy4mLWC53HkACHBF66GXAzl0Ow4ixHB+UcqMjxR9pYCH8407 hr2w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=yjpWZT5I; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-34829-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id c11-20020aa78c0b000000b006db883d2306si11548956pfd.378.2024.01.22.23.38.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 23:38:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-34829-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=yjpWZT5I; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-34829-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 88457B24A1E for ; Tue, 23 Jan 2024 07:36:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25F9F55C1E; Tue, 23 Jan 2024 07:36:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="yjpWZT5I" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 DF8262B9C0; Tue, 23 Jan 2024 07:36:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705995385; cv=none; b=krWzgM4FqPHh5Po0mufSiSyaacuimKHGQq7ElIPDXMwvfbSgKoTazetK3NSTaTXEKawbhBik6MicIKLzoOgVF9WwSDgWRoTDDtnyjzDOyjo3p6VyZ198yfjqRPPYOsw0feyURrrwsz3RSqN5Pq2zdosQlHXhXhq3yoSrHab59oA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705995385; c=relaxed/simple; bh=RONb+w30PwJfAdE6WvIlbcO0ThwKw/iY7UkyK1YT6Hk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eTcvDzcO7331pntdLJW1mtxMfKxEDpaVarmc8w3WPOWjLD/ZkqAOtXemDmLVmzduXRM8QOleMHadJDtg6/aJjaF1R7e+2WOAeO4kzEW4s/Ez4bvcIAmxp8O6Zz6jyrdovhm0cwuvcSQPFDefShLZ8AKY9yTCNPU0YtuWDm0GjFE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=yjpWZT5I; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1705995382; bh=RONb+w30PwJfAdE6WvIlbcO0ThwKw/iY7UkyK1YT6Hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yjpWZT5I4L21f59z0O8zIlh3zXmK/YWUjiAx/7ueI/Zd/8fzpzx9EyJkeF+KLQxpV vYU+3lqu8MSK6lbJK9tjM8HgnJNmO5eFLAAc+s9IbfiMyy7LdN76x1ZCccJ/NvAS9B 0sghzR1FFnrI6Td4+IGjpfqNHJQH1BFUmFBfwESp7vwo8WJknodVYqX03iQ+s+KQVE NPiR8VXkg0hH2iNY0461oBv9e9Spi5dpz8kIJTZud2qFLW5Jyip0Jueurt8qnEcqxH yhFrRSttKNvBTHS2ovlN8vB49CAVl4OQthwORC7KKiCJOvnQKPJKfC0nxTqjPQp2jK CEva9SZ+eibnA== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id D553F3782066; Tue, 23 Jan 2024 07:36:19 +0000 (UTC) From: Muhammad Usama Anjum To: Andrew Morton , Shuah Khan Cc: Muhammad Usama Anjum , kernel@collabora.com, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] selftests/mm: run_vmtests: remove sudo and conform to tap Date: Tue, 23 Jan 2024 12:36:14 +0500 Message-ID: <20240123073615.920324-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240123073615.920324-1-usama.anjum@collabora.com> References: <20240123073615.920324-1-usama.anjum@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788865923178568731 X-GMAIL-MSGID: 1788865923178568731 Remove sudo as some test running environments may not have sudo available. Instead skip the test if root privileges aren't available in the test. Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Added this patch in v2 We are allocating 2*RLIMIT_MEMLOCK.rlim_max memory and mmap() isn't failing. This seems like true bug in the kernel. Even the root user shouldn't be able to allocate more memory than allowed MEMLOCKed memory. Any ideas? --- tools/testing/selftests/mm/on-fault-limit.c | 36 ++++++++++----------- tools/testing/selftests/mm/run_vmtests.sh | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/mm/on-fault-limit.c b/tools/testing/selftests/mm/on-fault-limit.c index b5888d613f34e..0ea98ffab3589 100644 --- a/tools/testing/selftests/mm/on-fault-limit.c +++ b/tools/testing/selftests/mm/on-fault-limit.c @@ -5,40 +5,38 @@ #include #include #include +#include "../kselftest.h" -static int test_limit(void) +static void test_limit(void) { - int ret = 1; struct rlimit lims; void *map; - if (getrlimit(RLIMIT_MEMLOCK, &lims)) { - perror("getrlimit"); - return ret; - } + if (getrlimit(RLIMIT_MEMLOCK, &lims)) + ksft_exit_fail_msg("getrlimit: %s\n", strerror(errno)); - if (mlockall(MCL_ONFAULT | MCL_FUTURE)) { - perror("mlockall"); - return ret; - } + if (mlockall(MCL_ONFAULT | MCL_FUTURE)) + ksft_exit_fail_msg("mlockall: %s\n", strerror(errno)); map = mmap(NULL, 2 * lims.rlim_max, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); + + ksft_test_result(map == MAP_FAILED, "Failed mmap\n"); + if (map != MAP_FAILED) - printf("mmap should have failed, but didn't\n"); - else { - ret = 0; munmap(map, 2 * lims.rlim_max); - } - munlockall(); - return ret; } int main(int argc, char **argv) { - int ret = 0; + ksft_print_header(); + ksft_set_plan(1); + + if (getuid()) + ksft_test_result_skip("Require root privileges to run\n"); + else + test_limit(); - ret += test_limit(); - return ret; + ksft_finished(); } diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 12754af00b39c..863bbc2015332 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -294,7 +294,7 @@ echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages CATEGORY="compaction" run_test ./compaction_test -CATEGORY="mlock" run_test sudo -u nobody ./on-fault-limit +CATEGORY="mlock" run_test ./on-fault-limit CATEGORY="mmap" run_test ./map_populate