linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: "Jain, Ayush" <ayush.jain3@amd.com>
To: Florent Revest <revest@chromium.org>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, catalin.marinas@arm.com,
	anshuman.khandual@arm.com, joey.gouly@arm.com, mhocko@suse.com,
	keescook@chromium.org, david@redhat.com, peterx@redhat.com,
	izbyshev@ispras.ru, broonie@kernel.org, szabolcs.nagy@arm.com,
	kpsingh@kernel.org, gthelen@google.com, toiwoton@gmail.com,
	raghavendra.kt@amd.com
Subject: Re: [PATCH v3 2/5] kselftest: vm: Fix mdwe's mmap_FIXED test case
Date: Fri, 25 Aug 2023 10:07:14 +0530	[thread overview]
Message-ID: <73949f6d-bc2d-f2eb-7609-ae66a9f0ddfb@amd.com> (raw)
In-Reply-To: <20230704153630.1591122-3-revest@chromium.org>

On 7/4/2023 9:06 PM, Florent Revest wrote:
> I checked with the original author, the mmap_FIXED test case wasn't
> properly tested and fails. Currently, it maps two consecutive (non
> overlapping) pages and expects the second mapping to be denied by MDWE
> but these two pages have nothing to do with each other so MDWE is
> actually out of the picture here.
> 
> What the test actually intended to do was to remap a virtual address
> using MAP_FIXED. However, this operation unmaps the existing mapping and
> creates a new one so the va is backed by a new page and MDWE is again
> out of the picture, all remappings should succeed.
> 
> This patch keeps the test case to make it clear that this situation is
> expected to work.
> 
> Signed-off-by: Florent Revest <revest@chromium.org>
> Reviewed-by: David Hildenbrand <david@redhat.com>
> Fixes: 4cf1fe34fd18 ("kselftest: vm: add tests for memory-deny-write-execute")
> ---
>   tools/testing/selftests/mm/mdwe_test.c | 9 +++------
>   1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c
> index d0954c657feb..91aa9c3099e7 100644
> --- a/tools/testing/selftests/mm/mdwe_test.c
> +++ b/tools/testing/selftests/mm/mdwe_test.c
> @@ -168,13 +168,10 @@ TEST_F(mdwe, mmap_FIXED)
>   	self->p = mmap(NULL, self->size, PROT_READ, self->flags, 0, 0);
>   	ASSERT_NE(self->p, MAP_FAILED);
>   
> -	p = mmap(self->p + self->size, self->size, PROT_READ | PROT_EXEC,
> +	/* MAP_FIXED unmaps the existing page before mapping which is allowed */
> +	p = mmap(self->p, self->size, PROT_READ | PROT_EXEC,
>   		 self->flags | MAP_FIXED, 0, 0);
> -	if (variant->enabled) {
> -		EXPECT_EQ(p, MAP_FAILED);
> -	} else {
> -		EXPECT_EQ(p, self->p);
> -	}
> +	EXPECT_EQ(p, self->p);

Tested this patch on EPYC x86 platform and fixes the testcase.
Thanks for this patch!!

Tested-by: Ayush Jain <ayush.jain3@amd.com>

>   }
>   
>   TEST_F(mdwe, arm64_BTI)



  parent reply	other threads:[~2023-08-25  4:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-04 15:36 [PATCH v3 0/5] MDWE without inheritance Florent Revest
2023-07-04 15:36 ` [PATCH v3 1/5] kselftest: vm: Fix tabs/spaces inconsistency in the mdwe test Florent Revest
2023-08-25 22:23   ` Kees Cook
2023-08-27 13:09   ` Catalin Marinas
2023-08-28 14:45     ` Florent Revest
2023-07-04 15:36 ` [PATCH v3 2/5] kselftest: vm: Fix mdwe's mmap_FIXED test case Florent Revest
2023-07-13  7:13   ` Ryan Roberts
2023-08-25  4:37   ` Jain, Ayush [this message]
2023-08-25 22:28   ` Kees Cook
2023-08-28 14:46     ` Florent Revest
2023-08-27 13:09   ` Catalin Marinas
2023-07-04 15:36 ` [PATCH v3 3/5] mm: Make PR_MDWE_REFUSE_EXEC_GAIN an unsigned long Florent Revest
2023-07-04 15:45   ` Florent Revest
2023-08-25 22:29   ` Kees Cook
2023-07-04 15:36 ` [PATCH v3 4/5] mm: Add a NO_INHERIT flag to the PR_SET_MDWE prctl Florent Revest
2023-08-25 22:38   ` Kees Cook
2023-08-27 13:09     ` Catalin Marinas
2023-08-28 14:46       ` Florent Revest
2023-08-27 13:10   ` Catalin Marinas
2023-08-28 14:46     ` Florent Revest
2023-07-04 15:36 ` [PATCH v3 5/5] kselftest: vm: Add tests for no-inherit memory-deny-write-execute Florent Revest
2023-08-25 22:45   ` Kees Cook
2023-08-28 14:47     ` Florent Revest
2023-08-27 13:11   ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=73949f6d-bc2d-f2eb-7609-ae66a9f0ddfb@amd.com \
    --to=ayush.jain3@amd.com \
    --cc=akpm@linux-foundation.org \
    --cc=anshuman.khandual@arm.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=david@redhat.com \
    --cc=gthelen@google.com \
    --cc=izbyshev@ispras.ru \
    --cc=joey.gouly@arm.com \
    --cc=keescook@chromium.org \
    --cc=kpsingh@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.com \
    --cc=peterx@redhat.com \
    --cc=raghavendra.kt@amd.com \
    --cc=revest@chromium.org \
    --cc=szabolcs.nagy@arm.com \
    --cc=toiwoton@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox