Add env variable as workaround for test issues in VMs
PATCH 1/1 Add env variable as workaround for test issues in VMs
Timer tests often fail on sleep overrun when LTP is running inside a VM. The main cause is usually that the VM doesn't get enough CPU time to wake up the test process in time.
Disable upper bound checks in the tst_timer_test library if LTP_VM_ENV is set to non-zero value.
--- doc/user-guide.txt | 1 + include/tst_test.h | 2 ++ lib/tst_test.c | 11 +++++++++++ lib/tst_timer_test.c | 8 +++++++- 4 files changed, 21 insertions(+), 1 deletion(-)
doc/user-guide.txt +1 -0
@@ -16,6 +16,7 @@ For running LTP network tests see `testcases/network/README.md`. | 'LTP_TIMEOUT_MUL' | Multiply timeout, must be number >= 1 (> 1 is useful for slow machines to avoid unexpected timeout). Variable is also used in shell tests, but ceiled to int. +| 'LTP_VM_ENV' | Set to '1' if LTP is run inside a virtual machine. | 'PATH' | It's required to addjust path: `PATH="$PATH:$LTPROOT/testcases/bin"` | 'TMPDIR' | Base directory for template directory, which is required by C tests
include/tst_test.h +2 -0
@@ -301,6 +301,8 @@ unsigned int tst_timeout_remaining(void);unsigned int tst_multiply_timeout (unsigned int timeout);void tst_set_timeout (int timeout); +int tst_vm_env (void ); +/* * Returns path to the test temporary directory in a newly allocated buffer.
lib/tst_test.c +11 -0
@@ -1378,3 +1378,14 @@ void tst_flush(void)tst_brk (TBROK |TERRNO ,"fflush(stdout) failed" ); } + +int tst_vm_env (void ) +{ +const char *env =getenv ("LTP_VM_ENV" ); + +if (env) { +return atoi (env); + } + +return 0 ; +}
lib/tst_timer_test.c +7 -1
@@ -26,6 +26,7 @@ static long long *samples;static unsigned int cur_sample;static unsigned int monotonic_resolution;static unsigned int timerslack; +static int virt_env;static char *print_frequency_plot;static char *file_name;
@@ -306,7 +307,7 @@ void do_timer_test(long long usec, unsigned int nsamples) samples[nsamples-1 ], samples[0 ], median, 1.00 * trunc_mean / keep_samples, discard); -if (trunc_mean > (nsamples - discard) * usec + threshold) { +if (!virt_env && trunc_mean > (nsamples - discard) * usec + threshold) {tst_res (TFAIL ,"%s slept for too long" , scall);if (!print_frequency_plot)
@@ -343,6 +344,11 @@ static void timer_setup(void)if (setup)setup (); +/* +* Running tests in VM may cause timing issues, disable upper bound +* checks if LTP_VM_ENV is set to non-zero. +*/ + virt_env =tst_vm_env ();tst_clock_getres (CLOCK_MONOTONIC , &t);tst_res (TINFO ,"CLOCK_MONOTONIC resolution %lins" , (long )t.tv_nsec);
Signature · 1 line
2.26.0
PATCH 1/1 Add env variable as workaround for test issues in VMs
Hi Martin,
Quoted 3 lines
Timer tests often fail on sleep overrun when LTP is running inside a VM. The main cause is usually that the VM doesn't get enough CPU time to wake up the test process in time.
Cannot we detect presence of "hypervisor" in flags in /proc/cpuinfo? I though it was quite reliable for detecting VM.
Quoted 2 lines
Disable upper bound checks in the
tst_timer_testlibrary ifLTP_VM_ENVis set to non-zero value.
Kind regards,
Petr
PATCH 1/1 Add env variable as workaround for test issues in VMs
----- Original Message -----
Quoted 8 lines
Hi Martin,
Quoted 4 lines
Timer tests often fail on sleep overrun when LTP is running inside a VM. The main cause is usually that the VM doesn't get enough CPU time to wake up
the test process in time.Cannot we detect presence of "hypervisor" in flags in
/proc/cpuinfo? I though it was quite reliable for detecting VM.
We have tst_is_virt().
I see these tests fail frequently on ppc and s390, so I'm all for some switch that would make it more forgiving if running under virt.
PATCH 1/1 Add env variable as workaround for test issues in VMs
Hi,
Quoted 1 line
We have
tst_is_virt().
Thanks, Jan, nice code!
Kind regards,
Petr
PATCH 1/1 Add env variable as workaround for test issues in VMs
In reply to Jan StancekQuoted 7 lines · Jan Stancek
----- Original Message -----
Quoted 3 lines
Hi Martin,
Quoted 1 line
Timer tests often fail on sleep overrun when LTP is running inside a
VM.
Quoted 9 lines
Quoted 1 line
Quoted 1 line
The main cause is usually that the VM doesn't get enough CPU time to
wake
Quoted 4 lines
Quoted 2 lines
up
the test process in time.Cannot we detect presence of "hypervisor" in flags in
/proc/cpuinfo? I though it was quite reliable for detecting VM.We have
tst_is_virt().
I take a rough look and doubt there is a bug in try_systemd_detect_virt(). Shouldn't strncmp() return zero the 'kvm'/'xen' is found? I guess they wanted:
lib/tst_virt.c +2 -2
@@ -93,10 +93,10 @@ static int try_systemd_detect_virt(void)if (ret)return 0 ; -if (strncmp ("kvm" , virt_type,3 )) +if (!strncmp ("kvm" , virt_type,3 ))return VIRT_KVM ; -if (strncmp ("xen" , virt_type,3 )) +if (!strncmp ("xen" , virt_type,3 ))return VIRT_XEN ;return 0 ;
Apart from that two(kvm/xen) , we need to detect more virtualization tech for ppc/s390 I think.
# uname -r 4.18.0-193.el8.s390x
# systemd-detect-virt zvm
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20200427/7f2c5fc4/attachment.htm>
PATCH 1/1 Add env variable as workaround for test issues in VMs
----- Original Message -----
Quoted 16 lines · Jan Stancek
Quoted 15 lines
----- Original Message -----
Quoted 3 lines
Hi Martin,
Quoted 1 line
Timer tests often fail on sleep overrun when LTP is running inside a
VM.
Quoted 1 line
Quoted 1 line
The main cause is usually that the VM doesn't get enough CPU time to
wake
Quoted 4 lines
Quoted 2 lines
up
the test process in time.Cannot we detect presence of "hypervisor" in flags in
/proc/cpuinfo? I though it was quite reliable for detecting VM.
Quoted 6 lines
Quoted 2 lines
We have
tst_is_virt().I take a rough look and doubt there is a bug in
try_systemd_detect_virt(). Shouldn'tstrncmp()return zero the 'kvm'/'xen' is found? I guess they wanted:
Yes, that looks like bug.
Quoted 17 lines
lib/tst_virt.c +2
-2@@ -93,10 +93,10 @@ static int try_systemd_detect_virt(void)if (ret)return 0 ; -if (strncmp ("kvm" , virt_type,3 )) +if (!strncmp ("kvm" , virt_type,3 ))return VIRT_KVM ; -if (strncmp ("xen" , virt_type,3 )) +if (!strncmp ("xen" , virt_type,3 ))return VIRT_XEN ;return 0 ;
Quoted 2 lines
Apart from that two(kvm/xen) , we need to detect more virtualization tech for ppc/s390 I think.
We could return VIRT_OTHER by default. We don't really need to differentiate which one it is for purpose of this patch.
PATCH 1/1 Add env variable as workaround for test issues in VMs
Hi,
Quoted 5 lines
Quoted 3 lines
I take a rough look and doubt there is a bug in
try_systemd_detect_virt(). Shouldn'tstrncmp()return zero the 'kvm'/'xen' is found? I guess they wanted:Yes, that looks like bug.
Good catch!
Quoted 14 lines
Quoted 13 lines
lib/tst_virt.c +2
-2@@ -93,10 +93,10 @@ static int try_systemd_detect_virt(void)if (ret)return 0 ; -if (strncmp ("kvm" , virt_type,3 )) +if (!strncmp ("kvm" , virt_type,3 ))return VIRT_KVM ; -if (strncmp ("xen" , virt_type,3 )) +if (!strncmp ("xen" , virt_type,3 ))return VIRT_XEN ;
Quoted 7 lines
Quoted 4 lines
lib/tst_virt.c +0
-0return 0 ;Apart from that two(kvm/xen) , we need to detect more virtualization tech for ppc/s390 I think.
We could return
VIRT_OTHERby default. We don't really need to differentiate which one it is for purpose of this patch.
+1. And if we ever need to differentiate, we can always add them later, using code from systemd-detect-virt
https://github.com/systemd/systemd/blob/master/src/basic/virt.c
Kind regards,
Petr
PATCH 1/1 Add env variable as workaround for test issues in VMs
Quoted 28 lines · Petr Vorel
Hi,
Quoted 5 lines
Quoted 3 lines
I take a rough look and doubt there is a bug in
try_systemd_detect_virt(). Shouldn'tstrncmp()return zero the 'kvm'/'xen' is found? I guess they wanted:Yes, that looks like bug.
Good catch!
Quoted 18 lines
Quoted 18 lines
lib/tst_virt.c +2
-2@@ -93,10 +93,10 @@ static int try_systemd_detect_virt(void)if (ret)return 0 ; -if (strncmp ("kvm" , virt_type,3 )) +if (!strncmp ("kvm" , virt_type,3 ))return VIRT_KVM ; -if (strncmp ("xen" , virt_type,3 )) +if (!strncmp ("xen" , virt_type,3 ))return VIRT_XEN ;return 0 ;Apart from that two(kvm/xen) , we need to detect more virtualization tech for ppc/s390 I think.
Quoted 9 lines
Quoted 2 lines
We could return
VIRT_OTHERby default. We don't really need to differentiate which one it is for purpose of this patch.+1. And if we ever need to differentiate, we can always add them later, using code from systemd-detect-virt
https://github.com/systemd/systemd/blob/master/src/basic/virt.cKind regards,
Petr
And while we're at it, let's also fix the buffer overflow in is_xen() and make try_systemd_detect_virt() public. I'll send a patch.
Signature · 7 lines
Martin Doucha [email protected] QA Engineer for Software Maintenance SUSE LINUX, s.r.o. CORSO IIa Krizikova 148/34 186 00 Prague 8 Czech Republic