tests/amdgpu: add deadlock test for sdma
PATCH v2 1/1 tests/amdgpu: add deadlock test for sdma
deadlock test for sdma will cause gpu recoverty.
disable the test for now until GPU reset recovery could survive at least 1000 times test.
v2: add modprobe parameter
--- tests/amdgpu/amdgpu_test.c | 4 ++ tests/amdgpu/deadlock_tests.c | 103 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-)
tests/amdgpu/amdgpu_test.c +4 -0
@@ -426,6 +426,10 @@ static void amdgpu_disable_suites() "compute ring block test (set amdgpu.lockup_timeout=50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"sdma ring block test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());
tests/amdgpu/deadlock_tests.c +102 -1
133 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1551854219-4458-1-git-send-email-flora.cui-5C7GfCeVMHo@public.gmane.org
Quoted 199 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Cui, Flora
Sent: Wednesday, March 06, 2019 2:37 PM
To: [email protected]; [email protected]
Cc: Cui, Flora <[email protected]>
Subject: [PATCH v2] tests/amdgpu: add deadlock test for sdmadeadlock test for sdma will cause gpu recoverty.
disable the test for now until GPU reset recovery could survive at least 1000 times test.v2: add modprobe parameter
Change-Id I9adac63c62db22107345eddb30e7d81a1bda838cSigned-off-by Flora Cui <[email protected]>--- tests/amdgpu/amdgpu_test.c | 4 ++ tests/amdgpu/deadlock_tests.c | 103 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-)tests/amdgpu/amdgpu_test.c +5
-0@@ -426,6 +426,10 @@ static void amdgpu_disable_suites() "compute ring block test (set amdgpu.lockup_timeout=50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , + "sdma ring block test (set amdgpu.lockup_timeout=50)", CU_FALSE)) + fprintf(stderr,"test deactivation failed - %s\n" , +CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE )) fprintf(stderr, "test deactivation failed - %s\n",
CU_get_error_msg());(quoted diff) +0
-0
b/tests/amdgpu/deadlock_tests.cindex a6c2635..91368c1 100644tests/amdgpu/deadlock_tests.c +0
-0@@ -96,6 +96,9 @@#define mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR
0x54ftests/amdgpu/deadlock_tests.c +3
-0+#define SDMA_PKT_HEADER_OP (x) (x & 0xff) +#define SDMA_OP_POLL_REGMEM 8 + static amdgpu_device_handle device_handle; static uint32_t
major_version; staticuint32_tminor_version; @@ -110,6 +113,7 @@ static voidamdgpu_deadlock_gfx(void); static voidamdgpu_deadlock_compute(void); static voidamdgpu_illegal_reg_access(); static voidamdgpu_illegal_mem_access();
+static voidamdgpu_deadlock_sdma(void);
CU_BOOLsuite_deadlock_tests_enable(void){ @@ -171,6 +175,7 @@ intsuite_deadlock_tests_clean(void)CU_TestInfodeadlock_tests[] = {
{ "gfx ring block test (set amdgpu.lockup_timeout=50)",amdgpu_deadlock_gfx},
{ "compute ring block test (set amdgpu.lockup_timeout=50)",amdgpu_deadlock_compute},tests/amdgpu/deadlock_tests.c +2
-0+ {"sdma ring block test (set amdgpu.lockup_timeout=50)" , +amdgpu_deadlock_sdma }, { "illegal reg access test", amdgpu_illegal_reg_access }, { "illegal mem access test (set amdgpu.vm_fault_stop=2)",
amdgpu_illegal_mem_access},tests/amdgpu/deadlock_tests.c +0
-1CU_TEST_INFO_NULL,@@ -260,7 +265,6 @@ static void amdgpu_deadlock_helper(unsigned ip_type) ibs_request.ibs = &ib_info; ibs_request.resources = bo_list; ibs_request.fence_info.handle =NULL ; -for (i =0 ; i <200 ; i++) { r =amdgpu_cs_submit (context_handle,0 ,&ibs_request,1 );
CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1); @@ -
291,6 +295,103 @@ static voidamdgpu_deadlock_helper(unsigned ip_type)tests/amdgpu/deadlock_tests.c +17
-0CU_ASSERT_EQUAL (r,0 ); } +static void amdgpu_deadlock_sdma (void ) +{ +amdgpu_context_handle context_handle; +amdgpu_bo_handle ib_result_handle; +void *ib_result_cpu; +uint64_t ib_result_mc_address; +struct amdgpu_cs_request ibs_request; +struct amdgpu_cs_ib_info ib_info; +struct amdgpu_cs_fence fence_status; +uint32_t expired; +int i, r; +amdgpu_bo_list_handle bo_list; +amdgpu_va_handle va_handle; +struct drm_amdgpu_info_hw_ip info; +uint32_t ring_id; + + r = amdgpu_query_hw_ip_info(device_handle,
AMDGPU_HW_IP_DMA, 0, &info);tests/amdgpu/deadlock_tests.c +7
-0+CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_cs_ctx_create (device_handle, &context_handle); +CU_ASSERT_EQUAL (r,0 ); + +for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { + r = pthread_create(&stress_thread, NULL,
write_mem_address, NULL);tests/amdgpu/deadlock_tests.c +3
-0+CU_ASSERT_EQUAL (r,0 ); + + r = amdgpu_bo_alloc_and_map_raw(device_handle, 4096,4096,
tests/amdgpu/deadlock_tests.c +1
-0+ AMDGPU_GEM_DOMAIN_GTT, 0,
use_uc_mtype?AMDGPU_VM_MTYPE_UC: 0,tests/amdgpu/deadlock_tests.c +1
-0+ &ib_result_handle,
&ib_result_cpu,
+&ib_result_mc_address,&va_handle);tests/amdgpu/deadlock_tests.c +3
-0+CU_ASSERT_EQUAL (r,0 ); + + r = amdgpu_get_bo_list(device_handle, ib_result_handle,NULL,
tests/amdgpu/deadlock_tests.c +7
-0+ &bo_list); +CU_ASSERT_EQUAL (r,0 ); + + ptr = ib_result_cpu; + i =0 ; + + ptr[i++] =
SDMA_PKT_HEADER_OP(SDMA_OP_POLL_REGMEM)|tests/amdgpu/deadlock_tests.c +20
-0+ (0 <<26 ) |/* WAIT_REG_MEM */ + (4 <<28 ) |/* != */ + (1 <<31 );/* memory */ + ptr[i++] = (ib_result_mc_address +256 *4 ) &0xfffffffc ; + ptr[i++] = ((ib_result_mc_address +256 *4 ) >>32 ) &0xffffffff ; + ptr[i++] =0x00000000 ;/* reference value */ + ptr[i++] =0xffffffff ;/* and mask */ + ptr[i++] =4 |/* poll interval */ + (0xfff <<16 );/* retry count */ + +for (; i <16 ; i++) + ptr[i] =0 ; + + ptr[256 ] =0x0 ;/* the memory we wait on to change */ + +memset (&ib_info,0 ,sizeof (struct amdgpu_cs_ib_info )); + ib_info.ib_mc_address = ib_result_mc_address; + ib_info.size =16 ; + + memset(&ibs_request, 0, sizeof(struct
amdgpu_cs_request));tests/amdgpu/deadlock_tests.c +9
-0+ ibs_request.ip_type =AMDGPU_HW_IP_DMA ; + ibs_request.ring = ring_id; + ibs_request.number_of_ibs =1 ; + ibs_request.ibs = &ib_info; + ibs_request.resources = bo_list; + ibs_request.fence_info.handle =NULL ; + +for (i =0 ; i <200 ; i++) { + r = amdgpu_cs_submit(context_handle,0,&ibs_request, 1);
tests/amdgpu/deadlock_tests.c +21
-0+CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 ); + + } + +memset (&fence_status,0 ,sizeof (struct amdgpu_cs_fence )); + fence_status.context = context_handle; + fence_status.ip_type =AMDGPU_HW_IP_DMA ; + fence_status.ip_instance =0 ; + fence_status.ring = ring_id; + fence_status.fence = ibs_request.seq_no; + + r =amdgpu_cs_query_fence_status (&fence_status, +AMDGPU_TIMEOUT_INFINITE ,0 , &expired); +CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 ); + +pthread_join (stress_thread,NULL ); + + r =amdgpu_bo_list_destroy (bo_list); +CU_ASSERT_EQUAL (r,0 ); + + r = amdgpu_bo_unmap_and_free(ib_result_handle,
va_handle,tests/amdgpu/deadlock_tests.c +7
-1+ ib_result_mc_address, 4096); +CU_ASSERT_EQUAL (r,0 ); + } + r =amdgpu_cs_ctx_free (context_handle); +CU_ASSERT_EQUAL (r,0 ); +} +static void bad_access_helper (int reg_access) {amdgpu_context_handle context_handle; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 06.03.19 um 07:37 schrieb Cui, Flora:
Quoted 8 lines
deadlock test for sdma will cause gpu recoverty.
disable the test for now until GPU reset recovery could survive at least 1000 times test.v2: add modprobe parameter
Change-Id I9adac63c62db22107345eddb30e7d81a1bda838cSigned-off-by Flora Cui <[email protected]>
Quoted 152 lines
--- tests/amdgpu/amdgpu_test.c | 4 ++ tests/amdgpu/deadlock_tests.c | 103 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-)tests/amdgpu/amdgpu_test.c +4
-0@@ -426,6 +426,10 @@ static void amdgpu_disable_suites() "compute ring block test (set amdgpu.lockup_timeout=50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"sdma ring block test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());tests/amdgpu/deadlock_tests.c +95
-1@@ -96,6 +96,9 @@#define mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR 0x54f +#define SDMA_PKT_HEADER_OP (x) (x & 0xff) +#define SDMA_OP_POLL_REGMEM 8 +static amdgpu_device_handle device_handle;static uint32_t major_version;static uint32_t minor_version;@@ -110,6 +113,7 @@ static void amdgpu_deadlock_gfx(void);static void amdgpu_deadlock_compute (void );static void amdgpu_illegal_reg_access ();static void amdgpu_illegal_mem_access (); +static void amdgpu_deadlock_sdma (void );CU_BOOL suite_deadlock_tests_enable (void ) {@@ -171,6 +175,7 @@ int suite_deadlock_tests_clean(void)CU_TestInfo deadlock_tests[] = { {"gfx ring block test (set amdgpu.lockup_timeout=50)" , amdgpu_deadlock_gfx }, {"compute ring block test (set amdgpu.lockup_timeout=50)" , amdgpu_deadlock_compute }, + {"sdma ring block test (set amdgpu.lockup_timeout=50)" , amdgpu_deadlock_sdma }, {"illegal reg access test" , amdgpu_illegal_reg_access }, {"illegal mem access test (set amdgpu.vm_fault_stop=2)" , amdgpu_illegal_mem_access },CU_TEST_INFO_NULL ,@@ -260,7 +265,6 @@ static void amdgpu_deadlock_helper(unsigned ip_type) ibs_request.ibs = &ib_info; ibs_request.resources = bo_list; ibs_request.fence_info.handle =NULL ; -for (i =0 ; i <200 ; i++) { r =amdgpu_cs_submit (context_handle,0 ,&ibs_request,1 );CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 );@@ -291,6 +295,103 @@ static void amdgpu_deadlock_helper(unsigned ip_type)CU_ASSERT_EQUAL (r,0 ); } +static void amdgpu_deadlock_sdma (void ) +{ +amdgpu_context_handle context_handle; +amdgpu_bo_handle ib_result_handle; +void *ib_result_cpu; +uint64_t ib_result_mc_address; +struct amdgpu_cs_request ibs_request; +struct amdgpu_cs_ib_info ib_info; +struct amdgpu_cs_fence fence_status; +uint32_t expired; +int i, r; +amdgpu_bo_list_handle bo_list; +amdgpu_va_handle va_handle; +struct drm_amdgpu_info_hw_ip info; +uint32_t ring_id; + + r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_DMA ,0 , &info); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_cs_ctx_create (device_handle, &context_handle); +CU_ASSERT_EQUAL (r,0 ); + +for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { + r =pthread_create (&stress_thread,NULL , write_mem_address,NULL ); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_bo_alloc_and_map_raw (device_handle,4096 ,4096 , +AMDGPU_GEM_DOMAIN_GTT ,0 , use_uc_mtype ?AMDGPU_VM_MTYPE_UC :0 , + &ib_result_handle, &ib_result_cpu, + &ib_result_mc_address, &va_handle); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_get_bo_list (device_handle, ib_result_handle,NULL , + &bo_list); +CU_ASSERT_EQUAL (r,0 ); + + ptr = ib_result_cpu; + i =0 ; + + ptr[i++] =SDMA_PKT_HEADER_OP (SDMA_OP_POLL_REGMEM ) | + (0 <<26 ) |/* WAIT_REG_MEM */ + (4 <<28 ) |/* != */ + (1 <<31 );/* memory */ + ptr[i++] = (ib_result_mc_address +256 *4 ) &0xfffffffc ; + ptr[i++] = ((ib_result_mc_address +256 *4 ) >>32 ) &0xffffffff ; + ptr[i++] =0x00000000 ;/* reference value */ + ptr[i++] =0xffffffff ;/* and mask */ + ptr[i++] =4 |/* poll interval */ + (0xfff <<16 );/* retry count */ + +for (; i <16 ; i++) + ptr[i] =0 ; + + ptr[256 ] =0x0 ;/* the memory we wait on to change */ + +memset (&ib_info,0 ,sizeof (struct amdgpu_cs_ib_info )); + ib_info.ib_mc_address = ib_result_mc_address; + ib_info.size =16 ; + +memset (&ibs_request,0 ,sizeof (struct amdgpu_cs_request )); + ibs_request.ip_type =AMDGPU_HW_IP_DMA ; + ibs_request.ring = ring_id; + ibs_request.number_of_ibs =1 ; + ibs_request.ibs = &ib_info; + ibs_request.resources = bo_list; + ibs_request.fence_info.handle =NULL ; + +for (i =0 ; i <200 ; i++) { + r =amdgpu_cs_submit (context_handle,0 ,&ibs_request,1 ); +CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 ); + + } + +memset (&fence_status,0 ,sizeof (struct amdgpu_cs_fence )); + fence_status.context = context_handle; + fence_status.ip_type =AMDGPU_HW_IP_DMA ; + fence_status.ip_instance =0 ; + fence_status.ring = ring_id; + fence_status.fence = ibs_request.seq_no; + + r =amdgpu_cs_query_fence_status (&fence_status, +AMDGPU_TIMEOUT_INFINITE ,0 , &expired); +CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 ); + +pthread_join (stress_thread,NULL ); + + r =amdgpu_bo_list_destroy (bo_list); +CU_ASSERT_EQUAL (r,0 ); + + r = amdgpu_bo_unmap_and_free(ib_result_handle, va_handle,
tests/amdgpu/deadlock_tests.c static void amdgpu_deadlock_helper(unsigned ip_type) · line 397
Quoted 10 lines
tests/amdgpu/deadlock_tests.c +7
-0+ ib_result_mc_address, 4096); +CU_ASSERT_EQUAL (r,0 ); + } + r =amdgpu_cs_ctx_free (context_handle); +CU_ASSERT_EQUAL (r,0 ); +} +static void bad_access_helper (int reg_access) {amdgpu_context_handle context_handle;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Hi Alex,
could you help to submit this patch upstream?
Quoted 176 lines · Christian König
Am 06.03.19 um 07:37 schrieb Cui, Flora:
Quoted 8 lines
deadlock test for sdma will cause gpu recoverty.
disable the test for now until GPU reset recovery could survive at least 1000 times test.v2: add modprobe parameter
Change-Id I9adac63c62db22107345eddb30e7d81a1bda838cSigned-off-by Flora Cui <[email protected]>Acked-by Christian König <[email protected]>Quoted 164 lines
---
tests/amdgpu/amdgpu_test.c | 4 ++
tests/amdgpu/deadlock_tests.c| 103
+++++++++++++++++++++++++++++++++++++++++-2 files changed, 106 insertions(+), 1 deletion(-)tests/amdgpu/amdgpu_test.c +0
-0@@ -426,6 +426,10 @@ static void amdgpu_disable_suites()"compute ring block test (set amdgpu.lockup_timeout=50)",
CU_FALSE))
fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg());
+ if (amdgpu_set_test_active(DEADLOCK_TESTS_STR,
+ "sdma ring block test (set amdgpu.lockup_timeout=50)",CU_FALSE))
+fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg());
+
if (amdgpu_set_test_active(BO_TESTS_STR, "Metadata", CU_FALSE))fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg());
diff --gita/tests/amdgpu/deadlock_tests.cb/tests/amdgpu/deadlock_tests.c
index a6c2635..91368c1 100644tests/amdgpu/deadlock_tests.c +4
-0@@ -96,6 +96,9 @@ #define mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR 0x54f +#define SDMA_PKT_HEADER_OP(x) (x & 0xff) +#define SDMA_OP_POLL_REGMEM 8 + static amdgpu_device_handle device_handle; static uint32_t major_version; static uint32_t minor_version;@@ -110,6 +113,7 @@ static void amdgpu_deadlock_gfx(void); static void amdgpu_deadlock_compute(void); static void amdgpu_illegal_reg_access(); static void amdgpu_illegal_mem_access(); +static void amdgpu_deadlock_sdma (void ); CU_BOOL suite_deadlock_tests_enable(void) {@@ -171,6 +175,7 @@ int suite_deadlock_tests_clean(void) CU_TestInfo deadlock_tests[] = { { "gfx ring block test (set amdgpu.lockup_timeout=50)", amdgpu_deadlock_gfx }, { "compute ring block test (set amdgpu.lockup_timeout=50)", amdgpu_deadlock_compute }, + { "sdma ring block test (set amdgpu.lockup_timeout=50)", amdgpu_deadlock_sdma },{ "illegal reg access test",
amdgpu_illegal_reg_access}, { "illegal mem access test (set amdgpu.vm_fault_stop=2)",amdgpu_illegal_mem_access},
CU_TEST_INFO_NULL,tests/amdgpu/deadlock_tests.c +23
-1@@ -260,7 +265,6 @@ static void amdgpu_deadlock_helper(unsigned ip_type) ibs_request.ibs = &ib_info; ibs_request.resources = bo_list; ibs_request.fence_info.handle = NULL; - for (i = 0; i < 200; i++) { r = amdgpu_cs_submit(context_handle, 0,&ibs_request, 1); CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1);@@ -291,6 +295,103 @@ static void amdgpu_deadlock_helper(unsigned ip_type) CU_ASSERT_EQUAL(r, 0); } +static void amdgpu_deadlock_sdma(void) +{ + amdgpu_context_handle context_handle; + amdgpu_bo_handle ib_result_handle; + void *ib_result_cpu; + uint64_t ib_result_mc_address; + struct amdgpu_cs_request ibs_request; + struct amdgpu_cs_ib_info ib_info; + struct amdgpu_cs_fence fence_status; + uint32_t expired; + int i, r; + amdgpu_bo_list_handle bo_list; + amdgpu_va_handle va_handle; + struct drm_amdgpu_info_hw_ip info; + uint32_t ring_id; + + r = amdgpu_query_hw_ip_info(device_handle, AMDGPU_HW_IP_DMA, 0, &info); + CU_ASSERT_EQUAL(r, 0); + + r = amdgpu_cs_ctx_create(device_handle, &context_handle); + CU_ASSERT_EQUAL(r, 0); + + for (ring_id = 0; (1 << ring_id) & info.available_rings; ring_id++) { + r = pthread_create(&stress_thread, NULL, write_mem_address,NULL);
+CU_ASSERT_EQUAL(r, 0);
+
+ r = amdgpu_bo_alloc_and_map_raw(device_handle, 4096, 4096, +AMDGPU_GEM_DOMAIN_GTT, 0,use_uc_mtype?AMDGPU_VM_MTYPE_UC: 0,
+&ib_result_handle,&ib_result_cpu, +&ib_result_mc_address,&va_handle); +CU_ASSERT_EQUAL(r, 0);tests/amdgpu/deadlock_tests.c +61
-0+ + r = amdgpu_get_bo_list(device_handle, ib_result_handle, NULL, + &bo_list); + CU_ASSERT_EQUAL(r, 0); + + ptr = ib_result_cpu; + i = 0; + + ptr[i++] = SDMA_PKT_HEADER_OP(SDMA_OP_POLL_REGMEM) | + (0 << 26) | /* WAIT_REG_MEM */ + (4 << 28) | /* != */ + (1 << 31); /* memory */ + ptr[i++] = (ib_result_mc_address + 256*4) & 0xfffffffc; + ptr[i++] = ((ib_result_mc_address + 256*4) >> 32) & 0xffffffff; + ptr[i++] = 0x00000000; /* reference value */ + ptr[i++] = 0xffffffff; /* and mask */ + ptr[i++] = 4 | /* poll interval */ + (0xfff << 16); /* retry count */ + + for (; i < 16; i++) + ptr[i] = 0; + + ptr[256] = 0x0; /* the memory we wait on to change */ + + memset(&ib_info, 0, sizeof(struct amdgpu_cs_ib_info)); + ib_info.ib_mc_address = ib_result_mc_address; + ib_info.size = 16; + + memset(&ibs_request, 0, sizeof(struct amdgpu_cs_request)); + ibs_request.ip_type = AMDGPU_HW_IP_DMA; + ibs_request.ring = ring_id; + ibs_request.number_of_ibs = 1; + ibs_request.ibs = &ib_info; + ibs_request.resources = bo_list; + ibs_request.fence_info.handle = NULL; + + for (i = 0; i < 200; i++) { + r = amdgpu_cs_submit(context_handle, 0,&ibs_request, 1); + CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1); + + } + + memset(&fence_status, 0, sizeof(struct amdgpu_cs_fence)); + fence_status.context = context_handle; + fence_status.ip_type = AMDGPU_HW_IP_DMA; + fence_status.ip_instance = 0; + fence_status.ring = ring_id; + fence_status.fence = ibs_request.seq_no; + + r = amdgpu_cs_query_fence_status(&fence_status, + AMDGPU_TIMEOUT_INFINITE,0, &expired); + CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1); + + pthread_join(stress_thread, NULL); + + r = amdgpu_bo_list_destroy(bo_list); + CU_ASSERT_EQUAL(r, 0); + + r = amdgpu_bo_unmap_and_free(ib_result_handle, va_handle, + ib_result_mc_address, 4096); + CU_ASSERT_EQUAL(r, 0);
Quoted 9 lines
Quoted 8 lines
+ }
+ r =amdgpu_cs_ctx_free(context_handle);
+CU_ASSERT_EQUAL(r, 0);tests/amdgpu/deadlock_tests.c +2
-0+} +static void
bad_access_helper(int reg_access)
{
amdgpu_context_handlecontext_handle;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 3 lines · Flora
deadlock test for sdma will cause gpu recoverty.
disable the test for now until GPU reset recovery could survive at least 1000 times test.
Can you specify what issues you see and on what ASIC ?
Andrey
Quoted 157 lines
v2: add modprobe parameter
Change-Id I9adac63c62db22107345eddb30e7d81a1bda838cSigned-off-by Flora Cui <[email protected]>--- tests/amdgpu/amdgpu_test.c | 4 ++ tests/amdgpu/deadlock_tests.c | 103 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-)tests/amdgpu/amdgpu_test.c +4
-0@@ -426,6 +426,10 @@ static void amdgpu_disable_suites() "compute ring block test (set amdgpu.lockup_timeout=50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"sdma ring block test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());tests/amdgpu/deadlock_tests.c +95
-1@@ -96,6 +96,9 @@#define mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR 0x54f +#define SDMA_PKT_HEADER_OP (x) (x & 0xff) +#define SDMA_OP_POLL_REGMEM 8 +static amdgpu_device_handle device_handle;static uint32_t major_version;static uint32_t minor_version;@@ -110,6 +113,7 @@ static void amdgpu_deadlock_gfx(void);static void amdgpu_deadlock_compute (void );static void amdgpu_illegal_reg_access ();static void amdgpu_illegal_mem_access (); +static void amdgpu_deadlock_sdma (void );CU_BOOL suite_deadlock_tests_enable (void ) {@@ -171,6 +175,7 @@ int suite_deadlock_tests_clean(void)CU_TestInfo deadlock_tests[] = { {"gfx ring block test (set amdgpu.lockup_timeout=50)" , amdgpu_deadlock_gfx }, {"compute ring block test (set amdgpu.lockup_timeout=50)" , amdgpu_deadlock_compute }, + {"sdma ring block test (set amdgpu.lockup_timeout=50)" , amdgpu_deadlock_sdma }, {"illegal reg access test" , amdgpu_illegal_reg_access }, {"illegal mem access test (set amdgpu.vm_fault_stop=2)" , amdgpu_illegal_mem_access },CU_TEST_INFO_NULL ,@@ -260,7 +265,6 @@ static void amdgpu_deadlock_helper(unsigned ip_type) ibs_request.ibs = &ib_info; ibs_request.resources = bo_list; ibs_request.fence_info.handle =NULL ; -for (i =0 ; i <200 ; i++) { r =amdgpu_cs_submit (context_handle,0 ,&ibs_request,1 );CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 );@@ -291,6 +295,103 @@ static void amdgpu_deadlock_helper(unsigned ip_type)CU_ASSERT_EQUAL (r,0 ); } +static void amdgpu_deadlock_sdma (void ) +{ +amdgpu_context_handle context_handle; +amdgpu_bo_handle ib_result_handle; +void *ib_result_cpu; +uint64_t ib_result_mc_address; +struct amdgpu_cs_request ibs_request; +struct amdgpu_cs_ib_info ib_info; +struct amdgpu_cs_fence fence_status; +uint32_t expired; +int i, r; +amdgpu_bo_list_handle bo_list; +amdgpu_va_handle va_handle; +struct drm_amdgpu_info_hw_ip info; +uint32_t ring_id; + + r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_DMA ,0 , &info); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_cs_ctx_create (device_handle, &context_handle); +CU_ASSERT_EQUAL (r,0 ); + +for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { + r =pthread_create (&stress_thread,NULL , write_mem_address,NULL ); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_bo_alloc_and_map_raw (device_handle,4096 ,4096 , +AMDGPU_GEM_DOMAIN_GTT ,0 , use_uc_mtype ?AMDGPU_VM_MTYPE_UC :0 , + &ib_result_handle, &ib_result_cpu, + &ib_result_mc_address, &va_handle); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_get_bo_list (device_handle, ib_result_handle,NULL , + &bo_list); +CU_ASSERT_EQUAL (r,0 ); + + ptr = ib_result_cpu; + i =0 ; + + ptr[i++] =SDMA_PKT_HEADER_OP (SDMA_OP_POLL_REGMEM ) | + (0 <<26 ) |/* WAIT_REG_MEM */ + (4 <<28 ) |/* != */ + (1 <<31 );/* memory */ + ptr[i++] = (ib_result_mc_address +256 *4 ) &0xfffffffc ; + ptr[i++] = ((ib_result_mc_address +256 *4 ) >>32 ) &0xffffffff ; + ptr[i++] =0x00000000 ;/* reference value */ + ptr[i++] =0xffffffff ;/* and mask */ + ptr[i++] =4 |/* poll interval */ + (0xfff <<16 );/* retry count */ + +for (; i <16 ; i++) + ptr[i] =0 ; + + ptr[256 ] =0x0 ;/* the memory we wait on to change */ + +memset (&ib_info,0 ,sizeof (struct amdgpu_cs_ib_info )); + ib_info.ib_mc_address = ib_result_mc_address; + ib_info.size =16 ; + +memset (&ibs_request,0 ,sizeof (struct amdgpu_cs_request )); + ibs_request.ip_type =AMDGPU_HW_IP_DMA ; + ibs_request.ring = ring_id; + ibs_request.number_of_ibs =1 ; + ibs_request.ibs = &ib_info; + ibs_request.resources = bo_list; + ibs_request.fence_info.handle =NULL ; + +for (i =0 ; i <200 ; i++) { + r =amdgpu_cs_submit (context_handle,0 ,&ibs_request,1 ); +CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 ); + + } + +memset (&fence_status,0 ,sizeof (struct amdgpu_cs_fence )); + fence_status.context = context_handle; + fence_status.ip_type =AMDGPU_HW_IP_DMA ; + fence_status.ip_instance =0 ; + fence_status.ring = ring_id; + fence_status.fence = ibs_request.seq_no; + + r =amdgpu_cs_query_fence_status (&fence_status, +AMDGPU_TIMEOUT_INFINITE ,0 , &expired); +CU_ASSERT_EQUAL ((r ==0 || r == -ECANCELED ),1 ); + +pthread_join (stress_thread,NULL ); + + r =amdgpu_bo_list_destroy (bo_list); +CU_ASSERT_EQUAL (r,0 ); + + r = amdgpu_bo_unmap_and_free(ib_result_handle, va_handle,
tests/amdgpu/deadlock_tests.c static void amdgpu_deadlock_helper(unsigned ip_type) · line 397
Quoted 10 lines
tests/amdgpu/deadlock_tests.c +7
-0+ ib_result_mc_address, 4096); +CU_ASSERT_EQUAL (r,0 ); + } + r =amdgpu_cs_ctx_free (context_handle); +CU_ASSERT_EQUAL (r,0 ); +} +static void bad_access_helper (int reg_access) {amdgpu_context_handle context_handle;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel