From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 571103815D4 for ; Tue, 31 Mar 2026 10:08:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774951688; cv=none; b=eDF0d3k7QK+k9JIvGbz5LYLgXamgkBPH3Zx1TPOQge1jncww9sumGW/UawMuHx9Xdm1JT2YNFArEls/CjbPG6FuFsvTNQ8VMYca94OjnRa892A9mmhIbhmtKkJRKafOCHLMrJ8erqL8pUoDuC6XgXn8vpR4WfvYzvn9dj9SRm2g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774951688; c=relaxed/simple; bh=/Rxl3kL8SEbyFXYr+VYIVFkryxfMTmzHf22BJsC6y9M=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=G5gD4oYkzJ7U/7iII1EIRdZcdS9aggIY+YYgrK8+MGimuFuR9dG1s4p7XT/HUoHcc8E3kWKop6eHc1qavF/fyXRJOyqrGhscL1JevpApaFuTzzsG6/nXFKjh29nZzFCeZMmlAV9qcOz1g1xy7hga6EDFf+/S1EMhubuC6bi4gTM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MXXu+cXu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MXXu+cXu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 560D9C19423; Tue, 31 Mar 2026 10:08:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774951687; bh=/Rxl3kL8SEbyFXYr+VYIVFkryxfMTmzHf22BJsC6y9M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MXXu+cXuS62+LFUfW8BMuONZBCg7TtUHJ3uLk3V9lYiXJEoNCfqOQ1LzvoRPjlm6Y GJBjMawttoaTIF0w9oEsrvTf2FLtSt+Bn/Ng+cKJO5H5S6w2UfaOm3BK83eAr1Uafx 54gTVGTRjDOGz0xBqhVDHlwmkcMZ3uUAomFVcjFhQ0beEkv7lrfe7J7/gYw2HSnvee adimUQd+2jZL702sa8jncTusB8A44pEquNOUeLsUQ/6FQ7owGiHo7w8C44IR4J2d8D 3DSB1u1n9E6cWoK/zu0D+zYJR36X2kGIQx/6dW0kcCx9eGuN02JFz4R0oocyfpJtD1 /3HJd3aIeTLBA== Date: Tue, 31 Mar 2026 11:08:03 +0100 From: "Lorenzo Stoakes (Oracle)" To: Andrew Morton Cc: Pedro Falcato , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , David Hildenbrand , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] tools/testing/selftests: add merge test for partial msealed range Message-ID: <1c9c922d-5cb5-4cff-9273-b737cdb57ca1@lucifer.local> References: <20260331073627.50010-1-ljs@kernel.org> 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=us-ascii Content-Disposition: inline In-Reply-To: Then again, and contradicting myself elsewhere on fix-patches blah blah blah, since this is just test code, I checked the below and it works the same and triggers the regression. So maybe we can just apply that? Cheers, Lorenzo ----8<---- >From bcf5c7ea63961756913110694cfd34173e3f0fc4 Mon Sep 17 00:00:00 2001 From: "Lorenzo Stoakes (Oracle)" Date: Tue, 31 Mar 2026 11:01:35 +0100 Subject: [PATCH] fix Signed-off-by: Lorenzo Stoakes (Oracle) --- tools/testing/selftests/mm/merge.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c index f73803b3679a..efcb100fd865 100644 --- a/tools/testing/selftests/mm/merge.c +++ b/tools/testing/selftests/mm/merge.c @@ -1245,7 +1245,7 @@ TEST_F(merge, merge_vmas_with_mseal) SKIP(return, "mseal not supported, skipping."); /* Map carveout. */ - carveout = mmap(NULL, 17 * page_size, PROT_NONE, + carveout = mmap(NULL, 5 * page_size, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0); ASSERT_NE(carveout, MAP_FAILED); @@ -1257,14 +1257,14 @@ TEST_F(merge, merge_vmas_with_mseal) * |-----------|-----------|-----------| * ptr ptr2 ptr3 */ - ptr = mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + ptr = mmap(&carveout[page_size], page_size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); ASSERT_NE(ptr, MAP_FAILED); - ptr2 = mmap(&carveout[page_size * 6], 5 * page_size, + ptr2 = mmap(&carveout[2 * page_size], page_size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); ASSERT_NE(ptr2, MAP_FAILED); - ptr3 = mmap(&carveout[page_size * 11], 5 * page_size, PROT_READ, + ptr3 = mmap(&carveout[3 * page_size], page_size, PROT_READ, MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); ASSERT_NE(ptr3, MAP_FAILED); @@ -1276,10 +1276,10 @@ TEST_F(merge, merge_vmas_with_mseal) * |-----------|-----------|-----------| * ptr ptr2 ptr3 */ - ASSERT_EQ(sys_mseal(ptr2, 5 * page_size, 0), 0); + ASSERT_EQ(sys_mseal(ptr2, page_size, 0), 0); /* Make first VMA mergeable upon mseal. */ - ASSERT_EQ(mprotect(ptr, 5 * page_size, + ASSERT_EQ(mprotect(ptr, page_size, PROT_READ | PROT_WRITE | PROT_EXEC), 0); /* * At this point we have: @@ -1291,7 +1291,7 @@ TEST_F(merge, merge_vmas_with_mseal) * * Now mseal all of the VMAs. */ - ASSERT_EQ(sys_mseal(ptr, 15 * page_size, 0), 0); + ASSERT_EQ(sys_mseal(ptr, 3 * page_size, 0), 0); /* * We should end up with: @@ -1303,7 +1303,7 @@ TEST_F(merge, merge_vmas_with_mseal) */ ASSERT_TRUE(find_vma_procmap(procmap, ptr)); ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); - ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 2 * page_size); } TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) -- 2.53.0