fzsync: Add sched_yield for single core machine
PATCH 1/1 fzsync: Add sched_yield for single core machine
Fuzzy sync library uses spin waiting mechanism
to implement thread barrier behavior, which would cause this test to be time-consuming on single core machine.
Fix this by adding sched_yield in the spin waiting loop, so that the thread yields cpu as soon as it enters the waiting loop.
--- include/tst_fuzzy_sync.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/tst_fuzzy_sync.h +6 -0
@@ -59,9 +59,11 @@* @sa tst_fzsync_pair */ +#include <sys/sysinfo.h> #include <sys/time.h> #include <time.h> #include <math.h> +#include <sched.h> #include <stdlib.h> #include <pthread.h> #include "tst_atomic.h"
@@ -564,6 +566,8 @@ static inline void tst_fzsync_pair_wait(int *our_cntr, && tst_atomic_load(our_cntr) < INT_MAX) {if (spins) (*spins)++; +if (get_nprocs () ==1 ) +sched_yield (); }tst_atomic_store (0 , other_cntr);
@@ -581,6 +585,8 @@ static inline void tst_fzsync_pair_wait(int *our_cntr,while (tst_atomic_load (our_cntr) <tst_atomic_load (other_cntr)) {if (spins) (*spins)++; +if (get_nprocs () ==1 ) +sched_yield (); } } }
Signature · 1 line
2.17.0
PATCH 1/1 fzsync: Add sched_yield for single core machine
Hello Leo,
Quoted 6 lines · Leo Yu-Chi Liang
Fuzzy sync library uses spin waiting mechanism
to implement thread barrier behavior, which would cause this test to be time-consuming on single core machine.Fix this by adding
sched_yieldin the spin waiting loop, so that the thread yields cpu as soon as it enters the waiting loop.
Thanks for sending this in. Comments below.
Quoted 23 lines
Signed-off-by Leo Yu-Chi Liang <[email protected]>--- include/tst_fuzzy_sync.h | 6 ++++++ 1 file changed, 6 insertions(+)include/tst_fuzzy_sync.h +2
-0@@ -59,9 +59,11 @@* @sa tst_fzsync_pair */ +#include <sys/sysinfo.h> #include <sys/time.h> #include <time.h> #include <math.h> +#include <sched.h> #include <stdlib.h> #include <pthread.h> #include "tst_atomic.h"
include/tst_fuzzy_sync.h static inline void tst_fzsync_pair_wait(int *our_cntr, · line 569
Quoted 4 lines
include/tst_fuzzy_sync.h +1
-0@@ -564,6 +566,8 @@ static inline void tst_fzsync_pair_wait(int *our_cntr, && tst_atomic_load(our_cntr) < INT_MAX) {if (spins) (*spins)++; +if (get_nprocs () ==1 )
We should use tst_ncpus() and then cache the value so we are not making a function call within the loop. It is probably best to avoid calling this function inside tst_fzsync_pair_wait, it may even result in a system call.
We should probably cache the value in tst_fzsync_pair, maybe as a boolean e.g. "yield_in_wait". This can be set/checked in the tst_fzsync_pair_init function. Also this will allow the user to handle CPUs being offlined if the test itself can cause that.
include/tst_fuzzy_sync.h static inline void tst_fzsync_pair_wait(int *our_cntr, · line 592
Quoted 13 lines
include/tst_fuzzy_sync.h +3
-0+sched_yield (); }tst_atomic_store (0 , other_cntr);@@ -581,6 +585,8 @@ static inline void tst_fzsync_pair_wait(int *our_cntr,while (tst_atomic_load (our_cntr) <tst_atomic_load (other_cntr)) {if (spins) (*spins)++; +if (get_nprocs () ==1 ) +sched_yield (); } } }
Everyone please note that we will have to test this extensively to ensure it does break existing reproducers.
Alternatively to this approach we could create seperate implementations of pair_wait and use a function pointer. I am thinking it may be best to do it both ways and perform some measurements.
Signature · 2 lines
Thank you, Richard.
PATCH 1/1 fzsync: Add sched_yield for single core machine
Quoted 46 lines · Richard Palethorpe
Hello Leo,
Quoted 6 lines · Leo Yu-Chi Liang
Fuzzy sync library uses spin waiting mechanism
to implement thread barrier behavior, which would cause this test to be time-consuming on single core machine.Fix this by adding
sched_yieldin the spin waiting loop, so that the thread yields cpu as soon as it enters the waiting loop.Thanks for sending this in. Comments below.
Quoted 23 lines
Signed-off-by Leo Yu-Chi Liang <[email protected]>--- include/tst_fuzzy_sync.h | 6 ++++++ 1 file changed, 6 insertions(+)include/tst_fuzzy_sync.h +2
-0@@ -59,9 +59,11 @@* @sa tst_fzsync_pair */ +#include <sys/sysinfo.h> #include <sys/time.h> #include <time.h> #include <math.h> +#include <sched.h> #include <stdlib.h> #include <pthread.h> #include "tst_atomic.h" include/tst_fuzzy_sync.h static inline void tst_fzsync_pair_wait(int *our_cntr, · line 569
Quoted 4 lines
include/tst_fuzzy_sync.h +1
-0@@ -564,6 +566,8 @@ static inline void tst_fzsync_pair_wait(int *our_cntr, && tst_atomic_load(our_cntr) < INT_MAX) {if (spins) (*spins)++; +if (get_nprocs () ==1 )We should use
tst_ncpus()and then cache the value so we are not making a function call within the loop. It is probably best to avoid calling this function insidetst_fzsync_pair_wait, it may even result in a system call.
Quoted 5 lines
We should probably cache the value in
tst_fzsync_pair, maybe as a boolean e.g. "yield_in_wait". This can be set/checked in thetst_fzsync_pair_initfunction. Also this will allow the user to handle CPUs being offlined if the test itself can cause that.
Got it! Thanks for reviewing the patch and all the heads-ups! I will refine it and send a v2.
Quoted 17 lines
include/tst_fuzzy_sync.h static inline void tst_fzsync_pair_wait(int *our_cntr, · line 592
Quoted 13 lines
include/tst_fuzzy_sync.h +3
-0+sched_yield (); }tst_atomic_store (0 , other_cntr);@@ -581,6 +585,8 @@ static inline void tst_fzsync_pair_wait(int *our_cntr,while (tst_atomic_load (our_cntr) <tst_atomic_load (other_cntr)) {if (spins) (*spins)++; +if (get_nprocs () ==1 ) +sched_yield (); } } }Everyone please note that we will have to test this extensively to ensure it does break existing reproducers.
Got it as well, will try to reproduce the cve with this patch applied.
Thanks again,
Leo
Quoted 7 lines
Alternatively to this approach we could create seperate implementations of
pair_waitand use a function pointer. I am thinking it may be best to do it both ways and perform some measurements.Signature · 2 lines
Thank you, Richard.