Commit ee8e7614 authored by Peter Maydell's avatar Peter Maydell Committed by Riku Voipio
Browse files

linux-user: Use correct target SHMLBA in shmat() 



The shmat() handling needs to do target-specific handling
of the attach address for shmat():
 * if the SHM_RND flag is passed, the address is rounded
   down to a SHMLBA boundary
 * if SHM_RND is not passed, then the call is failed EINVAL
   if the address is not a multiple of SHMLBA

Since SHMLBA is target-specific, we need to do this
checking and rounding in QEMU and can't leave it up to the
host syscall.

Allow targets to define TARGET_FORCE_SHMLBA and provide
a target_shmlba() function if appropriate, and update
do_shmat() to honour them.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 0ef9ea29

linux-user/arm/target_syscall.h

+7 −0
Original line number Diff line number Diff line
@@ -33,4 +33,11 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2



#define TARGET_FORCE_SHMLBA



static inline abi_ulong target_shmlba(CPUARMState *env)

{

    return 4 * 4096;

}



#endif /* ARM_TARGET_SYSCALL_H */

linux-user/mips/target_syscall.h

+7 −0
Original line number Diff line number Diff line
@@ -230,4 +230,11 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2



#define TARGET_FORCE_SHMLBA



static inline abi_ulong target_shmlba(CPUMIPSState *env)

{

    return 0x40000;

}



#endif /* MIPS_TARGET_SYSCALL_H */

linux-user/mips64/target_syscall.h

+7 −0
Original line number Diff line number Diff line
@@ -227,4 +227,11 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2



#define TARGET_FORCE_SHMLBA



static inline abi_ulong target_shmlba(CPUMIPSState *env)

{

    return 0x40000;

}



#endif /* MIPS64_TARGET_SYSCALL_H */

linux-user/sh4/target_syscall.h

+7 −0
Original line number Diff line number Diff line
@@ -19,4 +19,11 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2



#define TARGET_FORCE_SHMLBA



static inline abi_ulong target_shmlba(CPUSH4State *env)

{

    return 0x4000;

}



#endif /* SH4_TARGET_SYSCALL_H */

linux-user/sparc/target_syscall.h

+16 −0
Original line number Diff line number Diff line
@@ -22,4 +22,20 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 0x2000

#define TARGET_MLOCKALL_MCL_FUTURE  0x4000



/* For SPARC SHMLBA is determined at runtime in the kernel, and

 * libc has to runtime-detect it using the hwcaps (see glibc

 * sysdeps/unix/sysv/linux/sparc/getshmlba; we follow the same

 * logic here, though we know we're not the sparc v9 64-bit case).

 */

#define TARGET_FORCE_SHMLBA



static inline abi_ulong target_shmlba(CPUSPARCState *env)

{

    if (!(env->def->features & CPU_FEATURE_FLUSH)) {

        return 64 * 1024;

    } else {

        return 256 * 1024;

    }

}



#endif /* SPARC_TARGET_SYSCALL_H */