Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d67131d authored by Stephen Crane's avatar Stephen Crane
Browse files

trusty: Switch to dmabuf for coverage shared memory 

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
parent c6b6c08f

trusty/coverage/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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,

}

trusty/coverage/coverage.cpp

+9 −9
Original line number Diff line number Diff line
@@ -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);

    if (fd < 0) {

        return ErrnoError() << "failed to create memfd: ";

    }

    unique_fd memfd(fd);

    BufferAllocator allocator;



    if (ftruncate(memfd, shm_len_) < 0) {

        return ErrnoError() << "failed to resize memfd: ";

    fd = allocator.Alloc("system", shm_len_);

    if (fd < 0) {

        return ErrnoError() << "failed to create dmabuf of size " << shm_len_

                            << " err code: " << fd;

    }

    unique_fd dma_buf(fd);



    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: ";

    }