[PATCH] linux-user/elfload: use MAP_FIXED in pgb_reserved_va

Alex Bennée posted 1 patch 1 week ago
Test FreeBSD passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test docker-mingw@fedora passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200630103448.22742-1-alex.bennee@linaro.org
linux-user/elfload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] linux-user/elfload: use MAP_FIXED in pgb_reserved_va

Posted by Alex Bennée 1 week ago
Given we assert the requested address matches what we asked we should
also make that clear in the mmap flags. Otherwise we see failures in
the GitLab environment for some currently unknown but allowable
reason.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 linux-user/elfload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index b5cb21384a1..be8facfbcc8 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2294,7 +2294,7 @@ static void pgb_dynamic(const char *image_name, long align)
 static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr,
                             abi_ulong guest_hiaddr, long align)
 {
-    const int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE;
+    const int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE | MAP_FIXED;
     void *addr, *test;
 
     if (guest_hiaddr > reserved_va) {
-- 
2.20.1


Re: [PATCH] linux-user/elfload: use MAP_FIXED in pgb_reserved_va

Posted by Peter Maydell 1 week ago
On Tue, 30 Jun 2020 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> Given we assert the requested address matches what we asked we should
> also make that clear in the mmap flags. Otherwise we see failures in
> the GitLab environment for some currently unknown but allowable
> reason.

Adding MAP_FIXED will mean that instead of failing if there's
something else already at that address, the kernel will now
silently blow that away in favour of the new mapping. Is
that definitely what we want here ?

thanks
-- PMM

Re: [PATCH] linux-user/elfload: use MAP_FIXED in pgb_reserved_va

Posted by Alex Bennée 1 week ago
Peter Maydell <peter.maydell@linaro.org> writes:

> On Tue, 30 Jun 2020 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> Given we assert the requested address matches what we asked we should
>> also make that clear in the mmap flags. Otherwise we see failures in
>> the GitLab environment for some currently unknown but allowable
>> reason.
>
> Adding MAP_FIXED will mean that instead of failing if there's
> something else already at that address, the kernel will now
> silently blow that away in favour of the new mapping. Is
> that definitely what we want here ?

Hmm maybe not. But hey I just noticed that we have MAP_FIXED_NOREPLACE
(since Linux 4.17) which says:

   This flag provides behavior that is similar  to  MAP_FIXED  with
   respect   to   the   addr   enforcement,  but  differs  in  that
   MAP_FIXED_NOREPLACE never clobbers a preexisting  mapped  range.
   If  the  requested range would collide with an existing mapping,
   then this call fails with  the  error  EEXIST.   This  flag  can
   therefore  be used as a way to atomically (with respect to other
   threads) attempt to map an address range: one thread  will  suc‐
   ceed; all others will report failure.

   Note   that   older   kernels   which   do   not  recognize  the
   MAP_FIXED_NOREPLACE flag will typically (upon detecting a colli‐
   sion  with a preexisting mapping) fall back to a "non-MAP_FIXED"
   type of behavior: they will return an address that is  different
   from  the  requested  address.   Therefore,  backward-compatible
   software should check the returned address against the requested
   address.

So maybe that is what we should do?

Now you've pointed that out I wonder if we need to fix
pgd_find_hole_fallback as well?

>
> thanks
> -- PMM


-- 
Alex Bennée

Re: [PATCH] linux-user/elfload: use MAP_FIXED in pgb_reserved_va

Posted by Richard Henderson 1 week ago
On 6/30/20 7:41 AM, Alex Bennée wrote:
> 
> Peter Maydell <peter.maydell@linaro.org> writes:
> 
>> On Tue, 30 Jun 2020 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote:
>>>
>>> Given we assert the requested address matches what we asked we should
>>> also make that clear in the mmap flags. Otherwise we see failures in
>>> the GitLab environment for some currently unknown but allowable
>>> reason.
>>
>> Adding MAP_FIXED will mean that instead of failing if there's
>> something else already at that address, the kernel will now
>> silently blow that away in favour of the new mapping. Is
>> that definitely what we want here ?
> 
> Hmm maybe not.

Definitely not.

> But hey I just noticed that we have MAP_FIXED_NOREPLACE
> (since Linux 4.17) which says:
> 
>    This flag provides behavior that is similar  to  MAP_FIXED  with
>    respect   to   the   addr   enforcement,  but  differs  in  that
>    MAP_FIXED_NOREPLACE never clobbers a preexisting  mapped  range.
>    If  the  requested range would collide with an existing mapping,
>    then this call fails with  the  error  EEXIST.   This  flag  can
>    therefore  be used as a way to atomically (with respect to other
>    threads) attempt to map an address range: one thread  will  suc‐
>    ceed; all others will report failure.
> 
>    Note   that   older   kernels   which   do   not  recognize  the
>    MAP_FIXED_NOREPLACE flag will typically (upon detecting a colli‐
>    sion  with a preexisting mapping) fall back to a "non-MAP_FIXED"
>    type of behavior: they will return an address that is  different
>    from  the  requested  address.   Therefore,  backward-compatible
>    software should check the returned address against the requested
>    address.
> 
> So maybe that is what we should do?

Yes, that would be better, because those are the exact semantics that we want.
 Though it would be Really Nice to know what's up with gitlab...

> Now you've pointed that out I wonder if we need to fix
> pgd_find_hole_fallback as well?

Yes, that could benefit from MAP_FIXED_NOREPLACE.

I do think there's a way we could streamline the 32-on-64 case.  At present we
are groveling through /proc/self/maps, or mmaping+unmaping, and then mmaping.
Whereas we could just mmap once and be done -- it's the 32-on-32 case that
requires the song and dance.


r~