We always need to pass the last sample period to perf_sample_data_init(), otherwise the event distribution will be wrong. Thus, modifiyng the function interface with the required period as argument. So basically a pattern like this: perf_sample_data_init(&data, ~0ULL); data.period = event->hw.last_period; will now be like that: perf_sample_data_init(&data, ~0ULL, event->hw.last_period); Avoids unininitialized data.period and simplifies code.
Showing the changes to kernel (1 of 15 files). Show all
Unified · Split
| @@ -4957,7 +4957,7 @@ void __perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) · 4956 unmodified lines | |||
| 4957 | if (rctx < 0) | 4957 | if (rctx < 0) |
| 4958 | return; | 4958 | return; |
| 4959 | 4959 | ||
| 4960 | perf_sample_data_init(&data, addr); | 4960 | perf_sample_data_init(&data, addr, 0); |
| 4961 | 4961 | ||
| 4962 | do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, &data, regs); | 4962 | do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, &data, regs); |
| 4963 | 4963 | ||
| @@ -5215,7 +5215,7 @@ void perf_tp_event(u64 addr, u64 count, void *record, int entry_size, · 251 unmodified lines | |||
| 5215 | .data = record, | 5215 | .data = record, |
| 5216 | }; | 5216 | }; |
| 5217 | 5217 | ||
| 5218 | perf_sample_data_init(&data, addr); | 5218 | perf_sample_data_init(&data, addr, 0); |
| 5219 | data.raw = &raw; | 5219 | data.raw = &raw; |
| 5220 | 5220 | ||
| 5221 | hlist_for_each_entry_rcu(event, node, head, hlist_entry) { | 5221 | hlist_for_each_entry_rcu(event, node, head, hlist_entry) { |
| @@ -5318,7 +5318,7 @@ void perf_bp_event(struct perf_event *bp, void *data) · 96 unmodified lines | |||
| 5318 | struct perf_sample_data sample; | 5318 | struct perf_sample_data sample; |
| 5319 | struct pt_regs *regs = data; | 5319 | struct pt_regs *regs = data; |
| 5320 | 5320 | ||
| 5321 | perf_sample_data_init(&sample, bp->attr.bp_addr); | 5321 | perf_sample_data_init(&sample, bp->attr.bp_addr, 0); |
| 5322 | 5322 | ||
| 5323 | if (!bp->hw.state && !perf_exclude_event(bp, regs)) | 5323 | if (!bp->hw.state && !perf_exclude_event(bp, regs)) |
| 5324 | perf_swevent_event(bp, 1, &sample, regs); | 5324 | perf_swevent_event(bp, 1, &sample, regs); |
| @@ -5344,8 +5344,7 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer) · 19 unmodified lines | |||
| 5344 | 5344 | ||
| 5345 | event->pmu->read(event); | 5345 | event->pmu->read(event); |
| 5346 | 5346 | ||
| 5347 | perf_sample_data_init(&data, 0); | 5347 | perf_sample_data_init(&data, 0, event->hw.last_period); |
| 5348 | data.period = event->hw.last_period; | ||
| 5349 | regs = get_irq_regs(); | 5348 | regs = get_irq_regs(); |
| 5350 | 5349 | ||
| 5351 | if (regs && !perf_exclude_event(event, regs)) { | 5350 | if (regs && !perf_exclude_event(event, regs)) { |