commit b6e795513b7c62c8ea4438f3a6620459e35e6268
author Matthew Maurer <mmaurer@google.com> Tue Jan 05 13:20:58 2021 -0800
committer Matthew Maurer <mmaurer@google.com> Mon Jan 11 10:23:30 2021 -0800
tree 5c227ab6d219ae4d7584a6dc54468364d89adf9f
parent 09494764aec1df79f549a13d745916e6efc225c6

trusty: tipc-test: Test multi-page support

Test: tipc-test -t send-fd
Bug: 117221195
Change-Id: Ie8623a70f6935ede6bb5e9dd1a7945a7e356d854

trusty/libtrusty/tipc-test/tipc_test.c

diff --git a/trusty/libtrusty/tipc-test/tipc_test.c b/trusty/libtrusty/tipc-test/tipc_test.c
index ca581dc..b080222 100644
--- a/trusty/libtrusty/tipc-test/tipc_test.c
+++ b/trusty/libtrusty/tipc-test/tipc_test.c
@@ -893,6 +893,7 @@
     int memfd = -1;
     int fd = -1;
     volatile char* buf = MAP_FAILED;
+    const size_t num_pages = 10;
 
     fd = tipc_connect(dev_name, receiver_name);
     if (fd < 0) {
@@ -908,13 +909,14 @@
         goto cleanup;
     }
 
-    if (ftruncate(memfd, PAGE_SIZE) < 0) {
+    size_t buf_size = PAGE_SIZE * num_pages;
+    if (ftruncate(memfd, buf_size) < 0) {
         fprintf(stderr, "Failed to resize memfd: %s\n", strerror(errno));
         ret = -1;
         goto cleanup;
     }
 
-    buf = mmap(0, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, memfd, 0);
+    buf = mmap(0, buf_size, PROT_READ | PROT_WRITE, MAP_SHARED, dma_buf, 0);
     if (buf == MAP_FAILED) {
         fprintf(stderr, "Failed to map memfd: %s\n", strerror(errno));
         ret = -1;
@@ -938,7 +940,10 @@
     read(fd, &c, 1);
     tipc_close(fd);
 
-    ret = strcmp("Hello from Trusty!", (const char*)buf) ? (-1) : 0;
+    ret = 0;
+    for (size_t skip = 0; skip < num_pages; skip++) {
+        ret |= strcmp("Hello from Trusty!", (const char*)&buf[skip * PAGE_SIZE]) ? (-1) : 0;
+    }
 
 cleanup:
     if (buf != MAP_FAILED) {