diff options
| -rw-r--r-- | memref-test/include/lender.h | 1 | ||||
| -rw-r--r-- | memref-test/lender/lender.c | 18 |
2 files changed, 4 insertions, 15 deletions
diff --git a/memref-test/include/lender.h b/memref-test/include/lender.h index bf02af3..cd472e7 100644 --- a/memref-test/include/lender.h +++ b/memref-test/include/lender.h @@ -20,7 +20,6 @@ enum lender_command { LENDER_LEND_BSS, - LENDER_LEND_RO, LENDER_LEND_RW, LENDER_SUICIDE, LENDER_READ_BSS, diff --git a/memref-test/lender/lender.c b/memref-test/lender/lender.c index 383ae39..c4a4107 100644 --- a/memref-test/lender/lender.c +++ b/memref-test/lender/lender.c @@ -42,15 +42,17 @@ #define MAX_WRITE 0x800 static __attribute__((aligned(PAGE_SIZE))) char bss_page[PAGE_SIZE]; -static __attribute__((aligned(PAGE_SIZE))) const char ro_page[PAGE_SIZE] = {1}; static __attribute__((aligned(PAGE_SIZE))) char rw_page[PAGE_SIZE] = {1}; #define MM_RW (MMAP_FLAG_PROT_READ | MMAP_FLAG_PROT_WRITE) static handle_t bss_memref = INVALID_IPC_HANDLE; -static handle_t ro_memref = INVALID_IPC_HANDLE; static handle_t rw_memref = INVALID_IPC_HANDLE; +/* + * This only creates bss_memref and rw_memref; creating a ro_memref would fail + * since RO segments are not backed by vmm_objs (b/149849862). + */ static void init(void) { int rc = memref_create(bss_page, PAGE_SIZE, MM_RW); if (rc < 0) { @@ -60,14 +62,6 @@ static void init(void) { bss_memref = rc; - rc = memref_create((void*)ro_page, PAGE_SIZE, MMAP_FLAG_PROT_READ); - if (rc < 0) { - TLOGE("ro memref create failed: (%d)\n", rc); - /* TODO abort on failure once bug 149849862 is resolved */ - } else { - ro_memref = rc; - } - rc = memref_create(rw_page, PAGE_SIZE, MM_RW); if (rc < 0) { TLOGE("rw memref create failed: (%d)\n", rc); @@ -98,9 +92,6 @@ static int lender_lend(handle_t chan, enum lender_command cmd) { case LENDER_LEND_BSS: to_lend = bss_memref; break; - case LENDER_LEND_RO: - to_lend = ro_memref; - break; case LENDER_LEND_RW: to_lend = rw_memref; break; @@ -179,7 +170,6 @@ static int lender_on_message(const struct tipc_port* port, switch (msg.cmd) { case LENDER_LEND_BSS: - case LENDER_LEND_RO: case LENDER_LEND_RW: rc = lender_lend(chan, msg.cmd); if (rc < 0) { |