diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index f2374172ba7b..c35bebe53ffe 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c | |||
| @@ -1156,6 +1156,10 @@ kprobe_perf_func(struct trace_probe *tp, struct pt_regs *regs) | |||
| 1156 | int size, __size, dsize; | 1156 | int size, __size, dsize; |
| 1157 | int rctx; | 1157 | int rctx; |
| 1158 | 1158 | ||
| 1159 | head = this_cpu_ptr(call->perf_events); | ||
| 1160 | if (hlist_empty(head)) | ||
| 1161 | return; | ||
| 1162 | |||
| 1159 | dsize = __get_data_size(tp, regs); | 1163 | dsize = __get_data_size(tp, regs); |
| 1160 | __size = sizeof(*entry) + tp->size + dsize; | 1164 | __size = sizeof(*entry) + tp->size + dsize; |
| 1161 | size = ALIGN(__size + sizeof(u32), sizeof(u64)); | 1165 | size = ALIGN(__size + sizeof(u32), sizeof(u64)); |
| @@ -1171,8 +1175,6 @@ kprobe_perf_func(struct trace_probe *tp, struct pt_regs *regs) | |||
| 1171 | entry->ip = (unsigned long)tp->rp.kp.addr; | 1175 | entry->ip = (unsigned long)tp->rp.kp.addr; |
| 1172 | memset(&entry[1], 0, dsize); | 1176 | memset(&entry[1], 0, dsize); |
| 1173 | store_trace_args(sizeof(*entry), tp, regs, (u8 *)&entry[1], dsize); | 1177 | store_trace_args(sizeof(*entry), tp, regs, (u8 *)&entry[1], dsize); |
| 1174 | |||
| 1175 | head = this_cpu_ptr(call->perf_events); | ||
| 1176 | perf_trace_buf_submit(entry, size, rctx, | 1178 | perf_trace_buf_submit(entry, size, rctx, |
| 1177 | entry->ip, 1, regs, head, NULL); | 1179 | entry->ip, 1, regs, head, NULL); |
| 1178 | } | 1180 | } |
| @@ -1188,6 +1190,10 @@ kretprobe_perf_func(struct trace_probe *tp, struct kretprobe_instance *ri, | |||
| 1188 | int size, __size, dsize; | 1190 | int size, __size, dsize; |
| 1189 | int rctx; | 1191 | int rctx; |
| 1190 | 1192 | ||
| 1193 | head = this_cpu_ptr(call->perf_events); | ||
| 1194 | if (hlist_empty(head)) | ||
| 1195 | return; | ||
| 1196 | |||
| 1191 | dsize = __get_data_size(tp, regs); | 1197 | dsize = __get_data_size(tp, regs); |
| 1192 | __size = sizeof(*entry) + tp->size + dsize; | 1198 | __size = sizeof(*entry) + tp->size + dsize; |
| 1193 | size = ALIGN(__size + sizeof(u32), sizeof(u64)); | 1199 | size = ALIGN(__size + sizeof(u32), sizeof(u64)); |
| @@ -1203,8 +1209,6 @@ kretprobe_perf_func(struct trace_probe *tp, struct kretprobe_instance *ri, | |||
| 1203 | entry->func = (unsigned long)tp->rp.kp.addr; | 1209 | entry->func = (unsigned long)tp->rp.kp.addr; |
| 1204 | entry->ret_ip = (unsigned long)ri->ret_addr; | 1210 | entry->ret_ip = (unsigned long)ri->ret_addr; |
| 1205 | store_trace_args(sizeof(*entry), tp, regs, (u8 *)&entry[1], dsize); | 1211 | store_trace_args(sizeof(*entry), tp, regs, (u8 *)&entry[1], dsize); |
| 1206 | |||
| 1207 | head = this_cpu_ptr(call->perf_events); | ||
| 1208 | perf_trace_buf_submit(entry, size, rctx, | 1212 | perf_trace_buf_submit(entry, size, rctx, |
| 1209 | entry->ret_ip, 1, regs, head, NULL); | 1213 | entry->ret_ip, 1, regs, head, NULL); |
| 1210 | } | 1214 | } |