Implement sw_sync test
v10 cover Implement sw_sync test
This series implements the sw_sync test and the lib/sw_sync helper functions for said test.
The sw_sync subtests range from very basic tests of the sw_sync functionality, to stress testing and randomized tests.
Changes since v1:
Added "Reviewed-by: Eric Engestrom <[email protected]>" tag
lib/sw_sync:
- Fixed fd value checking
- Fixed fd validity check in sw_sync_fd_close()
- Moved sw_sync related paths to define
- Switched from malloc+memset to calloc in sync_file_info()
- Switched sizeof to dereferenced ptr
tests/sw_sync:
- Moved lib/sw_sync related code to lib/sw_sync commit
- Replaced memset with assignment in loop
Changes since v2:
lib/sw_sync:
- Replaced fd validity check in sw_sync_timeline_create()
- Replace sw_sync_XXX_destroy() functions with close()
- Simplified sw_sync_timeline_inc() comparison
- Changed sw_sync_merge() return value to -errno
- Changed name of sw_sync_fence_size() to sw_sync_fence_count()
- Reworked implementation of sw_sync_fence_count()
- Reworked implementation of sw_sync_fence_count_status()
tests/sw_sync:
- Replace sw_sync_XXX_destroy() functions with close()
Changes since v3:
lib/sw_sync:
- Changed sw_sync_fence_create() to take uint32_t seqno
- Added raw __sw_sync_fence_create() and failure check sw_sync_fence_create()
tests/sw_sync:
- Switch to using __sw_sync_fence_create() for failure cases
Changes since v4:
lib/sw_sync:
- Fixed whitespace in sw_sync_fence_count()
- Fixed whitespace and style of sw_sync_wait()
- Fixed whitespace in __sw_sync_fence_count_status()
Changes since v5:
lib/sw_sync:
- Added kernel_has_sw_sync()
- Added igt_require_sw_sync()
- Split out __sw_sync_merge() from sw_sync_merge()
- Added igt_debugfs.h include
- Change sw_sync_wait to reflect android implementation
- Renamed some functions:
- sw_sync_merge -> sync_merge
- sw_sync_wait -> sync_wait
- sw_sync_fence_count -> sync_fence_count
- sw_sync_fence_count_status -> sync_fence_count_status
- __sw_sync_fence_count_status -> __sync_fence_count_status
tests/sw_sync:
- Added subtest test_sync_expired_merge
- Added subtest test_timeline_closed
- Added subtest test_timeline_closed_signaled
- Added subtest test_sync_merge_invalid
- Added subtest test_sync_busy_fork
- Added subtest test_sync_busy_unixsockets
- Skip test on no sw_sync support
- Reworked comments of test_sync_wait
- Renamed test_sync_wait -> test_sync_busy
- Improved test_sync_wait igt_assert_f messages
Changes since v6:
tests/sw_sync:
- Added igt_assert to test_sync_expired_merge
- Added prime increments to test_sync_busy
Changes since v7:
- Removed accidental inclusions
Changes since v8:
- Removed some more accidental inclusions
lib/sw_sync:
- Moved some changes into the lib/sw_sync commit
Changes since v9:
Added: Reviewed-by: Tomeu Vizoso <[email protected]> Made asserts more informative
tests/sw_sync:
- Removed nbr_threads from data_t
- Removed nbr_iterations from data_t
lib/sw_sync:
- Removed undue Google/AOSP attribution
- Added LOCAL_ prefix to some defines
- Added comment for sw_sync path defines
- Changed return type of sw_sync_fd_is_valid to bool
- Made sw_sync_fd_is_valid internal to lib/sw_sync
- Remove dead sw_sync_fd_is_valid call from sync_merge
- Initialize structs at declaration instead of using memset
Rafael Antognolli (1):
tests/sw_sync: Add subtest test_sync_expired_merge
Robert Foss (20):
lib/sw_sync: Add helper functions for managing synchronization
primitives
test/sw_sync: Add sw_sync test
tests/sw_sync: Add subtest test_alloc_fence
tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline tests/sw_sync: Add subtest test_alloc_merge_fence tests/sw_sync: Add subtest test_sync_busy
tests/sw_sync: Add subtest test_sync_merge
tests/sw_sync: Add subtest test_sync_merge_same tests/sw_sync: Add subtest test_sync_multi_consumer tests/sw_sync: Add subtest test_sync_multi_consumer_producer tests/sw_sync: Add subtest test_sync_random_merge tests/sw_sync: Add subtest test_sync_multi_timeline_wait tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer tests/sw_sync: Add subtest test_timeline_closed tests/sw_sync: Add subtest test_timeline_closed_signaled lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync
support
tests/sw_sync: Add igt_require check for sw_sync feature tests/sw_sync: Add subtest test_sync_merge_invalid tests/sw_sync: Add subtest test_sync_busy_fork tests/sw_sync: Add subtest test_sync_busy_unixsocket
lib/Makefile.sources | 2 + lib/sw_sync.c | 219 +++++++++++ lib/sw_sync.h | 45 +++ tests/Makefile.sources | 1 + tests/sw_sync.c | 956 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1223 insertions(+) create mode 100644 lib/sw_sync.c create mode 100644 lib/sw_sync.h create mode 100644 tests/sw_sync.c
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 1/21 lib/sw_sync: Add helper functions for managing synchronization primitives
Base functions to help testing the Sync File Framework (explicit fencing mechanism ported from Android).
These functions allow you to create, use and destroy timelines and fences.
--- lib/Makefile.sources | 2 + lib/sw_sync.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/sw_sync.h | 44 ++++++++++++ 3 files changed, 242 insertions(+) create mode 100644 lib/sw_sync.c create mode 100644 lib/sw_sync.h
lib/Makefile.sources +2 -0
@@ -63,6 +63,8 @@ lib_source_list = \ rendercopy_gen8.c \ rendercopy_gen9.c \ rendercopy.h \ + sw_sync.c \ + sw_sync.h \ intel_reg_map.c \ intel_iosf.c \ igt_kms.c \
lib/sw_sync.c new file +196 -0
196 lines not on this page · raw message
lib/sw_sync.h new file +44 -0
44 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 2/21 test/sw_sync: Add sw_sync test
In reply to Robert FossAdd initial tests for sw_sync.
--- tests/Makefile.sources | 1 + tests/sw_sync.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 tests/sw_sync.c
tests/Makefile.sources +1 -0
@@ -131,6 +131,7 @@ TESTS_progs_M = \ prime_mmap_kms \ prime_self_import \ prime_vgem \ + sw_sync \ template \ vgem_basic \ vgem_slow \
tests/sw_sync.c new file +51 -0
51 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 3/21 tests/sw_sync: Add subtest test_alloc_fence
In reply to Robert FossAdd subtest alloc_fence that verifies that it's possible to allocate a fence on a timeline.
--- tests/sw_sync.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tests/sw_sync.c +16 -0
@@ -43,9 +43,25 @@ static void test_alloc_timeline(void)close (timeline); } +static void test_alloc_fence (void ) +{ +int in_fence; +int timeline; + + timeline =sw_sync_timeline_create (); + in_fence =sw_sync_fence_create (timeline,0 ); + +close (in_fence); +close (timeline); +} + + igt_main { igt_subtest("alloc_timeline")test_alloc_timeline (); + + igt_subtest("alloc_fence") +test_alloc_fence (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 4/21 tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline
In reply to Robert FossThis subtests tests that creating fences on negative timelines fail.
--- tests/sw_sync.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tests/sw_sync.c +8 -0
@@ -55,6 +55,11 @@ static void test_alloc_fence(void)close (timeline); } +static void test_alloc_fence_invalid_timeline (void ) +{ +igt_assert_f (__sw_sync_fence_create (-1 ,0 ) <0 , +"Did not fail to create fence on invalid timeline\n" ); +} igt_main {
@@ -63,5 +68,8 @@ igt_main igt_subtest("alloc_fence")test_alloc_fence (); + + igt_subtest("alloc_fence_invalid_timeline") +test_alloc_fence_invalid_timeline (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 5/21 tests/sw_sync: Add subtest test_alloc_merge_fence
In reply to Robert FossThis subtest verifies that merging two fences works in the simples possible case.
--- tests/sw_sync.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
tests/sw_sync.c +23 -0
@@ -61,6 +61,26 @@ static void test_alloc_fence_invalid_timeline(void) "Did not fail to create fence on invalid timeline\n"); } +static void test_alloc_merge_fence (void ) +{ +int in_fence[2 ]; +int fence_merge; +int timeline[2 ]; + + timeline[0 ] =sw_sync_timeline_create (); + timeline[1 ] =sw_sync_timeline_create (); + + in_fence[0 ] =sw_sync_fence_create (timeline[0 ],1 ); + in_fence[1 ] =sw_sync_fence_create (timeline[1 ],1 ); + fence_merge =sync_merge (in_fence[1 ], in_fence[0 ]); + +close (in_fence[0 ]); +close (in_fence[1 ]); +close (fence_merge); +close (timeline[0 ]); +close (timeline[1 ]); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -71,5 +91,8 @@ igt_main igt_subtest("alloc_fence_invalid_timeline")test_alloc_fence_invalid_timeline (); + + igt_subtest("alloc_merge_fence") +test_alloc_merge_fence (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 6/21 tests/sw_sync: Add subtest test_sync_busy
In reply to Robert FossThis subtest verifies that waiting on fences works properly.
--- tests/sw_sync.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
tests/sw_sync.c +51 -0
@@ -29,6 +29,7 @@#include "igt.h" #include "igt_aux.h" +#include "igt_primes.h" #include "sw_sync.h"
@@ -81,6 +82,53 @@ static void test_alloc_merge_fence(void)close (timeline[1 ]); } +static void test_sync_busy (void ) +{ +int fence, ret; +int timeline; +int seqno; + + timeline =sw_sync_timeline_create (); + fence =sw_sync_fence_create (timeline,5 ); + +/* Make sure that fence has not been signaled yet */ + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME ,"Fence signaled early (timeline value 0, fence seqno 5)\n" ); + +/* Advance timeline from 0 -> 1 */ +sw_sync_timeline_inc (timeline,1 ); + +/* Make sure that fence has not been signaled yet */ + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME ,"Fence signaled early (timeline value 1, fence seqno 5)\n" ); + +/* Advance timeline from 1 -> 5: signaling the fence (seqno 5)*/ +sw_sync_timeline_inc (timeline,4 ); + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==0 ,"Fence not signaled (timeline value 5, fence seqno 5)\n" ); + +/* Go even further, and confirm wait still succeeds */ +sw_sync_timeline_inc (timeline,5 ); + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==0 ,"Fence not signaled (timeline value 10, fence seqno 5)\n" ); + + seqno =10 ; +for_each_prime_number (prime,100 ) { +int fence_prime; + seqno += prime; + + fence_prime =sw_sync_fence_create (timeline, seqno); +sw_sync_timeline_inc (timeline, prime); + + ret =sync_wait (fence_prime,0 ); +igt_assert_f (ret ==0 ,"Fence not signaled during test of prime timeline increments\n" ); +close (fence_prime); + } + +close (fence); +close (timeline); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -94,5 +142,8 @@ igt_main igt_subtest("alloc_merge_fence")test_alloc_merge_fence (); + + igt_subtest("sync_busy") +test_sync_busy (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 7/21 tests/sw_sync: Add subtest test_sync_merge
In reply to Robert FossAdd subtest test_sync_merge that tests merging fences and the validity of the resulting merged fence.
--- tests/sw_sync.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)
tests/sw_sync.c +67 -0
@@ -129,6 +129,70 @@ static void test_sync_busy(void)close (timeline); } +static void test_sync_merge (void ) +{ +int in_fence[3 ]; +int fence_merge; +int timeline; +int active, signaled; + + timeline =sw_sync_timeline_create (); + in_fence[0 ] =sw_sync_fence_create (timeline,1 ); + in_fence[1 ] =sw_sync_fence_create (timeline,2 ); + in_fence[2 ] =sw_sync_fence_create (timeline,3 ); + + fence_merge =sync_merge (in_fence[0 ], in_fence[1 ]); + fence_merge =sync_merge (in_fence[2 ], fence_merge); + +/* confirm all fences have one active point (even d) */ + active =sync_fence_count_status (in_fence[0 ], +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (active ==1 ,"in_fence[0] has too many active fences\n" ); + active =sync_fence_count_status (in_fence[1 ], +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (active ==1 ,"in_fence[1] has too many active fences\n" ); + active =sync_fence_count_status (in_fence[2 ], +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (active ==1 ,"in_fence[2] has too many active fences\n" ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (active ==1 ,"fence_merge has too many active fences\n" ); + +/* confirm that fence_merge is not signaled until the max of fence 0,1,2 */ +sw_sync_timeline_inc (timeline,1 ); + signaled =sync_fence_count_status (in_fence[0 ], +SW_SYNC_FENCE_STATUS_SIGNALED ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (signaled ==1 ,"in_fence[0] did not signal\n" ); +igt_assert_f (active ==1 ,"fence_merge signaled too early\n" ); + +sw_sync_timeline_inc (timeline,1 ); + signaled =sync_fence_count_status (in_fence[1 ], +SW_SYNC_FENCE_STATUS_SIGNALED ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (signaled ==1 ,"in_fence[1] did not signal\n" ); +igt_assert_f (active ==1 ,"fence_merge signaled too early\n" ); + +sw_sync_timeline_inc (timeline,1 ); + signaled =sync_fence_count_status (in_fence[2 ], +SW_SYNC_FENCE_STATUS_SIGNALED ); +igt_assert_f (signaled ==1 ,"in_fence[2] did not signal\n" ); + signaled =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_SIGNALED ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (active ==0 && signaled ==1 , +"fence_merge did not signal\n" ); + +close (in_fence[0 ]); +close (in_fence[1 ]); +close (in_fence[2 ]); +close (fence_merge); +close (timeline); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -145,5 +209,8 @@ igt_main igt_subtest("sync_busy")test_sync_busy (); + + igt_subtest("sync_merge") +test_sync_merge (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 8/21 tests/sw_sync: Add subtest test_sync_merge_same
In reply to Robert FossThis subtest verifies merging a fence with itself does not fail.
--- tests/sw_sync.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
tests/sw_sync.c +27 -0
@@ -193,6 +193,30 @@ static void test_sync_merge(void)close (timeline); } +static void test_sync_merge_same (void ) +{ +int in_fence[2 ]; +int timeline; +int signaled; + + timeline =sw_sync_timeline_create (); + in_fence[0 ] =sw_sync_fence_create (timeline,1 ); + in_fence[1 ] =sync_merge (in_fence[0 ], in_fence[0 ]); + + signaled =sync_fence_count_status (in_fence[0 ], +SW_SYNC_FENCE_STATUS_SIGNALED ); +igt_assert_f (signaled ==0 ,"Fence signaled too early\n" ); + +sw_sync_timeline_inc (timeline,1 ); + signaled =sync_fence_count_status (in_fence[0 ], +SW_SYNC_FENCE_STATUS_SIGNALED ); +igt_assert_f (signaled ==1 ,"Fence did not signal\n" ); + +close (in_fence[0 ]); +close (in_fence[1 ]); +close (timeline); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -212,5 +236,8 @@ igt_main igt_subtest("sync_merge")test_sync_merge (); + + igt_subtest("sync_merge_same") +test_sync_merge_same (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 9/21 tests/sw_sync: Add subtest test_sync_multi_consumer
In reply to Robert FossThis subtest verifies the access ordering of multiple consumer threads.
--- tests/sw_sync.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+)
tests/sw_sync.c +98 -0
@@ -24,6 +24,8 @@* Robert Foss <[email protected]> */ +#include <pthread.h> +#include <semaphore.h> #include <stdint.h> #include <unistd.h>
@@ -36,6 +38,13 @@IGT_TEST_DESCRIPTION ("Test SW Sync Framework" ); +typedef struct { +int timeline; +uint32_t thread_id; +volatile uint32_t *volatile counter; +sem_t *sem; +}data_t ; +static void test_alloc_timeline (void ) {int timeline;
@@ -217,6 +226,92 @@ static void test_sync_merge_same(void)close (timeline); } +#define MULTI_CONSUMER_THREADS 8 +#define MULTI_CONSUMER_ITERATIONS (1 << 14) +static void *test_sync_multi_consumer_thread (void *arg) +{ +data_t *data = arg; +int thread_id = data->thread_id; +int timeline = data->timeline; +int ret, i; + +for (i =0 ; i <MULTI_CONSUMER_ITERATIONS ; i++) { +int next_point = i *MULTI_CONSUMER_THREADS + thread_id; +int fence =sw_sync_fence_create (timeline, next_point); + + ret =sync_wait (fence,1000 ); +if (ret ==-1 ) + { +return (void *)1 ; + } + +if (*(data->counter) != next_point) + { +return (void *)1 ; + } + +sem_post (data->sem); +close (fence); + } +return NULL ; +} + +static void test_sync_multi_consumer (void ) +{ + +data_t data_arr[MULTI_CONSUMER_THREADS ]; +pthread_t thread_arr[MULTI_CONSUMER_THREADS ]; +sem_t sem; +int timeline; +volatile uint32_t counter =0 ; +uintptr_t thread_ret =0 ; +data_t data; +int i, ret; + +sem_init (&sem,0 ,0 ); + timeline =sw_sync_timeline_create (); + + data.counter = &counter; + data.timeline = timeline; + data.sem = &sem; + +/* Start sync threads. */ +for (i =0 ; i <MULTI_CONSUMER_THREADS ; i++) + { + data_arr[i] = data; + data_arr[i].thread_id = i; + ret =pthread_create (&thread_arr[i],NULL , + test_sync_multi_consumer_thread, + (void *) &(data_arr[i])); +igt_assert_eq (ret,0 ); + } + +/* Produce 'content'. */ +for (i =0 ; i <MULTI_CONSUMER_THREADS *MULTI_CONSUMER_ITERATIONS ; i++) + { +sem_wait (&sem); + + counter++; +sw_sync_timeline_inc (timeline,1 ); + } + +/* Wait for threads to complete. */ +for (i =0 ; i <MULTI_CONSUMER_THREADS ; i++) + { +uintptr_t local_thread_ret; +pthread_join (thread_arr[i], (void **)&local_thread_ret); + thread_ret |= local_thread_ret; + } + +close (timeline); +sem_destroy (&sem); + +igt_assert_f (counter ==MULTI_CONSUMER_THREADS *MULTI_CONSUMER_ITERATIONS , +"Counter has unexpected value.\n" ); + +igt_assert_f (thread_ret ==0 ,"A sync thread reported failure.\n" ); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -239,5 +334,8 @@ igt_main igt_subtest("sync_merge_same")test_sync_merge_same (); + + igt_subtest("sync_multi_consumer") +test_sync_multi_consumer (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 10/21 tests/sw_sync: Add subtest test_sync_multi_consumer_producer
In reply to Robert FossThis test verifies that stressing the kernel by creating multiple consumer/producer threads that wait on a single timeline to be incremented by another conumer/producer thread does not fail.
And that the order amongst the threads is maintained.
--- tests/sw_sync.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 90 insertions(+), 5 deletions(-)
tests/sw_sync.c +90 -5
@@ -102,24 +102,28 @@ static void test_sync_busy(void)/* Make sure that fence has not been signaled yet */ ret =sync_wait (fence,0 ); -igt_assert_f (ret ==-1 && errno ==ETIME ,"Fence signaled early (timeline value 0, fence seqno 5)\n" ); +igt_assert_f (ret ==-1 && errno ==ETIME , +"Fence signaled early (timeline value 0, fence seqno 5)\n" );/* Advance timeline from 0 -> 1 */ sw_sync_timeline_inc (timeline,1 );/* Make sure that fence has not been signaled yet */ ret =sync_wait (fence,0 ); -igt_assert_f (ret ==-1 && errno ==ETIME ,"Fence signaled early (timeline value 1, fence seqno 5)\n" ); +igt_assert_f (ret ==-1 && errno ==ETIME , +"Fence signaled early (timeline value 1, fence seqno 5)\n" );/* Advance timeline from 1 -> 5: signaling the fence (seqno 5)*/ sw_sync_timeline_inc (timeline,4 ); ret =sync_wait (fence,0 ); -igt_assert_f (ret ==0 ,"Fence not signaled (timeline value 5, fence seqno 5)\n" ); +igt_assert_f (ret ==0 , +"Fence not signaled (timeline value 5, fence seqno 5)\n" );/* Go even further, and confirm wait still succeeds */ sw_sync_timeline_inc (timeline,5 ); ret =sync_wait (fence,0 ); -igt_assert_f (ret ==0 ,"Fence not signaled (timeline value 10, fence seqno 5)\n" ); +igt_assert_f (ret ==0 , +"Fence not signaled (timeline value 10, fence seqno 5)\n" ); seqno =10 ;for_each_prime_number (prime,100 ) {
@@ -130,7 +134,8 @@ static void test_sync_busy(void)sw_sync_timeline_inc (timeline, prime); ret =sync_wait (fence_prime,0 ); -igt_assert_f (ret ==0 ,"Fence not signaled during test of prime timeline increments\n" ); +igt_assert_f (ret ==0 , +"Fence not signaled during test of prime timeline increments\n" );close (fence_prime); }
@@ -312,6 +317,83 @@ static void test_sync_multi_consumer(void)igt_assert_f (thread_ret ==0 ,"A sync thread reported failure.\n" ); } +#define MULTI_CONSUMER_PRODUCER_THREADS 8 +#define MULTI_CONSUMER_PRODUCER_ITERATIONS (1 << 14) +static void *test_sync_multi_consumer_producer_thread (void *arg) +{ +data_t *data = arg; +int thread_id = data->thread_id; +int timeline = data->timeline; +int ret, i; + +for (i =0 ; i <MULTI_CONSUMER_PRODUCER_ITERATIONS ; i++) { +int next_point = i *MULTI_CONSUMER_PRODUCER_THREADS + thread_id; +int fence =sw_sync_fence_create (timeline, next_point); + + ret =sync_wait (fence,1000 ); +if (ret ==-1 ) + { +return (void *)1 ; + } + +if (*(data->counter) != next_point) + { +return (void *)1 ; + } + + (*data->counter)++; + +/* Kick off the next thread. */ +sw_sync_timeline_inc (timeline,1 ); + +close (fence); + } +return NULL ; +} + +static void test_sync_multi_consumer_producer (void ) +{ +data_t data_arr[MULTI_CONSUMER_PRODUCER_THREADS ]; +pthread_t thread_arr[MULTI_CONSUMER_PRODUCER_THREADS ]; +int timeline; +volatile uint32_t counter =0 ; +uintptr_t thread_ret =0 ; +data_t data; +int i, ret; + + timeline =sw_sync_timeline_create (); + + data.counter = &counter; + data.timeline = timeline; + +/* Start consumer threads. */ +for (i =0 ; i <MULTI_CONSUMER_PRODUCER_THREADS ; i++) + { + data_arr[i] = data; + data_arr[i].thread_id = i; + ret =pthread_create (&thread_arr[i],NULL , + test_sync_multi_consumer_producer_thread, + (void *) &(data_arr[i])); +igt_assert_eq (ret,0 ); + } + +/* Wait for threads to complete. */ +for (i =0 ; i <MULTI_CONSUMER_PRODUCER_THREADS ; i++) + { +uintptr_t local_thread_ret; +pthread_join (thread_arr[i], (void **)&local_thread_ret); + thread_ret |= local_thread_ret; + } + +close (timeline); + +igt_assert_f (counter ==MULTI_CONSUMER_PRODUCER_THREADS * +MULTI_CONSUMER_PRODUCER_ITERATIONS , +"Counter has unexpected value.\n" ); + +igt_assert_f (thread_ret ==0 ,"A sync thread reported failure.\n" ); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -337,5 +419,8 @@ igt_main igt_subtest("sync_multi_consumer")test_sync_multi_consumer (); + + igt_subtest("sync_multi_consumer_producer") +test_sync_multi_consumer_producer (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 11/21 tests/sw_sync: Add subtest test_sync_random_merge
In reply to Robert FossThis subtest verifies that creating many timelines and merging random fences from each timeline with eachother results in merged fences that are fully functional.
--- tests/sw_sync.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
tests/sw_sync.c +73 -0
@@ -394,6 +394,76 @@ static void test_sync_multi_consumer_producer(void)igt_assert_f (thread_ret ==0 ,"A sync thread reported failure.\n" ); } +static void test_sync_random_merge (void ) +{ +int i, size, ret; +const int nbr_timeline =32 ; +const int nbr_merge =1024 ; +int fence_map[nbr_timeline]; +int timeline_arr[nbr_timeline]; +int fence, tmpfence, merged; +int timeline, timeline_offset, sync_pt; + +srand (time (NULL )); + +for (i =0 ; i < nbr_timeline; i++) { + timeline_arr[i] =sw_sync_timeline_create (); + fence_map[i] =-1 ; + } + + sync_pt =rand (); + fence =sw_sync_fence_create (timeline_arr[0 ], sync_pt); + + fence_map[0 ] = sync_pt; + +/* Randomly create syncpoints out of a fixed set of timelines, +* and merge them together. +*/ +for (i =0 ; i < nbr_merge; i++) { +/* Generate syncpoint. */ + timeline_offset =rand () % nbr_timeline; + timeline = timeline_arr[timeline_offset]; + sync_pt =rand (); + +/* Keep track of the latest sync_pt in each timeline. */ +if (fence_map[timeline_offset] ==-1 ) + fence_map[timeline_offset] = sync_pt; +else if (fence_map[timeline_offset] < sync_pt) + fence_map[timeline_offset] = sync_pt; + +/* Merge. */ + tmpfence =sw_sync_fence_create (timeline, sync_pt); + merged =sync_merge (tmpfence, fence); +close (tmpfence); +close (fence); + fence = merged; + } + + size =0 ; +for (i =0 ; i < nbr_timeline; i++) +if (fence_map[i] !=-1 ) + size++; + +/* Trigger the merged fence. */ +for (i =0 ; i < nbr_timeline; i++) { +if (fence_map[i] !=-1 ) { + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME , +"Failure waiting on fence until timeout\n" ); +/* Increment the timeline to the last sync_pt */ +sw_sync_timeline_inc (timeline_arr[i], fence_map[i]); + } + } + +/* Check that the fence is triggered. */ + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==0 ,"Failure triggering fence\n" ); + +close (fence); +for (i =0 ; i < nbr_timeline; i++) +close (timeline_arr[i]); +} + igt_main {igt_subtest ("alloc_timeline" )
@@ -422,5 +492,8 @@ igt_main igt_subtest("sync_multi_consumer_producer")test_sync_multi_consumer_producer (); + + igt_subtest("sync_random_merge") +test_sync_random_merge (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 12/21 tests/sw_sync: Add subtest test_sync_multi_timeline_wait
In reply to Robert FossThis subtest verifies that waiting, timing out on a wait and that counting fences in various states works.
--- tests/sw_sync.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)
tests/sw_sync.c +66 -0
@@ -231,6 +231,69 @@ static void test_sync_merge_same(void)close (timeline); } +static void test_sync_multi_timeline_wait (void ) +{ +int timeline[3 ]; +int in_fence[3 ]; +int fence_merge; +int active, signaled, ret; + + timeline[0 ] =sw_sync_timeline_create (); + timeline[1 ] =sw_sync_timeline_create (); + timeline[2 ] =sw_sync_timeline_create (); + + in_fence[0 ] =sw_sync_fence_create (timeline[0 ],5 ); + in_fence[1 ] =sw_sync_fence_create (timeline[1 ],5 ); + in_fence[2 ] =sw_sync_fence_create (timeline[2 ],5 ); + + fence_merge =sync_merge (in_fence[0 ], in_fence[1 ]); + fence_merge =sync_merge (in_fence[2 ], fence_merge); + +/* Confirm fence isn't signaled */ + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); +igt_assert_f (active ==3 ,"Fence signaled too early\n" ); + + ret =sync_wait (fence_merge,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME ,"Failure waiting on fence until timeout\n" ); + +sw_sync_timeline_inc (timeline[0 ],5 ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); + signaled =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_SIGNALED ); +igt_assert_f (active ==2 && signaled ==1 , +"Fence did not signal properly\n" ); + +sw_sync_timeline_inc (timeline[1 ],5 ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); + signaled =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_SIGNALED ); +igt_assert_f (active ==1 && signaled ==2 , +"Fence did not signal properly\n" ); + +sw_sync_timeline_inc (timeline[2 ],5 ); + active =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_ACTIVE ); + signaled =sync_fence_count_status (fence_merge, +SW_SYNC_FENCE_STATUS_SIGNALED ); +igt_assert_f (active ==0 && signaled ==3 , +"Fence did not signal properly\n" ); + +/* confirm you can successfully wait */ + ret =sync_wait (fence_merge,100 ); +igt_assert_f (ret ==0 ,"Failure waiting on signaled fence\n" ); + +close (in_fence[0 ]); +close (in_fence[1 ]); +close (in_fence[2 ]); +close (fence_merge); +close (timeline[0 ]); +close (timeline[1 ]); +close (timeline[2 ]); +} +#define MULTI_CONSUMER_THREADS 8#define MULTI_CONSUMER_ITERATIONS (1 << 14)static void *test_sync_multi_consumer_thread (void *arg)
@@ -487,6 +550,9 @@ igt_main igt_subtest("sync_merge_same")test_sync_merge_same (); + igt_subtest("sync_multi_timeline_wait") +test_sync_multi_timeline_wait (); + igt_subtest("sync_multi_consumer")test_sync_multi_consumer ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 13/21 tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer
In reply to Robert FossThis subtest runs a single consumer thread and multiple producer thread that are synchronized using multiple timelines.
--- tests/sw_sync.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+)
tests/sw_sync.c +139 -0
@@ -457,6 +457,142 @@ static void test_sync_multi_consumer_producer(void)igt_assert_f (thread_ret ==0 ,"A sync thread reported failure.\n" ); } +static int test_mspc_wait_on_fence (int fence) +{ +int error, active; + +do { + error =sync_fence_count_status (fence, +SW_SYNC_FENCE_STATUS_ERROR ); +igt_assert_f (error ==0 ,"Error occurred on fence\n" ); + active =sync_fence_count_status (fence, +SW_SYNC_FENCE_STATUS_ACTIVE ); + }while (active); + +return 0 ; +} + +static struct { +int iterations; +int threads; +int counter; +int cons_timeline; +int *prod_timeline; +pthread_mutex_t lock; +} test_mpsc_data; + +static int mpsc_producer_thread (void *d) +{ +int id = (long )d; +int fence, i; +int *prod_timeline = test_mpsc_data.prod_timeline; +int cons_timeline = test_mpsc_data.cons_timeline; +int iterations = test_mpsc_data.iterations; + +for (i =0 ; i < iterations; i++) { + fence =sw_sync_fence_create (cons_timeline, i); + +/* Wait for the consumer to finish. Use alternate +* means of waiting on the fence +*/ +if ((iterations + id) %8 !=0 ) { +igt_assert_f (sync_wait (fence,-1 ) ==0 , +"Failure waiting on fence\n" ); + }else { +igt_assert_f (test_mspc_wait_on_fence (fence) ==0 , +"Failure waiting on fence\n" ); + } + +/* Every producer increments the counter, the consumer +* checks and erases it +*/ +pthread_mutex_lock (&test_mpsc_data.lock); + test_mpsc_data.counter++; +pthread_mutex_unlock (&test_mpsc_data.lock); + +sw_sync_timeline_inc (prod_timeline[id],1 ); +close (fence); + } + +return 0 ; +} + +static int mpsc_consumer_thread (void ) +{ +int fence, merged, tmp, it, i; +int *prod_timeline = test_mpsc_data.prod_timeline; +int cons_timeline = test_mpsc_data.cons_timeline; +int iterations = test_mpsc_data.iterations; +int n = test_mpsc_data.threads; + +for (it =1 ; it <= iterations; it++) { + fence =sw_sync_fence_create (prod_timeline[0 ], it); +for (i =1 ; i < n; i++) { + tmp =sw_sync_fence_create (prod_timeline[i], it); + merged =sync_merge (tmp, fence); +close (tmp); +close (fence); + fence = merged; + } + +/* Make sure we see an increment from every producer thread. +* Vary the means by which we wait. +*/ +if (iterations %8 !=0 ) { +igt_assert_f (sync_wait (fence,-1 ) ==0 , +"Producers did not increment as expected\n" ); + }else { +igt_assert_f (test_mspc_wait_on_fence (fence) ==0 , +"Failure waiting on fence\n" ); + } + +igt_assert_f (test_mpsc_data.counter == n * it, +"Counter value mismatch\n" ); + +/* Release the producer threads */ +sw_sync_timeline_inc (cons_timeline,1 ); +close (fence); + } + +return 0 ; +} + +/* IMPORTANT NOTE: if you see this test failing on your system, it may be +* due to a shortage of file descriptors. Please ensure your system has +* a sensible limit for this test to finish correctly. +*/ +static void test_sync_multi_producer_single_consumer (void ) +{ +int iterations =1 <<12 ; +int n =5 ; +int prod_timeline[n]; +int cons_timeline; +pthread_t threads[n]; +long i; + + cons_timeline =sw_sync_timeline_create (); +for (i =0 ; i < n; i++) + prod_timeline[i] =sw_sync_timeline_create (); + + test_mpsc_data.prod_timeline = prod_timeline; + test_mpsc_data.cons_timeline = cons_timeline; + test_mpsc_data.iterations = iterations; + test_mpsc_data.threads = n; + test_mpsc_data.counter =0 ; +pthread_mutex_init (&test_mpsc_data.lock,NULL ); + +for (i =0 ; i < n; i++) { +pthread_create (&threads[i],NULL , (void * (*)(void *)) + mpsc_producer_thread, + (void *)i); + } + +mpsc_consumer_thread (); + +for (i =0 ; i < n; i++) +pthread_join (threads[i],NULL ); +} +static void test_sync_random_merge (void ) {int i, size, ret;
@@ -559,6 +695,9 @@ igt_main igt_subtest("sync_multi_consumer_producer")test_sync_multi_consumer_producer (); + igt_subtest("sync_multi_producer_single_consumer") +test_sync_multi_producer_single_consumer (); + igt_subtest("sync_random_merge")test_sync_random_merge (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 14/21 tests/sw_sync: Add subtest test_sync_expired_merge
In reply to Robert FossFrom: Rafael Antognolli <[email protected]>
This test creates an already expired fence, then creates a merged fence out of that expired one (passed twice to the merge operation), and finally closes the merged fence. It shows that if the refcounts are wrong on the original expired fence, it might get freed while still in use. Usually a kernel panick will follow.
--- tests/sw_sync.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
tests/sw_sync.c +31 -0
@@ -593,6 +593,34 @@ static void test_sync_multi_producer_single_consumer(void)pthread_join (threads[i],NULL ); } +static void test_sync_expired_merge (void ) +{ +int iterations =1 <<20 ; +int timeline; +int i; +int fence_expired, fence_merged; + + timeline =sw_sync_timeline_create (); + +sw_sync_timeline_inc (timeline,100 ); + fence_expired =sw_sync_fence_create (timeline,1 ); +igt_assert_f (sync_wait (fence_expired,0 ) ==0 , +"Failure waiting for expired fence\n" ); + + fence_merged =sync_merge (fence_expired, fence_expired); +close (fence_merged); + +for (i =0 ; i < iterations; i++) { +int fence =sync_merge (fence_expired, fence_expired); + +igt_assert_f (sync_wait (fence,-1 ) ==0 , +"Failure waiting on fence\n" ); +close (fence); + } + +close (fence_expired); +} +static void test_sync_random_merge (void ) {int i, size, ret;
@@ -698,6 +726,9 @@ igt_main igt_subtest("sync_multi_producer_single_consumer")test_sync_multi_producer_single_consumer (); + igt_subtest("sync_expired_merge") +test_sync_expired_merge (); + igt_subtest("sync_random_merge")test_sync_random_merge (); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 15/21 tests/sw_sync: Add subtest test_timeline_closed
In reply to Robert FossThis subtest verifies that the fences of a timeline are not signalled when a timelne is closed.
--- tests/sw_sync.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
tests/sw_sync.c +17 -0
@@ -71,6 +71,20 @@ static void test_alloc_fence_invalid_timeline(void) "Did not fail to create fence on invalid timeline\n"); } +static void test_timeline_closed (void ) +{ +int fence, ret; +int timeline; + + timeline =sw_sync_timeline_create (); + fence =sw_sync_fence_create (timeline,1 ); + +close (timeline); + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME , +"Failure waiting on unsignaled fence on closed timeline\n" ); +} +static void test_alloc_merge_fence (void ) {int in_fence[2 ];
@@ -702,6 +716,9 @@ igt_main igt_subtest("alloc_fence_invalid_timeline")test_alloc_fence_invalid_timeline (); + igt_subtest("timeline_closed") +test_timeline_closed (); + igt_subtest("alloc_merge_fence")test_alloc_merge_fence ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 16/21 tests/sw_sync: Add subtest test_timeline_closed_signaled
In reply to Robert FossAdd subtest test_timeline_closed_signaled that verifies that a signaled fence stays signaled after its timeline has been closed.
--- tests/sw_sync.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tests/sw_sync.c +18 -0
@@ -85,6 +85,21 @@ static void test_timeline_closed(void) "Failure waiting on unsignaled fence on closed timeline\n"); } +static void test_timeline_closed_signaled (void ) +{ +int fence, ret; +int timeline; + + timeline =sw_sync_timeline_create (); + fence =sw_sync_fence_create (timeline,1 ); + +sw_sync_timeline_inc (timeline,1 ); +close (timeline); + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==0 , +"Failure waiting on signaled fence for closed timeline\n" ); +} +static void test_alloc_merge_fence (void ) {int in_fence[2 ];
@@ -719,6 +734,9 @@ igt_main igt_subtest("timeline_closed")test_timeline_closed (); + igt_subtest("timeline_closed_signaled") +test_timeline_closed_signaled (); + igt_subtest("alloc_merge_fence")test_alloc_merge_fence ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 17/21 lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support
In reply to Robert FossAdd igt_require_sw_sync to provide tests to skip if sw_sync support isn't available on the host machine.
--- lib/sw_sync.c | 22 ++++++++++++++++++++++ lib/sw_sync.h | 1 + 2 files changed, 23 insertions(+)
lib/sw_sync.c +22 -0
@@ -194,3 +194,25 @@ int sync_fence_count_status(int fd, int status)igt_assert_f (count >=0 ,"No fences with supplied status found" );return count; } + +static bool kernel_has_sw_sync (void ) +{ +bool err; + +igt_ignore_warn (system ("/sbin/modprobe -s r sw_sync" )); + + err = false; +if (access (DEVFS_SW_SYNC ,R_OK |W_OK ) <0 ) { +char buf[128 ]; + +snprintf (buf,sizeof (buf),"%s/sw_sync" ,igt_debugfs_mount ()); + err =access (DEBUGFS_SW_SYNC ,R_OK |W_OK ) <0 ; + } + +return !err; +} + +void igt_require_sw_sync (void ) +{ +igt_require (kernel_has_sw_sync ()); +}
lib/sw_sync.h +1 -0
@@ -39,6 +39,7 @@ int sync_merge(int fd1, int fd2);int sync_wait (int fence,int timeout);int sync_fence_count (int fd);int sync_fence_count_status (int fd,int status); +void igt_require_sw_sync (void );#endif
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 18/21 tests/sw_sync: Add igt_require check for sw_sync feature
In reply to Robert FossMake sure that this test is skipped if the sw_sync feature is missing from the host system.
--- lib/sw_sync.c | 1 + tests/sw_sync.c | 3 +++ 2 files changed, 4 insertions(+)
lib/sw_sync.c +1 -0
@@ -36,6 +36,7 @@#include <linux/sync_file.h> #include <sys/ioctl.h> +#include "igt_debugfs.h" #include "sw_sync.h" #include "drmtest.h" #include "ioctl_wrappers.h"
tests/sw_sync.c +3 -0
@@ -722,6 +722,9 @@ static void test_sync_random_merge(void) igt_main { +igt_fixture +igt_require_sw_sync (); + igt_subtest("alloc_timeline")test_alloc_timeline ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 19/21 tests/sw_sync: Add subtest test_sync_merge_invalid
In reply to Robert FossAdd subtest test_sync_merge_invalid that tests merging invalid fences.
--- tests/sw_sync.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
tests/sw_sync.c +41 -0
@@ -172,6 +172,44 @@ static void test_sync_busy(void)close (timeline); } +static void test_sync_merge_invalid (void ) +{ +int in_fence; +int fence_invalid; +int fence_merge; +int timeline; +char tmppath[] ="/tmp/igt-XXXXXX" ; +int skip =0 ; + + timeline =sw_sync_timeline_create (); + in_fence =sw_sync_fence_create (timeline,1 ); + + fence_invalid =-1 ; + fence_merge =sync_merge (in_fence, fence_invalid); +igt_assert_f (fence_merge <0 ,"Verify invalid fd (-1) handling" ); + + fence_invalid =drm_open_driver (DRIVER_ANY ); + fence_merge =sync_merge (in_fence, fence_invalid); +igt_assert_f (fence_merge <0 ,"Verify invalid fd (device fd) handling" ); + + fence_invalid =mkstemp (tmppath); +if (fence_invalid ==-1 ) { + skip =1 ; + goto out; + } +unlink (tmppath); + fence_invalid =drm_open_driver (DRIVER_ANY ); + fence_merge =sync_merge (in_fence, fence_invalid); +close (fence_invalid); +igt_assert_f (fence_merge <0 ,"Verify invalid fd (file fd) handling" ); + +out: +close (in_fence); +close (fence_merge); +close (timeline); +igt_require (skip ==0 ); +} +static void test_sync_merge (void ) {int in_fence[3 ];
@@ -746,6 +784,9 @@ igt_main igt_subtest("sync_busy")test_sync_busy (); + igt_subtest("sync_merge_invalid") +test_sync_merge_invalid (); + igt_subtest("sync_merge")test_sync_merge ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 20/21 tests/sw_sync: Add subtest test_sync_busy_fork
In reply to Robert FossAdd subtest test_sync_busy_fork which increments the timeline in a forked child process.
--- tests/sw_sync.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
tests/sw_sync.c +39 -0
@@ -172,6 +172,42 @@ static void test_sync_busy(void)close (timeline); } +static void test_sync_busy_fork (void ) +{ +int fence, ret; +int timeline; +int skip =0 ; + + timeline =sw_sync_timeline_create (); + fence =sw_sync_fence_create (timeline,1 ); + +switch (fork ()) { +case 0 : +/* Child process */ +usleep (1 *1000 *1000 ); +/* Advance timeline from 0 -> 1 */ +sw_sync_timeline_inc (timeline,1 ); +_Exit (0 ); +break ; +case -1 : +/* Failed fork */ + skip =1 ; +break ; +default : +/* Parent process */ + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME ,"Fence signaled (it should not have been signalled yet)\n" ); + + ret =sync_wait (fence,2 *1000 ); +igt_assert_f (ret ==0 ,"Fence not signaled (timeline value 1 fence seqno 1)\n" ); +break ; + } + +close (fence); +close (timeline); +igt_require (!skip); +} +static void test_sync_merge_invalid (void ) {int in_fence;
@@ -784,6 +820,9 @@ igt_main igt_subtest("sync_busy")test_sync_busy (); + igt_subtest("sync_busy_fork") +test_sync_busy_fork (); + igt_subtest("sync_merge_invalid")test_sync_merge_invalid ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 21/21 tests/sw_sync: Add subtest test_sync_busy_unixsocket
In reply to Robert FossAdd subtest test_sync_busy_fork which increments the timeline in a forked child process, where the timeline fd has been sent through a UNIX socket.
--- tests/sw_sync.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+)
tests/sw_sync.c +103 -0
@@ -27,6 +27,8 @@#include <pthread.h> #include <semaphore.h> #include <stdint.h> +#include <sys/socket.h> +#include <sys/types.h> #include <unistd.h> #include "igt.h"
@@ -172,6 +174,104 @@ static void test_sync_busy(void)close (timeline); } +static void test_sync_busy_fork_unixsocket (void ) +{ +int fence, ret; +int timeline; +int skip =0 ; +int sv[2 ]; + + + timeline =sw_sync_timeline_create (); + fence =sw_sync_fence_create (timeline,1 ); + +if (socketpair (AF_UNIX ,SOCK_DGRAM ,0 , sv) !=0 ) { + skip =1 ; + goto out; + } + +switch (fork ()) { +case 0 : + { +/* Child process */ +int socket = sv[1 ]; +int socket_timeline; +struct msghdr msg = {0 }; +struct cmsghdr *cmsg; +unsigned char *data; +char m_buffer[256 ]; +char c_buffer[256 ]; +struct iovec io = { .iov_base = m_buffer, .iov_len =sizeof (m_buffer) }; +close (sv[0 ]); + + msg.msg_iov = &io; + msg.msg_iovlen =1 ; + msg.msg_control = c_buffer; + msg.msg_controllen =sizeof (c_buffer); + +if (recvmsg (socket, &msg,0 ) <0 ) +_Exit (1 ); + + cmsg =CMSG_FIRSTHDR (&msg); + data =CMSG_DATA (cmsg); + socket_timeline = *((int *) data); + +/* Advance timeline from 0 -> 1 */ +sw_sync_timeline_inc (socket_timeline,1 ); + +_Exit (0 ); +break ; + } +case -1 : + { +/* Failed fork */ + skip =1 ; +break ; + } +default : + { +/* Parent process */ +int socket = sv[0 ]; +struct cmsghdr *cmsg; +struct iovec io = { .iov_base = (char *)"ABC" , .iov_len =3 }; +struct msghdr msg = {0 }; +char buf[CMSG_SPACE (sizeof (timeline))]; +memset (buf,'\0' ,sizeof (buf)); +close (sv[1 ]); + + msg.msg_iov = &io; + msg.msg_iovlen =1 ; + msg.msg_control = buf; + msg.msg_controllen =sizeof (buf); + + cmsg =CMSG_FIRSTHDR (&msg); + cmsg->cmsg_level =SOL_SOCKET ; + cmsg->cmsg_type =SCM_RIGHTS ; + cmsg->cmsg_len =CMSG_LEN (sizeof (timeline)); + + *((int *)CMSG_DATA (cmsg)) = timeline; + msg.msg_controllen = cmsg->cmsg_len; + + ret =sync_wait (fence,0 ); +igt_assert_f (ret ==-1 && errno ==ETIME ,"Fence signaled (it should not have been signalled yet)\n" ); + +if (sendmsg (socket, &msg,0 ) <0 ) { + skip =1 ; + goto out; + } + + ret =sync_wait (fence,2 *1000 ); +igt_assert_f (ret ==0 ,"Fence not signaled (timeline value 1 fence seqno 1)\n" ); +break ; + } + } + +out: +close (fence); +close (timeline); +igt_require (!skip); +} +static void test_sync_busy_fork (void ) {int fence, ret;
@@ -823,6 +923,9 @@ igt_main igt_subtest("sync_busy_fork")test_sync_busy_fork (); + igt_subtest("sync_busy_fork_unixsocket") +test_sync_busy_fork_unixsocket (); + igt_subtest("sync_merge_invalid")test_sync_merge_invalid ();
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v10 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support
In reply to Robert FossQuoted 22 lines · Robert Foss
Add
igt_require_sw_syncto provide tests to skip ifsw_syncsupport isn't available on the host machine.Signed-off-by Robert Foss <[email protected]>Reviewed-by Tomeu Vizoso <[email protected]>--- lib/sw_sync.c | 22 ++++++++++++++++++++++ lib/sw_sync.h | 1 + 2 files changed, 23 insertions(+)lib/sw_sync.c +4
-0@@ -194,3 +194,25 @@ int sync_fence_count_status(int fd, int status)igt_assert_f (count >=0 ,"No fences with supplied status found" );return count; } + +static bool kernel_has_sw_sync (void ) +{ +bool err;
lib/sw_sync.c int sync_fence_count_status(int fd, int status) · line 210
Quoted 10 lines
lib/sw_sync.c +10
-0+ +igt_ignore_warn (system ("/sbin/modprobe -s r sw_sync" )); + + err = false; +if (access (DEVFS_SW_SYNC ,R_OK |W_OK ) <0 ) { +char buf[128 ]; + +snprintf (buf,sizeof (buf),"%s/sw_sync" ,igt_debugfs_mount ()); + err =access (DEBUGFS_SW_SYNC ,R_OK |W_OK ) <0 ; + }
Did you mean access(buf, R_OK | W_OK) here?
--
Petri Latvala
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v10 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support
Quoted 28 lines · Petri Latvala
Quoted 27 lines · Robert Foss
Add
igt_require_sw_syncto provide tests to skip ifsw_syncsupport isn't available on the host machine.Signed-off-by Robert Foss <[email protected]>Reviewed-by Tomeu Vizoso <[email protected]>--- lib/sw_sync.c | 22 ++++++++++++++++++++++ lib/sw_sync.h | 1 + 2 files changed, 23 insertions(+)lib/sw_sync.c +9
-0@@ -194,3 +194,25 @@ int sync_fence_count_status(int fd, int status)igt_assert_f (count >=0 ,"No fences with supplied status found" );return count; } + +static bool kernel_has_sw_sync (void ) +{ +bool err; + +igt_ignore_warn (system ("/sbin/modprobe -s r sw_sync" )); + + err = false; +if (access (DEVFS_SW_SYNC ,R_OK |W_OK ) <0 ) {
Quoted 8 lines
lib/sw_sync.c int sync_fence_count_status(int fd, int status) · line 210
Quoted 5 lines
lib/sw_sync.c +5
-0+char buf[128 ]; + +snprintf (buf,sizeof (buf),"%s/sw_sync" ,igt_debugfs_mount ()); + err =access (DEBUGFS_SW_SYNC ,R_OK |W_OK ) <0 ; + }Did you mean
access(buf, R_OK | W_OK)here?
Yes, fixing this in v11.
Thanks!
Quoted 5 lines
--
Petri Latvala
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx