getrlimit03: adjust a bit of code to compatiable with mips32
PATCH v5 1/1 getrlimit03: adjust a bit of code to compatiable with mips32
V5:
replace __mips macro with __mips__
V4:
Use ABI32 macro to filter mips32
V3:
The V2 break other arch. fix it.
V2:
modify commit log
Hongzhi.Song (1):
getrlimit03: adjust a bit of code to compatiable with mips32
testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Signature · 1 line
2.8.1
PATCH 1/1 getrlimit03: adjust a bit of code to compatiable with mips32
Error info:
getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur = ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff
According to kernel code: [arch/mips/include/uapi/asm/resource.h] RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32.
/*
* SuS says limits have to be unsigned.
* Which makes a ton more sense anyway,
* but we keep the old value on MIPS32,
* for compatibility:
*/
#ifndef __mips64
# define RLIM_INFINITY 0x7fffffffUL #endif
Adding conditional statement about mips to fix this.
--- testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/getrlimit/getrlimit03.c +7 -1
@@ -26,6 +26,7 @@#include "tst_test.h" #include "lapi/syscalls.h" +#include "lapi/abisize.h" /** * Linux provides an "old" getrlimit syscall handler that uses signed long,
@@ -61,7 +62,12 @@ struct rlimit_ulong {unsigned long rlim_cur;unsigned long rlim_max; }; -const unsigned long RLIM_INFINITY_UL =ULONG_MAX ; + +#if defined(__mips__) && defined(TST_ABI32 ) +const unsigned long RLIM_INFINITY_UL =0x7fffffffUL ; +#else +const unsigned long RLIM_INFINITY_UL =ULONG_MAX ; +#endif static int getrlimit_ulong (int resource,struct rlimit_ulong *rlim) {
Signature · 1 line
2.8.1
PATCH 1/1 getrlimit03: adjust a bit of code to compatiable with mips32
----- Original Message -----
Quoted 14 lines
Error info:
getrlimit03.c:104: FAIL:__NR_prlimit64(0)hadrlim_cur= ffffffffffffffff but__NR_getrlimit(0)hadrlim_cur=7fffffffAccording to kernel code: [
arch/mips/include/uapi/asm/resource.h]RLIM_INFINITYis set to0x7fffffffULinstead ofULONG_MAXon mips32./*
* SuS says limits have to be unsigned.
* Which makes a ton more sense anyway,
* but we keep the old value on MIPS32,
* for compatibility:
*/
#ifndef__mips64
Quoted 7 lines
# define RLIM_INFINITY 0x7fffffffUL #endifAdding conditional statement about mips to fix this.
Signed-off-by Jan Stancek <[email protected]>Signed-off-by Hongzhi.Song <[email protected]>
Pushed.
Thanks,
Jan