Fix timestamp tests in SysV IPC tests
cover Fix timestamp tests in SysV IPC tests
Cyril Hrubis (2):
libnewipc: Add get_ipc_timestamp()
syscalls/ipc: Make use of get_ipc_timestamp()
include/libnewipc.h | 3 +++ libs/libltpnewipc/libnewipc.c | 13 +++++++++++++ testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c | 4 ++-- testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c | 4 ++-- testcases/kernel/syscalls/ipc/shmctl/Makefile | 2 +- testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 4 ++-- 6 files changed, 23 insertions(+), 7 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 libnewipc: Add get_ipc_timestamp()
That returns timestamps that should return values comparable to the stime/rtime/ctime.
From Thomas Gleixner:
Quoted 18 lines
Due to the internal implementation of
ktime_get_real_seconds(), which is a 2038 safe replacement for the formerget_seconds()function, this accumulation issue can be observed. (time(2) via syscall and newer versions of VDSO use the same mechanism).clock_gettime(CLOCK_REALTIME, &ts); sec = time(); assert(sec >= ts.tv_sec);That assert can trigger for two reasons:
1) Clock was set between the
clock_gettime()andtime().2) The clock has advanced far enough that:
timekeeper.tv_nsec + (
clock_now_ns()-last_update_ns) >NSEC_PER_SEC
The same problem exists forCLOCK_XXXvs.CLOCK_XXX_COARSE
Quoted 7 lines
clock_gettime(CLOCK_XXX, &ts); clock_gettime(CLOCK_XXX_COARSE, &tc); assert(tc.tv_sec >= ts.tv_sec);The
_COARSEvariants return their associated timekeeper.tv_sec,tv_nsec pair without reading the clock. Same as #2 above just extended to clock MONOTONIC.
Which means the timestamps in the structure we get from msg* calls can be 1 second smaller that timestamps returned from realtime timers.
However it also means that the _COARSE timers should be the same as the SysV timestamps and could be used for these tests instead. Also these timers should be available since 2.6.32 which is old enough to assume that they are present.
--- include/libnewipc.h | 3 +++ libs/libltpnewipc/libnewipc.c | 13 +++++++++++++ 2 files changed, 16 insertions(+)
include/libnewipc.h +3 -0
@@ -22,6 +22,7 @@#ifndef __LIBNEWIPC_H#define __LIBNEWIPC_H 1 +#include <time.h> #include <sys/types.h> #define MSG_RD 0400
@@ -56,4 +57,6 @@ void *probe_free_addr(const char *file, const int lineno);#define PROBE_FREE_ADDR () \ probe_free_addr(__FILE__, __LINE__) +time_t get_ipc_timestamp (void ); +#endif /* newlibipc.h */
libs/libltpnewipc/libnewipc.c +13 -0
@@ -23,6 +23,7 @@#include "libnewipc.h" #include "tst_safe_stdio.h" #include "tst_safe_sysv_ipc.h" +#include "tst_clocks.h" #define BUFSIZE 1024
@@ -86,3 +87,15 @@ void *probe_free_addr(const char *file, const int lineno)return addr; } + +time_t get_ipc_timestamp (void ) +{ +struct timespec ts; +int ret; + + ret =tst_clock_gettime (CLOCK_REALTIME_COARSE , &ts); +if (ret <0 ) +tst_brk (TBROK |TERRNO ,"clock_gettime(CLOCK_REALTIME_COARSE)" ); + +return ts.tv_sec; +}
Signature · 1 line
2.26.2
PATCH 1/2 libnewipc: Add get_ipc_timestamp()
Hi Cyril,
Quoted 31 lines · Cyril Hrubis
That returns timestamps that should return values comparable to the stime/rtime/ctime.
From Thomas Gleixner:
Quoted 18 lines
Due to the internal implementation of
ktime_get_real_seconds(), which is a 2038 safe replacement for the formerget_seconds()function, this accumulation issue can be observed. (time(2) via syscall and newer versions of VDSO use the same mechanism).clock_gettime(CLOCK_REALTIME, &ts); sec = time(); assert(sec >= ts.tv_sec);That assert can trigger for two reasons:
1) Clock was set between the
clock_gettime()andtime().2) The clock has advanced far enough that:
timekeeper.tv_nsec + (
clock_now_ns()-last_update_ns) >NSEC_PER_SEC
The same problem exists forCLOCK_XXXvs.CLOCK_XXX_COARSEQuoted 7 lines
clock_gettime(CLOCK_XXX, &ts); clock_gettime(CLOCK_XXX_COARSE, &tc); assert(tc.tv_sec >= ts.tv_sec);The
_COARSEvariants return their associated timekeeper.tv_sec,tv_nsec pair without reading the clock. Same as #2 above just extended to clock MONOTONIC.
Quoted 8 lines
Which means the timestamps in the structure we get from msg* calls can be 1 second smaller that timestamps returned from realtime timers.
However it also means that the
_COARSEtimers should be the same as the SysV timestamps and could be used for these tests instead. Also these timers should be available since 2.6.32 which is old enough to assume that they are present.
Sounds reasonable. From Thomas's analysis, it seems the *_COARSE can work for us, so I'm OK to go with this way to fix.
For series:
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20201204/2ce56e3c/attachment.htm>
PATCH 2/2 syscalls/ipc: Make use of get_ipc_timestamp()
In reply to Cyril Hrubis--- testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c | 4 ++-- testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c | 4 ++-- testcases/kernel/syscalls/ipc/shmctl/Makefile | 2 +- testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c +2 -2
@@ -25,13 +25,13 @@ static void verify_msgrcv(void)SAFE_MSGSND (queue_id, &snd_buf,MSGSIZE ,0 ); -time (&before_rcv); + before_rcv =get_ipc_timestamp ();TEST (msgrcv (queue_id, &rcv_buf,MSGSIZE ,1 ,0 ));if (TST_RET ==-1 ) {tst_res (TFAIL |TTERRNO ,"msgrcv failed" );return ; } -time (&after_rcv); + after_rcv =get_ipc_timestamp ();if (strcmp (rcv_buf.mtext, snd_buf.mtext) ==0 ) tst_res(TPASS, "message received(%s) = message sent(%s)",
testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c +2 -2
@@ -29,13 +29,13 @@ static void verify_msgsnd(void)struct msqid_ds qs_buf;time_t before_snd, after_snd; -time (&before_snd); + before_snd =get_ipc_timestamp ();TEST (msgsnd (queue_id, &snd_buf,MSGSIZE ,0 ));if (TST_RET ==-1 ) {tst_res (TFAIL |TTERRNO ,"msgsnd() failed" );return ; } -time (&after_snd); + after_snd =get_ipc_timestamp ();SAFE_MSGCTL (queue_id,IPC_STAT , &qs_buf);
testcases/kernel/syscalls/ipc/shmctl/Makefile +1 -1
@@ -10,6 +10,6 @@ shmctl05: LDLIBS += -lrt include $(top_srcdir)/include/mk/testcases.mk -shmctl02 shmctl04 shmctl06: LTPLDLIBS = -lltpnewipc +shmctl01 shmctl02 shmctl04 shmctl06: LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/shmctl/shmctl01.c +2 -2
@@ -240,9 +240,9 @@ static int get_shm_idx_from_id(int shm_id)static void setup (void ) { - ctime_min =time (NULL ); + ctime_min =get_ipc_timestamp (); shm_id =SAFE_SHMGET (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |SHM_RW ); - ctime_max =time (NULL ); + ctime_max =get_ipc_timestamp (); shm_idx =get_shm_idx_from_id (shm_id);
Signature · 1 line
2.26.2
cover Fix timestamp tests in SysV IPC tests
In reply to Cyril Hrubis----- Original Message -----
Quoted 4 lines
Cyril Hrubis (2):
libnewipc: Addget_ipc_timestamp()
syscalls/ipc: Make use ofget_ipc_timestamp()
Quoted 8 lines
include/libnewipc.h | 3 +++ libs/libltpnewipc/libnewipc.c | 13 +++++++++++++ testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c | 4 ++-- testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c | 4 ++-- testcases/kernel/syscalls/ipc/shmctl/Makefile | 2 +- testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 4 ++-- 6 files changed, 23 insertions(+), 7 deletions(-)
cover Fix timestamp tests in SysV IPC tests
Hi!
Pushed, thanks Li and Jan for the review.
Signature · 2 lines
Cyril Hrubis [email protected]