|
@@ -37,6 +37,10 @@ struct jit_buf_desc {
|
|
|
bool needs_bswap; /* handles cross-endianess */
|
|
|
bool use_arch_timestamp;
|
|
|
void *debug_data;
|
|
|
+ void *unwinding_data;
|
|
|
+ uint64_t unwinding_size;
|
|
|
+ uint64_t unwinding_mapped_size;
|
|
|
+ uint64_t eh_frame_hdr_size;
|
|
|
size_t nr_debug_entries;
|
|
|
uint32_t code_load_count;
|
|
|
u64 bytes_written;
|
|
@@ -295,6 +299,13 @@ jit_get_next_entry(struct jit_buf_desc *jd)
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
+ case JIT_CODE_UNWINDING_INFO:
|
|
|
+ if (jd->needs_bswap) {
|
|
|
+ jr->unwinding.unwinding_size = bswap_64(jr->unwinding.unwinding_size);
|
|
|
+ jr->unwinding.eh_frame_hdr_size = bswap_64(jr->unwinding.eh_frame_hdr_size);
|
|
|
+ jr->unwinding.mapped_size = bswap_64(jr->unwinding.mapped_size);
|
|
|
+ }
|
|
|
+ break;
|
|
|
case JIT_CODE_CLOSE:
|
|
|
break;
|
|
|
case JIT_CODE_LOAD:
|
|
@@ -370,7 +381,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
u16 idr_size;
|
|
|
const char *sym;
|
|
|
uint32_t count;
|
|
|
- int ret, csize;
|
|
|
+ int ret, csize, usize;
|
|
|
pid_t pid, tid;
|
|
|
struct {
|
|
|
u32 pid, tid;
|
|
@@ -380,6 +391,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
pid = jr->load.pid;
|
|
|
tid = jr->load.tid;
|
|
|
csize = jr->load.code_size;
|
|
|
+ usize = jd->unwinding_mapped_size;
|
|
|
addr = jr->load.code_addr;
|
|
|
sym = (void *)((unsigned long)jr + sizeof(jr->load));
|
|
|
code = (unsigned long)jr + jr->load.p.total_size - csize;
|
|
@@ -408,6 +420,14 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
jd->nr_debug_entries = 0;
|
|
|
}
|
|
|
|
|
|
+ if (jd->unwinding_data && jd->eh_frame_hdr_size) {
|
|
|
+ free(jd->unwinding_data);
|
|
|
+ jd->unwinding_data = NULL;
|
|
|
+ jd->eh_frame_hdr_size = 0;
|
|
|
+ jd->unwinding_mapped_size = 0;
|
|
|
+ jd->unwinding_size = 0;
|
|
|
+ }
|
|
|
+
|
|
|
if (ret) {
|
|
|
free(event);
|
|
|
return -1;
|
|
@@ -422,7 +442,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
|
|
|
event->mmap2.pgoff = GEN_ELF_TEXT_OFFSET;
|
|
|
event->mmap2.start = addr;
|
|
|
- event->mmap2.len = csize;
|
|
|
+ event->mmap2.len = usize ? ALIGN_8(csize) + usize : csize;
|
|
|
event->mmap2.pid = pid;
|
|
|
event->mmap2.tid = tid;
|
|
|
event->mmap2.ino = st.st_ino;
|
|
@@ -473,6 +493,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
char *filename;
|
|
|
size_t size;
|
|
|
struct stat st;
|
|
|
+ int usize;
|
|
|
u16 idr_size;
|
|
|
int ret;
|
|
|
pid_t pid, tid;
|
|
@@ -483,6 +504,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
|
|
|
pid = jr->move.pid;
|
|
|
tid = jr->move.tid;
|
|
|
+ usize = jd->unwinding_mapped_size;
|
|
|
idr_size = jd->machine->id_hdr_size;
|
|
|
|
|
|
/*
|
|
@@ -511,7 +533,8 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
(sizeof(event->mmap2.filename) - size) + idr_size);
|
|
|
event->mmap2.pgoff = GEN_ELF_TEXT_OFFSET;
|
|
|
event->mmap2.start = jr->move.new_code_addr;
|
|
|
- event->mmap2.len = jr->move.code_size;
|
|
|
+ event->mmap2.len = usize ? ALIGN_8(jr->move.code_size) + usize
|
|
|
+ : jr->move.code_size;
|
|
|
event->mmap2.pid = pid;
|
|
|
event->mmap2.tid = tid;
|
|
|
event->mmap2.ino = st.st_ino;
|
|
@@ -577,6 +600,31 @@ static int jit_repipe_debug_info(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+jit_repipe_unwinding_info(struct jit_buf_desc *jd, union jr_entry *jr)
|
|
|
+{
|
|
|
+ void *unwinding_data;
|
|
|
+ uint32_t unwinding_data_size;
|
|
|
+
|
|
|
+ if (!(jd && jr))
|
|
|
+ return -1;
|
|
|
+
|
|
|
+ unwinding_data_size = jr->prefix.total_size - sizeof(jr->unwinding);
|
|
|
+ unwinding_data = malloc(unwinding_data_size);
|
|
|
+ if (!unwinding_data)
|
|
|
+ return -1;
|
|
|
+
|
|
|
+ memcpy(unwinding_data, &jr->unwinding.unwinding_data,
|
|
|
+ unwinding_data_size);
|
|
|
+
|
|
|
+ jd->eh_frame_hdr_size = jr->unwinding.eh_frame_hdr_size;
|
|
|
+ jd->unwinding_size = jr->unwinding.unwinding_size;
|
|
|
+ jd->unwinding_mapped_size = jr->unwinding.mapped_size;
|
|
|
+ jd->unwinding_data = unwinding_data;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int
|
|
|
jit_process_dump(struct jit_buf_desc *jd)
|
|
|
{
|
|
@@ -594,6 +642,9 @@ jit_process_dump(struct jit_buf_desc *jd)
|
|
|
case JIT_CODE_DEBUG_INFO:
|
|
|
ret = jit_repipe_debug_info(jd, jr);
|
|
|
break;
|
|
|
+ case JIT_CODE_UNWINDING_INFO:
|
|
|
+ ret = jit_repipe_unwinding_info(jd, jr);
|
|
|
+ break;
|
|
|
default:
|
|
|
ret = 0;
|
|
|
continue;
|