tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trusty: Switch to dmabuf for coverage shared memory

Browse source 
Trusty shared memory now uses dmabuf instead of memfd. Switch the
coverage buffer allocation to use libdmabufheap.

Test: atest libtrusty_coverage_test
Bug: None
Change-Id: I067dd0774d19b42380ce5cb8ceb3541fa77ef9f0
This commit is contained in:
Stephen Crane 2021-01-13 14:05:41 -08:00
parent c6b6c08f95
commit 0d67131dd9
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trusty/coverage/Android.bp
View file

@ -28,6 +28,7 @@ cc_library {
shared_libs: [
"libbase",
"liblog",
"libdmabufheap",
],
}
@ -43,6 +44,7 @@ cc_test {
shared_libs: [
"libbase",
"liblog",
"libdmabufheap",
],
require_root: true,
}

18
trusty/coverage/coverage.cpp
View file

@ -16,6 +16,7 @@
#define LOG_TAG "coverage"
#include <BufferAllocator/BufferAllocator.h>
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/unique_fd.h>
@ -114,24 +115,23 @@ Result<void> CoverageRecord::Open() {
record_len_ = resp.open_args.record_len;
shm_len_ = RoundPageUp(record_len_);
fd = memfd_create("trusty-coverage", 0);
BufferAllocator allocator;
fd = allocator.Alloc("system", shm_len_);
if (fd < 0) {
return ErrnoError() << "failed to create memfd: ";
return ErrnoError() << "failed to create dmabuf of size " << shm_len_
<< " err code: " << fd;
}
unique_fd memfd(fd);
unique_fd dma_buf(fd);
if (ftruncate(memfd, shm_len_) < 0) {
return ErrnoError() << "failed to resize memfd: ";
}
void* shm = mmap(0, shm_len_, PROT_READ | PROT_WRITE, MAP_SHARED, memfd, 0);
void* shm = mmap(0, shm_len_, PROT_READ | PROT_WRITE, MAP_SHARED, dma_buf, 0);
if (shm == MAP_FAILED) {
return ErrnoError() << "failed to map memfd: ";
}
req.hdr.cmd = COVERAGE_CLIENT_CMD_SHARE_RECORD;
req.share_record_args.shm_len = shm_len_;
ret = Rpc(&req, memfd, &resp);
ret = Rpc(&req, dma_buf, &resp);
if (!ret.ok()) {
return Error() << "failed to send shared memory: ";
}