| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1457537342-678-9-git-send-email-emilio.lopez@collabora.co.uk>
Date: Wed, 9 Mar 2016 12:29:01 -0300
From: Emilio López <emilio.lopez@...labora.co.uk>
To: Shuah Khan <shuahkh@....samsung.com>
Cc: devel@...verdev.osuosl.org,
Gustavo Padovan <gustavo.padovan@...labora.co.uk>,
Riley Andrews <riandrews@...roid.com>,
Daniel Vetter <daniel.vetter@...ll.ch>,
John Harrison <John.C.Harrison@...el.com>,
linux-kernel@...r.kernel.org, dri-devel@...ts.freedesktop.org,
Greg Hackmann <ghackmann@...gle.com>,
Rob Clark <robdclark@...il.com>,
linux-kselftest@...r.kernel.org,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Daniel Stone <daniels@...labora.com>,
Arve Hjønnevåg <arve@...roid.com>,
Emilio López <emilio.lopez@...labora.co.uk>
Subject: [RFC PATCH v1 8/9] selftest: sync: stress test for merges
This test is based on the libsync test suite from Android.
This commit includes a test to stress merge operations.
Signed-off-by: Emilio López <emilio.lopez@...labora.co.uk>
---
tools/testing/selftests/sync/Makefile | 1 +
tools/testing/selftests/sync/sync_stress_merge.c | 115 +++++++++++++++++++++++
tools/testing/selftests/sync/sync_test.c | 1 +
tools/testing/selftests/sync/synctest.h | 3 +
4 files changed, 120 insertions(+)
create mode 100644 tools/testing/selftests/sync/sync_stress_merge.c
diff --git a/tools/testing/selftests/sync/Makefile b/tools/testing/selftests/sync/Makefile
index eb14e8c..7237a6c 100644
--- a/tools/testing/selftests/sync/Makefile
+++ b/tools/testing/selftests/sync/Makefile
@@ -18,6 +18,7 @@ TESTS += sync_wait.o
TESTS += sync_destroyed.o
TESTS += sync_stress_parallelism.o
TESTS += sync_stress_consumer.o
+TESTS += sync_stress_merge.o
sync_test: $(SRC) $(TESTS)
diff --git a/tools/testing/selftests/sync/sync_stress_merge.c b/tools/testing/selftests/sync/sync_stress_merge.c
new file mode 100644
index 0000000..7eb2cdf
--- /dev/null
+++ b/tools/testing/selftests/sync/sync_stress_merge.c
@@ -0,0 +1,115 @@
+/*
+ * sync stress test: merging
+ * Copyright 2015-2016 Collabora Ltd.
+ *
+ * Based on the implementation from the Android Open Source Project,
+ *
+ * Copyright 2012 Google, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "sync.h"
+#include "sw_sync.h"
+#include "synctest.h"
+
+static int fence_map[1024 * 32];
+
+int test_merge_stress_random_merge(void)
+{
+ int i, size, ret;
+ int timelineCount = 32;
+ int mergeCount = 1024 * 32;
+ int timelines[timelineCount];
+ int fence, tmpfence, merged, valid;
+ int timeline, timelineOffset, syncPoint;
+
+ srand(time(NULL));
+
+ for (i = 0; i < timelineCount; i++)
+ timelines[i] = sw_sync_timeline_create();
+
+ fence = sw_sync_fence_create(timelines[0], "fence", 0);
+ valid = sw_sync_fence_is_valid(fence);
+ ASSERT(valid, "Failure creating fence\n");
+
+ memset(fence_map, -1, sizeof(fence_map));
+ fence_map[0] = 0;
+
+ /*
+ * Randomly create syncpoints out of a fixed set of timelines,
+ * and merge them together
+ */
+ for (i = 0; i < mergeCount; i++) {
+ /* Generate syncpoint. */
+ timelineOffset = rand() % timelineCount;
+ timeline = timelines[timelineOffset];
+ syncPoint = rand();
+
+ /* Keep track of the latest syncpoint in each timeline. */
+ if (fence_map[timelineOffset] == -1)
+ fence_map[timelineOffset] = syncPoint;
+ else if (fence_map[timelineOffset] < syncPoint)
+ fence_map[timelineOffset] = syncPoint;
+
+ /* Merge */
+ tmpfence = sw_sync_fence_create(timeline, "fence", syncPoint);
+ merged = sync_merge("merge", tmpfence, fence);
+ sw_sync_fence_destroy(tmpfence);
+ sw_sync_fence_destroy(fence);
+ fence = merged;
+
+ valid = sw_sync_fence_is_valid(merged);
+ ASSERT(valid, "Failure creating fence i\n");
+ }
+
+ size = 0;
+ for (i = 0; i < mergeCount; i++)
+ if (fence_map[i] != -1)
+ size++;
+
+ /* Confirm our map matches the fence. */
+ ASSERT(sync_fence_size(fence) == size,
+ "Quantity of elements not matching\n");
+
+ /* Trigger the merged fence */
+ for (i = 0; i < mergeCount; i++) {
+ if (fence_map[i] != -1) {
+ ret = sync_wait(fence, 0);
+ ASSERT(ret == 0,
+ "Failure waiting on fence until timeout\n");
+ /* Increment the timeline to the last syncpoint */
+ sw_sync_timeline_inc(timelines[i], fence_map[i]);
+ }
+ }
+
+ /* Check that the fence is triggered. */
+ ret = sync_wait(fence, 0);
+ ASSERT(ret > 0, "Failure triggering fence\n");
+
+ for (i = 0; i < timelineCount; i++)
+ sw_sync_timeline_destroy(timelines[i]);
+
+ return 0;
+}
diff --git a/tools/testing/selftests/sync/sync_test.c b/tools/testing/selftests/sync/sync_test.c
index b27f492..c3e4c01 100644
--- a/tools/testing/selftests/sync/sync_test.c
+++ b/tools/testing/selftests/sync/sync_test.c
@@ -69,6 +69,7 @@ int main(void)
err += RUN_TEST(test_fence_wait_on_destroyed_timeline);
err += RUN_TEST(test_stress_two_threads_shared_timeline);
err += RUN_TEST(test_consumer_stress_multi_producer_single_consumer);
+ err += RUN_TEST(test_merge_stress_random_merge);
if (err)
printf("[FAIL]\tsync errors: %d\n", err);
diff --git a/tools/testing/selftests/sync/synctest.h b/tools/testing/selftests/sync/synctest.h
index 94c4594..f74459e 100644
--- a/tools/testing/selftests/sync/synctest.h
+++ b/tools/testing/selftests/sync/synctest.h
@@ -63,4 +63,7 @@ int test_stress_two_threads_shared_timeline(void);
/* Stress test - consumer */
int test_consumer_stress_multi_producer_single_consumer(void);
+/* Stress test - merging */
+int test_merge_stress_random_merge(void);
+
#endif
--
2.5.0
Powered by blists - more mailing lists