ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I595cb4ee,Ie8623a70 am: b026acb71e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1544688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib853b7c5a9e7d589fd2234313a796602b14b8d72
This commit is contained in:
Matthew Maurer 2021-01-11 21:05:59 +00:00 • committed by Automerger Merge Worker
commit a4c021f228
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trusty/libtrusty/tipc-test/Android.bp
View file

@ -19,6 +19,7 @@ cc_test {
srcs: ["tipc_test.c"], srcs: ["tipc_test.c"],
shared_libs: [ shared_libs: [
"libc", "libc",
"libdmabufheap",
"liblog", "liblog",
"libtrusty", "libtrusty",
], ],

41
trusty/libtrusty/tipc-test/tipc_test.c
View file

@ -25,6 +25,8 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <BufferAllocator/BufferAllocatorWrapper.h>
#include <trusty/tipc.h> #include <trusty/tipc.h>
#define TIPC_DEFAULT_DEVNAME "/dev/trusty-ipc-dev0" #define TIPC_DEFAULT_DEVNAME "/dev/trusty-ipc-dev0"
@ -86,7 +88,7 @@ static const char* usage_long =
" ta-access - test ta-access flags\n" " ta-access - test ta-access flags\n"
" writev - writev test\n" " writev - writev test\n"
" readv - readv test\n" " readv - readv test\n"
" send-fd - transmit memfd to trusty, use as shm\n" " send-fd - transmit dma_buf to trusty, use as shm\n"
"\n"; "\n";
static uint opt_repeat = 1; static uint opt_repeat = 1;
@ -890,9 +892,12 @@ static int readv_test(uint repeat, uint msgsz, bool var)
static int send_fd_test(void) { static int send_fd_test(void) {
int ret; int ret;
int memfd = -1; int dma_buf = -1;
int fd = -1; int fd = -1;
volatile char* buf = MAP_FAILED; volatile char* buf = MAP_FAILED;
BufferAllocator* allocator = NULL;
const size_t num_pages = 10;
fd = tipc_connect(dev_name, receiver_name); fd = tipc_connect(dev_name, receiver_name);
if (fd < 0) { if (fd < 0) {
@ -901,22 +906,24 @@ static int send_fd_test(void) {
goto cleanup; goto cleanup;
} }
memfd = memfd_create("tipc-send-fd", 0); allocator = CreateDmabufHeapBufferAllocator();
if (memfd < 0) { if (!allocator) {
fprintf(stderr, "Failed to create memfd: %s\n", strerror(errno)); fprintf(stderr, "Failed to create dma-buf allocator.\n");
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
if (ftruncate(memfd, PAGE_SIZE) < 0) { size_t buf_size = PAGE_SIZE * num_pages;
fprintf(stderr, "Failed to resize memfd: %s\n", strerror(errno)); dma_buf = DmabufHeapAlloc(allocator, "system", buf_size, 0);
ret = -1; if (dma_buf < 0) {
ret = dma_buf;
fprintf(stderr, "Failed to create dma-buf fd of size %zu err (%d)\n", buf_size, ret);
goto cleanup; 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) { if (buf == MAP_FAILED) {
fprintf(stderr, "Failed to map memfd: %s\n", strerror(errno)); fprintf(stderr, "Failed to map dma-buf: %s\n", strerror(errno));
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
@ -924,13 +931,13 @@ static int send_fd_test(void) {
strcpy((char*)buf, "From NS"); strcpy((char*)buf, "From NS");
struct trusty_shm shm = { struct trusty_shm shm = {
.fd = memfd, .fd = dma_buf,
.transfer = TRUSTY_SHARE, .transfer = TRUSTY_SHARE,
}; };
ssize_t rc = tipc_send(fd, NULL, 0, &shm, 1); ssize_t rc = tipc_send(fd, NULL, 0, &shm, 1);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "tipc_send failed\n"); fprintf(stderr, "tipc_send failed: %zd\n", rc);
ret = rc; ret = rc;
goto cleanup; goto cleanup;
} }
@ -938,13 +945,19 @@ static int send_fd_test(void) {
read(fd, &c, 1); read(fd, &c, 1);
tipc_close(fd); 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: cleanup:
if (buf != MAP_FAILED) { if (buf != MAP_FAILED) {
munmap((char*)buf, PAGE_SIZE); munmap((char*)buf, PAGE_SIZE);
} }
close(memfd); close(dma_buf);
if (allocator) {
FreeDmabufHeapBufferAllocator(allocator);
}
tipc_close(fd); tipc_close(fd);
return ret; return ret;
} }