From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 7A05D3A5428; Thu, 9 Apr 2026 23:49:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775778575; cv=none; b=QKMqLdM4b3D1CPy9wNOp9wX1AimkaAkahpH/XJIe4XNlXRO8RzE/V8au1YjNGye0J9TbWWHmDdo8eMgfhtkuMdgLhHN/O6YttECm2g5DfMX7m2cVM+5sRCpRCrC+UxIJWO2CNXeOvphC4+5PlKiY1rzSLnwxUZq9yC/bn7Y3QaI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775778575; c=relaxed/simple; bh=JFLAoQi0iRytD3P4qz8Z9RJ2tcFkkeqHWRPHJooWHmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rAtZ8bCggHM052ggd1imgZtaDUqQ6KItlK6Kr3Ga+NILiTqTGu/RnLdP35W9+VNOxLyBqbhvNGGq+bLBDxdHszPvm0L1PfQIus2tRIUZSG3Jhe6ATA+0PmZFHOOz/h7R20UPE3dDUgdpSp+pQ4FmxMX18XvVACqhVd5Er8sgEVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=T8FEv1Mw; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="T8FEv1Mw" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 639JtY2X3363830; Thu, 9 Apr 2026 23:49:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2025-04-25; bh=Q5zS4 AbyfSrBrAYYwwDhm0BhvxfeDN7C2ZhJWTF0Yb8=; b=T8FEv1Mw3WutcxNlPPYmx JhSyZFsBqGJdNaLgmChg/zpK28kobSnCrq329Q8fInSXD77k4xuWgiAwRLtAuGoM R9Bf/y1+GmV+gu3hNfOOpgFOVPu3JUJkomUb+YNnwhNFM6ZBRrP8pcymt0qZImQo 7Q8ICnZA+O/nj/kc89wCZHLidfuDRpFP7iF3GWsyj4AY4ogsgrBcKu5FdHg+3xV+ 59G6Iz8sVpQyAJxXXN0MerPI722FwCxAAt7tzGbBbFYru9Se8kwQ24NaAHMlr2OI nsmUUdopczp29efGV7KfSHN9siDCn7YHlLN/QBomdWV8IviCfwLJqYx9UgegfLri Q== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4dcmqb0mc5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Apr 2026 23:49:23 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 639MGcdg003534; Thu, 9 Apr 2026 23:49:22 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4dcn5ytg0c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Apr 2026 23:49:22 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 639NnIZQ019990; Thu, 9 Apr 2026 23:49:21 GMT Received: from localhost.localdomain (ca-dev60.us.oracle.com [10.129.136.27]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 4dcn5ytfx5-3; Thu, 09 Apr 2026 23:49:21 +0000 From: Anthony Yznaga To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, Liam.Howlett@oracle.com, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, jannh@google.com, pfalcato@suse.de, Jason@zx2c4.com, shuah@kernel.org Subject: [PATCH v3 2/2] selftests/mm: verify droppable mappings cannot be locked Date: Thu, 9 Apr 2026 16:49:15 -0700 Message-ID: <20260409234915.11723-3-anthony.yznaga@oracle.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260409234915.11723-1-anthony.yznaga@oracle.com> References: <20260409234915.11723-1-anthony.yznaga@oracle.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-09_05,2026-04-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 adultscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2604010000 definitions=main-2604090220 X-Proofpoint-ORIG-GUID: 40N8NH5Crb0U29iL8DnzmZhoaGwOkPDW X-Proofpoint-GUID: 40N8NH5Crb0U29iL8DnzmZhoaGwOkPDW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA5MDIyMCBTYWx0ZWRfX50VGl0rnNXbZ 1ftc33K+AymVbnhNtGYWP3ICw2pGO+V0Yoa4qjloVXzMyNZaafhmPFy1BH/mbKcawh4VD71RFaD gqW1foFGyuQjch3Itc1noKvKOECj38N+bXvRZ0vpD/KZ7KgSIUPugpP7x1O4Qr2b7H9D0yN0oAf xvmA8i/SbyxLVx+oOVuaSswdzkZBqMsp6a+9Yzv3HVrpaBjUZRGihF8ljxGGyezd5/mScbLHeEw YZ0wb30QJDYYowRoNazVtGEuUvy171no5ROLC79NGbTct6GaaXOm7DAlKt6gMaNuxi5XBOrJaNl YkpRbHMS3ziVclRPXvutf1M55fYwfKrbqlpizaoDedjC7WRHDapgsHDeVLomcxHbL9Hoadf/fBj riFMz6nQM+tcLldhPQNlvo73+oVlPfslzpun2zhcM5fMlUxYz3LOf2j+GvArqAZfywXKZfprNei VKuGHsVuYgPrW8cxTsKYqIeV2NBIjRzUKYRf+vpE= X-Authority-Analysis: v=2.4 cv=NZXWEWD4 c=1 sm=1 tr=0 ts=69d83b03 b=1 cx=c_pps a=zPCbziy225d3KhSqZt3L1A==:117 a=zPCbziy225d3KhSqZt3L1A==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=jiCTI4zE5U7BLdzWsZGv:22 a=EIcjfB9IiI4px24ztqRk:22 a=yPCof4ZbAAAA:8 a=RvmZQwE64T_oa5h20bIA:9 cc=ntf awl=host:12291 For configs that support MAP_DROPPABLE verify that a mapping created with MAP_DROPPABLE cannot be locked via mlock(), and that it will not be locked if it's created after mlockall(MCL_FUTURE). Signed-off-by: Anthony Yznaga --- tools/testing/selftests/mm/mlock2-tests.c | 100 ++++++++++++++++++++-- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/mm/mlock2-tests.c b/tools/testing/selftests/mm/mlock2-tests.c index b474f2b20def..47da1a05c243 100644 --- a/tools/testing/selftests/mm/mlock2-tests.c +++ b/tools/testing/selftests/mm/mlock2-tests.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #define _GNU_SOURCE #include +#include #include #include #include @@ -163,14 +164,17 @@ static int lock_check(unsigned long addr) return (vma_rss == vma_size); } -static int unlock_lock_check(char *map) +static int unlock_lock_check(char *map, bool mlock_supported) { - if (is_vmflag_set((unsigned long)map, LOCKED)) { + if (!is_vmflag_set((unsigned long)map, LOCKED)) + return 0; + + if (mlock_supported) ksft_print_msg("VMA flag %s is present on page 1 after unlock\n", LOCKED); - return 1; - } + else + ksft_print_msg("VMA flag %s is present on an unsupported VMA\n", LOCKED); - return 0; + return 1; } static void test_mlock_lock(void) @@ -196,7 +200,7 @@ static void test_mlock_lock(void) ksft_exit_fail_msg("munlock(): %s\n", strerror(errno)); } - ksft_test_result(!unlock_lock_check(map), "%s: Unlocked\n", __func__); + ksft_test_result(!unlock_lock_check(map, true), "%s: Unlocked\n", __func__); munmap(map, 2 * page_size); } @@ -296,7 +300,7 @@ static void test_munlockall0(void) ksft_exit_fail_msg("munlockall(): %s\n", strerror(errno)); } - ksft_test_result(!unlock_lock_check(map), "%s: No locked memory\n", __func__); + ksft_test_result(!unlock_lock_check(map, true), "%s: No locked memory\n", __func__); munmap(map, 2 * page_size); } @@ -336,9 +340,85 @@ static void test_munlockall1(void) ksft_exit_fail_msg("munlockall() %s\n", strerror(errno)); } - ksft_test_result(!unlock_lock_check(map), "%s: No locked memory\n", __func__); + ksft_test_result(!unlock_lock_check(map, true), "%s: No locked memory\n", __func__); + munmap(map, 2 * page_size); +} + +#ifdef MAP_DROPPABLE +/* + * Droppable memory should not be lockable. + */ +static void test_mlock_droppable(void) +{ + char *map; + unsigned long page_size = getpagesize(); + + /* + * Ensure MCL_FUTURE is not set. + */ + if (munlockall()) { + ksft_test_result_fail("munlockall() %s\n", strerror(errno)); + return; + } + + map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_DROPPABLE, -1, 0); + if (map == MAP_FAILED) { + if (errno == EOPNOTSUPP) + ksft_test_result_skip("%s: MAP_DROPPABLE not supported\n", __func__); + else + ksft_test_result_fail("mmap error: %s\n", strerror(errno)); + return; + } + + if (mlock2_(map, 2 * page_size, 0)) + ksft_test_result_fail("mlock2(0): %s\n", strerror(errno)); + else + ksft_test_result(!unlock_lock_check(map, false), + "%s: droppable memory not locked\n", __func__); + + munmap(map, 2 * page_size); +} + +static void test_mlockall_future_droppable(void) +{ + char *map; + unsigned long page_size = getpagesize(); + + if (mlockall(MCL_CURRENT | MCL_FUTURE)) { + ksft_test_result_fail("mlockall(MCL_CURRENT | MCL_FUTURE): %s\n", strerror(errno)); + return; + } + + map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_DROPPABLE, -1, 0); + + if (map == MAP_FAILED) { + if (errno == EOPNOTSUPP) + ksft_test_result_skip("%s: MAP_DROPPABLE not supported\n", __func__); + else + ksft_test_result_fail("mmap error: %s\n", strerror(errno)); + munlockall(); + return; + } + + ksft_test_result(!unlock_lock_check(map, false), "%s: droppable memory not locked\n", + __func__); + + munlockall(); munmap(map, 2 * page_size); } +#else +static void test_mlock_droppable(void) +{ + ksft_test_result_skip("%s: MAP_DROPPABLE not supported\n", __func__); +} + +static void test_mlockall_future_droppable(void) +{ + ksft_test_result_skip("%s: MAP_DROPPABLE not supported\n", __func__); +} +#endif /* MAP_DROPPABLE */ static void test_vma_management(bool call_mlock) { @@ -442,7 +522,7 @@ int main(int argc, char **argv) munmap(map, size); - ksft_set_plan(13); + ksft_set_plan(15); test_mlock_lock(); test_mlock_onfault(); @@ -451,6 +531,8 @@ int main(int argc, char **argv) test_lock_onfault_of_present(); test_vma_management(true); test_mlockall(); + test_mlock_droppable(); + test_mlockall_future_droppable(); ksft_finished(); } -- 2.47.3