Commit 541e1690 authored by Helge Deller's avatar Helge Deller Committed by Riku Voipio
Browse files

linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB 



Add the missing defines and for TARGET_MAP_STACK and TARGET_MAP_HUGETLB
for alpha, mips, ppc, x86, hppa.  Fix the mmap_flags translation table
to translate MAP_HUGETLB between host and target architecture, and to
drop MAP_STACK.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Message-Id: <20170311183016.GA20514@ls3530.fritz.box>
[rth: Drop MAP_STACK instead of translating it, since it is ignored
in the kernel anyway.  Fix tabs to spaces.]
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 3d60c84d

linux-user/syscall.c

+20 −11
Original line number Diff line number Diff line
@@ -5875,13 +5875,22 @@ static bitmask_transtbl mmap_flags_tbl[] = { 
    { TARGET_MAP_SHARED, TARGET_MAP_SHARED, MAP_SHARED, MAP_SHARED },

    { TARGET_MAP_PRIVATE, TARGET_MAP_PRIVATE, MAP_PRIVATE, MAP_PRIVATE },

    { TARGET_MAP_FIXED, TARGET_MAP_FIXED, MAP_FIXED, MAP_FIXED },

	{ TARGET_MAP_ANONYMOUS, TARGET_MAP_ANONYMOUS, MAP_ANONYMOUS, MAP_ANONYMOUS },

	{ TARGET_MAP_GROWSDOWN, TARGET_MAP_GROWSDOWN, MAP_GROWSDOWN, MAP_GROWSDOWN },

	{ TARGET_MAP_DENYWRITE, TARGET_MAP_DENYWRITE, MAP_DENYWRITE, MAP_DENYWRITE },

	{ TARGET_MAP_EXECUTABLE, TARGET_MAP_EXECUTABLE, MAP_EXECUTABLE, MAP_EXECUTABLE },

    { TARGET_MAP_ANONYMOUS, TARGET_MAP_ANONYMOUS,

      MAP_ANONYMOUS, MAP_ANONYMOUS },

    { TARGET_MAP_GROWSDOWN, TARGET_MAP_GROWSDOWN,

      MAP_GROWSDOWN, MAP_GROWSDOWN },

    { TARGET_MAP_DENYWRITE, TARGET_MAP_DENYWRITE,

      MAP_DENYWRITE, MAP_DENYWRITE },

    { TARGET_MAP_EXECUTABLE, TARGET_MAP_EXECUTABLE,

      MAP_EXECUTABLE, MAP_EXECUTABLE },

    { TARGET_MAP_LOCKED, TARGET_MAP_LOCKED, MAP_LOCKED, MAP_LOCKED },

        { TARGET_MAP_NORESERVE, TARGET_MAP_NORESERVE, MAP_NORESERVE,

          MAP_NORESERVE },

    { TARGET_MAP_NORESERVE, TARGET_MAP_NORESERVE,

      MAP_NORESERVE, MAP_NORESERVE },

    { TARGET_MAP_HUGETLB, TARGET_MAP_HUGETLB, MAP_HUGETLB, MAP_HUGETLB },

    /* MAP_STACK had been ignored by the kernel for quite some time.

       Recognize it for the target insofar as we do not want to pass

       it through to the host.  */

    { TARGET_MAP_STACK, TARGET_MAP_STACK, 0, 0 },

    { 0, 0, 0, 0 }

};

linux-user/syscall_defs.h

+10 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,8 @@ struct target_winsize { 
#define TARGET_MAP_NORESERVE	0x0400		/* don't check for reservations */

#define TARGET_MAP_POPULATE	0x10000		/* populate (prefault) pagetables */

#define TARGET_MAP_NONBLOCK	0x20000		/* do not block on IO */

#define TARGET_MAP_STACK        0x40000         /* ignored */

#define TARGET_MAP_HUGETLB      0x80000         /* create a huge page mapping */

#elif defined(TARGET_PPC)

#define TARGET_MAP_FIXED	0x10		/* Interpret addr exactly */

#define TARGET_MAP_ANONYMOUS	0x20		/* don't use a file */
@@ -1363,6 +1365,8 @@ struct target_winsize { 
#define TARGET_MAP_NORESERVE	0x0040		/* don't check for reservations */

#define TARGET_MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define TARGET_MAP_NONBLOCK	0x10000		/* do not block on IO */

#define TARGET_MAP_STACK        0x20000         /* ignored */

#define TARGET_MAP_HUGETLB      0x40000         /* create a huge page mapping */

#elif defined(TARGET_ALPHA)

#define TARGET_MAP_ANONYMOUS	0x10		/* don't use a file */

#define TARGET_MAP_FIXED	0x100		/* Interpret addr exactly */
@@ -1373,6 +1377,8 @@ struct target_winsize { 
#define TARGET_MAP_NORESERVE	0x10000		/* no check for reservations */

#define TARGET_MAP_POPULATE	0x20000		/* pop (prefault) pagetables */

#define TARGET_MAP_NONBLOCK	0x40000		/* do not block on IO */

#define TARGET_MAP_STACK        0x80000         /* ignored */

#define TARGET_MAP_HUGETLB      0x100000        /* create a huge page mapping */

#elif defined(TARGET_HPPA)

#define TARGET_MAP_ANONYMOUS	0x10		/* don't use a file */

#define TARGET_MAP_FIXED	0x04		/* Interpret addr exactly */
@@ -1383,6 +1389,8 @@ struct target_winsize { 
#define TARGET_MAP_NORESERVE	0x04000		/* no check for reservations */

#define TARGET_MAP_POPULATE	0x10000		/* pop (prefault) pagetables */

#define TARGET_MAP_NONBLOCK	0x20000		/* do not block on IO */

#define TARGET_MAP_STACK        0x40000         /* ignored */

#define TARGET_MAP_HUGETLB      0x80000         /* create a huge page mapping */

#else

#define TARGET_MAP_FIXED	0x10		/* Interpret addr exactly */

#define TARGET_MAP_ANONYMOUS	0x20		/* don't use a file */
@@ -1393,6 +1401,8 @@ struct target_winsize { 
#define TARGET_MAP_NORESERVE	0x4000		/* don't check for reservations */

#define TARGET_MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define TARGET_MAP_NONBLOCK	0x10000		/* do not block on IO */

#define TARGET_MAP_STACK        0x20000         /* ignored */

#define TARGET_MAP_HUGETLB      0x40000         /* create a huge page mapping */

#define TARGET_MAP_UNINITIALIZED 0x4000000	/* for anonymous mmap, memory could be uninitialized */

#endif