[1/1] selftests: sync: add config fragment for testing sync framework

Message ID 20170505050550.30102-1-fathi.boudra@linaro.org
State New
Headers show
Series
  • [1/1] selftests: sync: add config fragment for testing sync framework
Related show

Commit Message

Fathi Boudra May 5, 2017, 5:05 a.m.
Unless the software synchronization objects (CONFIG_SW_SYNC) is enabled,
the sync test will fail:

Additional Information:
Running tests in sync
-- 
2.11.0

Comments

Michael Ellerman May 11, 2017, 4:52 a.m. | #1
Fathi Boudra <fathi.boudra@linaro.org> writes:

> Unless the software synchronization objects (CONFIG_SW_SYNC) is enabled,

> the sync test will fail:

>

> Additional Information:

> Running tests in sync

> ========================================

> [RUN]   Testing sync framework

> [RUN]   Executing test_alloc_timeline

> [ERROR] Failure allocating timeline


It would be better if the test just detected that the kernel didn't
support the API.

It seems to rely on /sys/kernel/debug/sync/sw_sync existing.

How about this?



cheersdiff --git a/tools/testing/selftests/sync/sync_test.c b/tools/testing/selftests/sync/sync_test.c
index 9ea08d9f0b13..62fa666e501a 100644
--- a/tools/testing/selftests/sync/sync_test.c
+++ b/tools/testing/selftests/sync/sync_test.c
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 
 #include "synctest.h"
@@ -52,10 +53,22 @@ static int run_test(int (*test)(void), char *name)
 	exit(test());
 }
 
+static int sync_api_supported(void)
+{
+	struct stat sbuf;
+
+	return 0 == stat("/sys/kernel/debug/sync/sw_sync", &sbuf);
+}
+
 int main(void)
 {
 	int err = 0;
 
+	if (!sync_api_supported()) {
+		printf("SKIP: Sync framework not supported by kernel\n");
+		return 0;
+	}
+
 	printf("[RUN]\tTesting sync framework\n");
 
 	err += RUN_TEST(test_alloc_timeline);

Fathi Boudra May 11, 2017, 6:29 a.m. | #2
On 11 May 2017 at 07:52, Michael Ellerman <mpe@ellerman.id.au> wrote:
> Fathi Boudra <fathi.boudra@linaro.org> writes:

>

>> Unless the software synchronization objects (CONFIG_SW_SYNC) is enabled,

>> the sync test will fail:

>>

>> Additional Information:

>> Running tests in sync

>> ========================================

>> [RUN]   Testing sync framework

>> [RUN]   Executing test_alloc_timeline

>> [ERROR] Failure allocating timeline

>

> It would be better if the test just detected that the kernel didn't

> support the API.


It makes sense to me. The sync framework has been introduced from 4.8 kernel.
It resolves the case where we run an older kernel like 4.4 LTS with a
recent kselftest.

> It seems to rely on /sys/kernel/debug/sync/sw_sync existing.

>

> How about this?


fwiw, looks good to me. I think we still need the config fragment to
leverage kselftest-merge.

> diff --git a/tools/testing/selftests/sync/sync_test.c b/tools/testing/selftests/sync/sync_test.c

> index 9ea08d9f0b13..62fa666e501a 100644

> --- a/tools/testing/selftests/sync/sync_test.c

> +++ b/tools/testing/selftests/sync/sync_test.c

> @@ -29,6 +29,7 @@

>  #include <unistd.h>

>  #include <stdlib.h>

>  #include <sys/types.h>

> +#include <sys/stat.h>

>  #include <sys/wait.h>

>

>  #include "synctest.h"

> @@ -52,10 +53,22 @@ static int run_test(int (*test)(void), char *name)

>         exit(test());

>  }

>

> +static int sync_api_supported(void)

> +{

> +       struct stat sbuf;

> +

> +       return 0 == stat("/sys/kernel/debug/sync/sw_sync", &sbuf);

> +}

> +

>  int main(void)

>  {

>         int err = 0;

>

> +       if (!sync_api_supported()) {

> +               printf("SKIP: Sync framework not supported by kernel\n");

> +               return 0;

> +       }

> +

>         printf("[RUN]\tTesting sync framework\n");

>

>         err += RUN_TEST(test_alloc_timeline);

>

>

> cheers

> --

> To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

========================================
[RUN]   Testing sync framework
[RUN]   Executing test_alloc_timeline
[ERROR] Failure allocating timeline
[RUN]   Executing test_alloc_fence
[ERROR] Failure allocating timeline
[RUN]   Executing test_alloc_fence_negative
[ERROR] Failure allocating timeline
[RUN]   Executing test_fence_one_timeline_wait
[ERROR] Failure allocating timeline
[RUN]   Executing test_fence_one_timeline_merge
[ERROR] Failure allocating fences
[RUN]   Executing test_fence_merge_same_fence
[ERROR] Failure allocating timeline
[RUN]   Executing test_fence_multi_timeline_wait
[ERROR] Failure merging fence from various timelines
[RUN]   Executing test_stress_two_threads_shared_timeline
[ERROR] Failure allocating timeline
[RUN]   Executing test_consumer_stress_multi_producer_single_consumer
[ERROR] Failure merging fences
[ERROR] Failure creating fence
[ERROR] Failure creating fence
[ERROR] Failure creating fence
[ERROR] Failure creating fence
[ERROR] Failure creating fence
[RUN]   Executing test_merge_stress_random_merge
[ERROR] Failure creating fence
[FAIL]  sync errors: 10
selftests: sync_test [FAIL]

Add a config fragment with the relevant configuration required in order to
run the sync test.

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 tools/testing/selftests/sync/config | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 tools/testing/selftests/sync/config

diff --git a/tools/testing/selftests/sync/config b/tools/testing/selftests/sync/config
new file mode 100644
index 000000000000..1ab7e8130db2
--- /dev/null
+++ b/tools/testing/selftests/sync/config
@@ -0,0 +1,4 @@ 
+CONFIG_STAGING=y
+CONFIG_ANDROID=y
+CONFIG_SYNC=y
+CONFIG_SW_SYNC=y