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 7ACA6330301 for ; Wed, 1 Apr 2026 08:32:07 +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=1775032327; cv=none; b=exERuWeUZAut4TWW+MzzKmA/hHNQr1KU4Fsivz+hVFxVruVyohTk8HcINYZD4Ls/8SFfAd2e9QP+JjXY+1+Mt3DGTrKqtjR/wNlVU/qxCiIPEqLrTHhcZ4n4bLlDlehfzxJg5giPqhsbCt6ANlpPNN8CBYg54qJHs3V5unGwxb4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775032327; c=relaxed/simple; bh=P0bnyV0hKEXKjl48i1RFmLFy6/VGUnDR9D0oWD/ovfU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=rB15JpYq6pOIae+VjtgDsLBqI2ow8gcUzzt5CWHI5iFGzYVoPpJp7NBN7PMor5KTvzJ5S3bWaCWehJEakiMF1zejEzah0I+F/FRrqEKxbIMj0/KNaeO7Z+RcNYbIKi9Kjy/+G7FM6HKoTUik+GULQf+5f05/0UeIrf/Hekf2kCw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aeYzej/w; 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="aeYzej/w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B9EAC4CEF7; Wed, 1 Apr 2026 08:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775032327; bh=P0bnyV0hKEXKjl48i1RFmLFy6/VGUnDR9D0oWD/ovfU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aeYzej/wufj38Rvm2EwY2ZDCsCYCIU2RG2HHJwMZcdxfAt7ClH3/zAtXCD0aKnZ6e /o7RXd0ZkJnGolmwdIhN3apX5h/JE/14W66YvQPux2cbRs2aoBHytEFuEaEcQmPDfS CpMwGOCN2zzvsqcdKUlvBEeo+jH+VCTqd/rGXj+J092JllK+GJN4WcFxkRoKiXRh/p MzS44WU9c5ixILdhDq5JyszI48GBAYDHb7ZUeKClDf5oCuDAfBxan9Ceo/Tk8rNqT9 /+cix9RddjMiWV1O+4woRGglpG34QFXBXBzSAcnoTUTYrHeL2APBDd+8w0Y1r5iPrp fMRiJMosmR0ZQ== Date: Wed, 1 Apr 2026 09:32:02 +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: <2b2eb985-ecf9-4477-a967-872153199dcf@lucifer.local> References: <20260331073627.50010-1-ljs@kernel.org> <1c9c922d-5cb5-4cff-9273-b737cdb57ca1@lucifer.local> <20260331175851.91867c426e09a5b3eccc1d6f@linux-foundation.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: <20260331175851.91867c426e09a5b3eccc1d6f@linux-foundation.org> On Tue, Mar 31, 2026 at 05:58:51PM -0700, Andrew Morton wrote: > On Tue, 31 Mar 2026 11:08:03 +0100 "Lorenzo Stoakes (Oracle)" wrote: > > > 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? > > Here's how the two folded together will look: Thanks, LGTM! Cheers, Lorenzo > > > From: "Lorenzo Stoakes (Oracle)" > Subject: tools/testing/selftests: add merge test for partial msealed range > Date: Tue, 31 Mar 2026 08:36:27 +0100 > > Commit 2697dd8ae721 ("mm/mseal: update VMA end correctly on merge") fixed > an issue in the loop which iterates through VMAs applying mseal, which was > triggered by mseal()'ing a range of VMAs where the second was mseal()'d > and the first mergeable with it, once mseal()'d. > > Add a regression test to assert that this behaviour is correct. We place > it in the merge selftests as this is strictly an issue with merging (via a > vma_modify() invocation). > > It also asserts that mseal()'d ranges are correctly merged as you'd > expect. > > The test is implemented such that it is skipped if mseal() is not > available on the system. > > [ljs@kernel.org: simplifications per Pedro] > Link: https://lkml.kernel.org/r/1c9c922d-5cb5-4cff-9273-b737cdb57ca1@lucifer.local > Link: https://lkml.kernel.org/r/20260331073627.50010-1-ljs@kernel.org > Signed-off-by: Lorenzo Stoakes (Oracle) > Cc: David Hildenbrand > Cc: Jann Horn > Cc: Liam Howlett > Cc: Lorenzo Stoakes > Cc: Michal Hocko > Cc: Mike Rapoport > Cc: Pedro Falcato > Cc: Shuah Khan > Cc: Suren Baghdasaryan > Cc: Vlastimil Babka > Signed-off-by: Andrew Morton > --- > > tools/testing/selftests/mm/merge.c | 89 +++++++++++++++++++++++++++ > 1 file changed, 89 insertions(+) > > --- a/tools/testing/selftests/mm/merge.c~tools-testing-selftests-add-merge-test-for-partial-msealed-range > +++ a/tools/testing/selftests/mm/merge.c > @@ -2,6 +2,7 @@ > > #define _GNU_SOURCE > #include "kselftest_harness.h" > +#include > #include > #include > #include > @@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd * > return 0; > } > > +#ifdef __NR_mseal > +static int sys_mseal(void *ptr, size_t len, unsigned long flags) > +{ > + return syscall(__NR_mseal, (unsigned long)ptr, len, flags); > +} > +#else > +static int sys_mseal(void *ptr, size_t len, unsigned long flags) > +{ > + errno = ENOSYS; > + return -1; > +} > +#endif > + > FIXTURE_SETUP(merge) > { > self->page_size = psize(); > @@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faul > ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); > } > > +TEST_F(merge, merge_vmas_with_mseal) > +{ > + unsigned int page_size = self->page_size; > + struct procmap_fd *procmap = &self->procmap; > + char *ptr, *ptr2, *ptr3; > + /* We need our own as cannot munmap() once sealed. */ > + char *carveout; > + > + /* Invalid mseal() call to see if implemented. */ > + ASSERT_EQ(sys_mseal(NULL, 0, ~0UL), -1); > + if (errno == ENOSYS) > + SKIP(return, "mseal not supported, skipping."); > + > + /* Map carveout. */ > + carveout = mmap(NULL, 5 * page_size, PROT_NONE, > + MAP_PRIVATE | MAP_ANON, -1, 0); > + ASSERT_NE(carveout, MAP_FAILED); > + > + /* > + * Map 3 separate VMAs: > + * > + * |-----------|-----------|-----------| > + * | RW | RWE | RO | > + * |-----------|-----------|-----------| > + * ptr ptr2 ptr3 > + */ > + 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[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[3 * page_size], page_size, PROT_READ, > + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); > + ASSERT_NE(ptr3, MAP_FAILED); > + > + /* > + * mseal the second VMA: > + * > + * |-----------|-----------|-----------| > + * | RW | RWES | RO | > + * |-----------|-----------|-----------| > + * ptr ptr2 ptr3 > + */ > + ASSERT_EQ(sys_mseal(ptr2, page_size, 0), 0); > + > + /* Make first VMA mergeable upon mseal. */ > + ASSERT_EQ(mprotect(ptr, page_size, > + PROT_READ | PROT_WRITE | PROT_EXEC), 0); > + /* > + * At this point we have: > + * > + * |-----------|-----------|-----------| > + * | RWE | RWES | RO | > + * |-----------|-----------|-----------| > + * ptr ptr2 ptr3 > + * > + * Now mseal all of the VMAs. > + */ > + ASSERT_EQ(sys_mseal(ptr, 3 * page_size, 0), 0); > + > + /* > + * We should end up with: > + * > + * |-----------------------|-----------| > + * | RWES | ROS | > + * |-----------------------|-----------| > + * ptr ptr3 > + */ > + 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 + 2 * page_size); > +} > + > TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) > { > struct procmap_fd *procmap = &self->procmap; > _ >