perf: Use sample_flags for addr
Subsystems (7)
Namhyung Kim
maintainerPATCH 1/2 perf: Use sample_flags for addr
Use the new sample_flags to indicate whether the addr field is filled by the PMU driver. As most PMU drivers pass 0, it can set the flag only if it has a non-zero value. And use 0 in perf_sample_output() if it's not filled already.
--- arch/x86/events/intel/ds.c | 8 ++++++-- include/linux/perf_event.h | 8 ++++++-- kernel/events/core.c | 5 +++++ 3 files changed, 17 insertions(+), 4 deletions(-)
arch/x86/events/intel/ds.c +6 -2
@@ -1621,8 +1621,10 @@ static void setup_pebs_fixed_sample_data(struct perf_event *event,if ((sample_type &PERF_SAMPLE_ADDR_TYPE ) && - x86_pmu.intel_cap.pebs_format >=1 ) + x86_pmu.intel_cap.pebs_format >=1 ) { data->addr = pebs->dla; + data->sample_flags |=PERF_SAMPLE_ADDR ; + }if (x86_pmu.intel_cap.pebs_format >=2 ) {/* Only set the TSX weight when no memory weight. */
@@ -1783,8 +1785,10 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event, data->sample_flags |=PERF_SAMPLE_DATA_SRC ; } -if (sample_type &PERF_SAMPLE_ADDR_TYPE ) +if (sample_type &PERF_SAMPLE_ADDR_TYPE ) { data->addr = meminfo->address; + data->sample_flags |=PERF_SAMPLE_ADDR ; + }if (sample_type &PERF_SAMPLE_TRANSACTION ) { data->txn = intel_get_tsx_transaction(meminfo->tsx_tuning,
include/linux/perf_event.h +6 -2
@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -u64 addr;struct perf_raw_record *raw;u64 period;
@@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_sample_weight weight;union perf_mem_data_src data_src;u64 txn; +u64 addr;u64 type;u64 ip;
@@ -1079,9 +1079,13 @@ static inline void perf_sample_data_init(struct perf_sample_data *data, {/* remaining struct members initialized in perf_prepare_sample() */ data->sample_flags =0 ; - data->addr = addr; data->raw =NULL ; data->period = period; + +if (addr) { + data->addr = addr; + data->sample_flags |=PERF_SAMPLE_ADDR ; + } }/*
kernel/events/core.c +5 -0
@@ -7414,6 +7414,11 @@ void perf_prepare_sample(struct perf_event_header *header,if (filtered_sample_type &PERF_SAMPLE_TRANSACTION ) data->txn =0 ; +if (sample_type & (PERF_SAMPLE_ADDR |PERF_SAMPLE_PHYS_ADDR |PERF_SAMPLE_DATA_PAGE_SIZE )) { +if (filtered_sample_type &PERF_SAMPLE_ADDR ) + data->addr =0 ; + } +if (sample_type &PERF_SAMPLE_REGS_INTR ) {/* regs dump ABI info */ int size =sizeof (u64);
Signature · 1 line
2.37.3.968.ga6b4b080e4-goog
Namhyung Kim
maintainerPATCH 2/2 perf: Use sample_flags for raw_data
Use the new sample_flags to indicate whether the raw data field is filled by the PMU driver. Although it could check with the NULL, follow the same rule with other fields.
Remove the raw field from the perf_sample_data_init() to minimize the number of cache lines touched.
--- arch/s390/kernel/perf_cpum_cf.c | 1 + arch/s390/kernel/perf_pai_crypto.c | 1 + arch/x86/events/amd/ibs.c | 1 + include/linux/perf_event.h | 5 ++--- kernel/events/core.c | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-)
arch/s390/kernel/perf_cpum_cf.c +1 -0
@@ -664,6 +664,7 @@ static int cfdiag_push_sample(struct perf_event *event, raw.frag.data = cpuhw->stop; raw.size = raw.frag.size; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; } overflow =perf_event_overflow (event, &data, ®s);
arch/s390/kernel/perf_pai_crypto.c +1 -0
@@ -366,6 +366,7 @@ static int paicrypt_push_sample(void) raw.frag.data = cpump->save; raw.size = raw.frag.size; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; } overflow =perf_event_overflow (event, &data, ®s);
arch/x86/events/amd/ibs.c +1 -0
@@ -781,6 +781,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) }, }; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; }/*
include/linux/perf_event.h +2 -3
@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -struct perf_raw_record *raw;u64 period;/*
@@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_mem_data_src data_src;u64 txn;u64 addr; +struct perf_raw_record *raw;u64 type;u64 ip;
@@ -1078,8 +1078,7 @@ static inline void perf_sample_data_init(struct perf_sample_data *data, u64 addr, u64 period) {/* remaining struct members initialized in perf_prepare_sample() */ - data->sample_flags =0 ; - data->raw =NULL ; + data->sample_flags =PERF_SAMPLE_PERIOD ; data->period = period;if (addr) {
kernel/events/core.c +2 -1
@@ -7332,7 +7332,7 @@ void perf_prepare_sample(struct perf_event_header *header,struct perf_raw_record *raw = data->raw;int size; -if (raw) { +if (raw && (data->sample_flags &PERF_SAMPLE_RAW )) {struct perf_raw_frag *frag = &raw->frag;u32 sum =0 ;
@@ -7348,6 +7348,7 @@ void perf_prepare_sample(struct perf_event_header *header, frag->pad = raw->size - sum; }else { size =sizeof (u64); + data->raw =NULL ; } header->size += size;
Signature · 1 line
2.37.3.968.ga6b4b080e4-goog
[tip: perf/core] perf: Use sample_flags for raw_data
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 838d9bb62d132ec3baf1b5aba2e95ef9a7a9a3cd Gitweb: https://git.kernel.org/tip/838d9bb62d132ec3baf1b5aba2e95ef9a7a9a3cd Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 21 Sep 2022 15:00:32 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 27 Sep 2022 22:50:24 +02:00
perf: Use sample_flags for raw_data
Use the new sample_flags to indicate whether the raw data field is filled by the PMU driver. Although it could check with the NULL, follow the same rule with other fields.
Remove the raw field from the perf_sample_data_init() to minimize the number of cache lines touched.
--- arch/s390/kernel/perf_cpum_cf.c | 1 + arch/s390/kernel/perf_pai_crypto.c | 1 + arch/x86/events/amd/ibs.c | 1 + include/linux/perf_event.h | 5 ++--- kernel/events/core.c | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-)
arch/s390/kernel/perf_cpum_cf.c +1 -0
@@ -664,6 +664,7 @@ static int cfdiag_push_sample(struct perf_event *event, raw.frag.data = cpuhw->stop; raw.size = raw.frag.size; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; } overflow =perf_event_overflow (event, &data, ®s);
arch/s390/kernel/perf_pai_crypto.c +1 -0
@@ -366,6 +366,7 @@ static int paicrypt_push_sample(void) raw.frag.data = cpump->save; raw.size = raw.frag.size; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; } overflow =perf_event_overflow (event, &data, ®s);
arch/x86/events/amd/ibs.c +1 -0
@@ -781,6 +781,7 @@ fail: }, }; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; }/*
include/linux/perf_event.h +2 -3
@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -struct perf_raw_record *raw;u64 period;/*
@@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_mem_data_src data_src;u64 txn;u64 addr; +struct perf_raw_record *raw;u64 type;u64 ip;
@@ -1078,8 +1078,7 @@ static inline void perf_sample_data_init(struct perf_sample_data *data, u64 addr, u64 period) {/* remaining struct members initialized in perf_prepare_sample() */ - data->sample_flags =0 ; - data->raw =NULL ; + data->sample_flags =PERF_SAMPLE_PERIOD ; data->period = period;if (addr) {
kernel/events/core.c +2 -1
@@ -7332,7 +7332,7 @@ void perf_prepare_sample(struct perf_event_header *header,struct perf_raw_record *raw = data->raw;int size; -if (raw) { +if (raw && (data->sample_flags &PERF_SAMPLE_RAW )) {struct perf_raw_frag *frag = &raw->frag;u32 sum =0 ;
@@ -7348,6 +7348,7 @@ void perf_prepare_sample(struct perf_event_header *header, frag->pad = raw->size - sum; }else { size =sizeof (u64); + data->raw =NULL ; } header->size += size;
[PATCH] Re: [tip: perf/core] perf: Use sample_flags for raw_data
Hi,
This causes segfaults.
Steps to recreate:
* Run ./samples/bpf/trace_output BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)
Problem:
* The following commit sets data->raw to NULL, when the raw data is not filled by PMU driver. This leads to stale data.
* raw data could also be filled by bpf_perf_event_output(), bpf_event_output()
...
686 perf_sample_data_init(sd, 0, 0);
687 sd->raw = &raw;
688
689 err = __bpf_perf_event_output(regs, map, flags, sd);
...
* The below patch eliminates segfaults. However, contradicts with the description mentioned in this commit (Filled by only PMU driver).
kernel/trace/bpf_trace.c +2 -0
@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);
@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out:
--
Thanks,
Sumanth
Re: [PATCH] Re: [tip: perf/core] perf: Use sample_flags for raw_data
Hello,
Quoted 24 lines · Sumanth Korikkar
Hi,
This causes segfaults.
Steps to recreate:
* Run./samples/bpf/trace_outputBUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Problem:
* The following commit setsdata->rawto NULL, when the raw data is not filled by PMU driver. This leads to stale data.* raw data could also be filled by
bpf_perf_event_output(),bpf_event_output()
...
686perf_sample_data_init(sd, 0, 0);
687sd->raw= &raw;
688
689 err =__bpf_perf_event_output(regs, map, flags, sd);
...
Quoted 2 lines
* The below patch eliminates segfaults. However, contradicts with the description mentioned in this commit (Filled by only PMU driver).
Thank you for the fix. Don't worry about the description - it said it's usually filled by PMU drivers and it should be fine as long as you set the sample flags after filling the raw data.
Thanks,
Namhyung
Quoted 25 lines
kernel/trace/bpf_trace.c +2
-1@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out: --Thanks,
Sumanth
Re: [PATCH] Re: [tip: perf/core] perf: Use sample_flags for raw_data
In reply to Sumanth KorikkarQuoted 23 lines · Sumanth Korikkar
Hi,
This causes segfaults.
Steps to recreate:
* Run./samples/bpf/trace_outputBUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Problem:
* The following commit setsdata->rawto NULL, when the raw data is not filled by PMU driver. This leads to stale data.* raw data could also be filled by
bpf_perf_event_output(),bpf_event_output()
...
686perf_sample_data_init(sd, 0, 0);
687sd->raw= &raw;
688
689 err =__bpf_perf_event_output(regs, map, flags, sd);
...
Quoted 2 lines
* The below patch eliminates segfaults. However, contradicts with the description mentioned in this commit (Filled by only PMU driver).
hi,
could you please resend the patch with formal changelog and Fixes tag?
thanks,
jirka
Quoted 25 lines
kernel/trace/bpf_trace.c +2
-1@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out: --Thanks,
Sumanth
PATCH 1/1 bpf: fix sample_flags for bpf_perf_event_output
* Raw data is also filled by bpf_perf_event_output.
* Add sample_flags to indicate raw data.
* This eliminates the segfaults as shown below:
Run ./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)
--- kernel/trace/bpf_trace.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/bpf_trace.c +2 -0
@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);
@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out:
Signature · 1 line
2.36.1
Re: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 9 lines · Sumanth Korikkar
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)
Quoted 3 lines
Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>
Peter,
I think this should go through your tree again? bpf-next/master does not have sample_flags merged yet
thanks,
jirka
Quoted 27 lines
--- kernel/trace/bpf_trace.c | 2 ++ 1 file changed, 2 insertions(+)kernel/trace/bpf_trace.c +2
-0@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out:Signature · 1 line
2.36.1
Peter Zijlstra
maintainerRe: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 14 lines · Jiri Olsa
Quoted 9 lines · Sumanth Korikkar
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Quoted 3 lines
Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>
Quoted 5 lines
Acked-by Jiri Olsa <[email protected]>Peter,
I think this should go through your tree again? bpf-next/master does not havesample_flagsmerged yet
Yep can do. I'll line it up in perf/urgent (Ingo just send out perf/core).
Re: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 16 lines · Peter Zijlstra
Quoted 14 lines · Jiri Olsa
Quoted 12 lines · Sumanth Korikkar
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>
Quoted 8 lines
Quoted 5 lines
Acked-by Jiri Olsa <[email protected]>Peter,
I think this should go through your tree again? bpf-next/master does not havesample_flagsmerged yetYep can do. I'll line it up in perf/urgent (Ingo just send out perf/core).
Peter,
Could you please hurry up. 11 days have passed.
This issue affects everyone the hard way now after merging all the trees: tip -> linus -> net-next -> bpf-next. The BPF CI is red right now with 5 tests failing because this fix is still missing.
It's causing a headache to maintainers and developers.
Re: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Peter,
Another 2 days have passed and bpf side is still broken due to the change that went during the merge window without corresponding fix from the bpf side.
Looks like the patch is sitting in tip:perf/urgent. Please send it to Linus asap.
We're not sending bpf fixes to avoid breaking bpf tree too. We've worked around the issue in bpf CI for bpf-next tree only. Developers still see failures when they run tests locally.
Quoted 36 lines · Alexei Starovoitov
Quoted 16 lines · Peter Zijlstra
Quoted 14 lines · Jiri Olsa
Quoted 12 lines · Sumanth Korikkar
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>Quoted 8 lines
Quoted 5 lines
Acked-by Jiri Olsa <[email protected]>Peter,
I think this should go through your tree again? bpf-next/master does not havesample_flagsmerged yetYep can do. I'll line it up in perf/urgent (Ingo just send out perf/core).
Peter,
Could you please hurry up. 11 days have passed.
This issue affects everyone the hard way now after merging all the trees: tip -> linus -> net-next -> bpf-next. The BPF CI is red right now with 5 tests failing because this fix is still missing.
It's causing a headache to maintainers and developers.
bpf+perf is still broken. Was: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Another 2 days have passed and the fix is still not in the Linus's tree.
Peter,
whatever your excuse is for not sending tip:perf/urgent this is not acceptable.
Linus,
please apply this fix directly:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=perf/urgent&id=21da7472a040420f2dc624ffec70291a72c5d6a6
or suggest the course of action.
It sucked to have such a breakage in rc1 and we don't want rc2 to stay broken.
Thanks
Quoted 51 lines · Alexei Starovoitov
Peter,
Another 2 days have passed and bpf side is still broken due to the change that went during the merge window without corresponding fix from the bpf side.
Looks like the patch is sitting in tip:perf/urgent. Please send it to Linus asap.We're not sending bpf fixes to avoid breaking bpf tree too. We've worked around the issue in bpf CI for bpf-next tree only. Developers still see failures when they run tests locally.
Quoted 36 lines · Alexei Starovoitov
Quoted 16 lines · Peter Zijlstra
Quoted 14 lines · Jiri Olsa
Quoted 12 lines · Sumanth Korikkar
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>Quoted 8 lines
Quoted 5 lines
Acked-by Jiri Olsa <[email protected]>Peter,
I think this should go through your tree again? bpf-next/master does not havesample_flagsmerged yetYep can do. I'll line it up in perf/urgent (Ingo just send out perf/core).
Peter,
Could you please hurry up. 11 days have passed.
This issue affects everyone the hard way now after merging all the trees: tip -> linus -> net-next -> bpf-next. The BPF CI is red right now with 5 tests failing because this fix is still missing.
It's causing a headache to maintainers and developers.
Re: bpf+perf is still broken. Was: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 4 lines · Alexei Starovoitov
Linus,
please apply this fix directly or suggest the course of action.
I have a pull request from Borislav with the fix that came in overnight, so this should be all fixed in rc2.
Linus
Re: bpf+perf is still broken. Was: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 3 lines · Linus Torvalds
I have a pull request from Borislav with the fix that came in overnight, so this should be all fixed in rc2.
.. and now it has moved from my inbox to my -git tree.
Linus
Re: bpf+perf is still broken. Was: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 8 lines · Linus Torvalds
Quoted 3 lines · Linus Torvalds
I have a pull request from Borislav with the fix that came in overnight, so this should be all fixed in rc2.
.. and now it has moved from my inbox to my -git tree.
Great. Thank you.
[tip: perf/urgent] bpf: Fix sample_flags for bpf_perf_event_output
In reply to Sumanth KorikkarThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 21da7472a040420f2dc624ffec70291a72c5d6a6 Gitweb: https://git.kernel.org/tip/21da7472a040420f2dc624ffec70291a72c5d6a6 Author: Sumanth Korikkar <[email protected]> AuthorDate: Fri, 07 Oct 2022 10:13:27 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 17 Oct 2022 16:32:06 +02:00
bpf: Fix sample_flags for bpf_perf_event_output
* Raw data is also filled by bpf_perf_event_output.
* Add sample_flags to indicate raw data.
* This eliminates the segfaults as shown below:
Run ./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)
--- kernel/trace/bpf_trace.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/bpf_trace.c +2 -0
@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);
@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out:
Re: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
In reply to Sumanth KorikkarHello,
The commit that this patch is fixing[1] also causes yet another segfault for 'perf-script' of tracepoint records. For example:
$ sudo timeout 3 perf record -e exceptions:page_fault_user
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.228 MB perf.data (74 samples) ]
$ sudo perf script
Segmentation faultReverting this patch and the original bug commit[1] fixes the issue. I haven't deep dive yet because I'm not familiar with this area. Anybody has any idea about this?
[1] 838d9bb62d13 ("perf: Use sample_flags for raw_data")
Thanks,
SJ
Quoted 38 lines · On Fri, 7 Oct 2022 10:13:27 +0200 Sumanth Korikkar <[email protected]>…
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>--- kernel/trace/bpf_trace.c | 2 ++ 1 file changed, 2 insertions(+)kernel/trace/bpf_trace.c +2
-0@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out:Signature · 1 line
2.36.1
Namhyung Kim
maintainerRe: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Hi SeongJae,
Quoted 13 lines · SeongJae Park
Hello,
The commit that this patch is fixing[1] also causes yet another segfault for 'perf-script' of tracepoint records. For example:
$ sudo timeout 3 perf record -e exceptions:page_fault_user [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.228 MB perf.data (74 samples) ] $ sudo perf script Segmentation fault
Quoted 5 lines
Reverting this patch and the original bug commit[1] fixes the issue. I haven't deep dive yet because I'm not familiar with this area. Anybody has any idea about this?
[1]
838d9bb62d13("perf: Usesample_flagsforraw_data")
Sorry for the trouble. I think you also need to apply the below:
https://lore.kernel.org/r/[email protected]
Thanks,
Namhyung
Quoted 41 lines · On Fri, 7 Oct 2022 10:13:27 +0200 Sumanth Korikkar <[email protected]>…
Quoted 39 lines
* Raw data is also filled by
bpf_perf_event_output.
* Addsample_flagsto indicate raw data.
* This eliminates the segfaults as shown below:
Run./samples/bpf/trace_output
BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 BUG pid 9 cookie 1001000000004 sized 4 Segmentation fault (core dumped)Fixes 838d9bb62d13 ("perf: Use sample_flags for raw_data")Acked-by Namhyung Kim <[email protected]>Signed-off-by Sumanth Korikkar <[email protected]>--- kernel/trace/bpf_trace.c | 2 ++ 1 file changed, 2 insertions(+)kernel/trace/bpf_trace.c +2
-1@@ -687,6 +687,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map,perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; err =__bpf_perf_event_output (regs, map, flags, sd);@@ -745,6 +746,7 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,perf_fetch_caller_regs (regs);perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; + sd->sample_flags |=PERF_SAMPLE_RAW ; ret =__bpf_perf_event_output (regs, map, flags, sd); out: --2.36.1
Re: [PATCH] bpf: fix sample_flags for bpf_perf_event_output
Quoted 16 lines · On Mon, 17 Oct 2022 15:52:15 -0700 Namhyung Kim <[email protected]> wrote:
Hi SeongJae,
Quoted 13 lines · SeongJae Park
Hello,
The commit that this patch is fixing[1] also causes yet another segfault for 'perf-script' of tracepoint records. For example:
$ sudo timeout 3 perf record -e exceptions:page_fault_user [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.228 MB perf.data (74 samples) ] $ sudo perf script Segmentation fault
Quoted 7 lines
Quoted 5 lines
Reverting this patch and the original bug commit[1] fixes the issue. I haven't deep dive yet because I'm not familiar with this area. Anybody has any idea about this?
[1]
838d9bb62d13("perf: Usesample_flagsforraw_data")Sorry for the trouble.
No problem.
Quoted 3 lines
I think you also need to apply the below:
Thank you for this nice answer. I confirmed that this fixes my issue.
Thanks,
SJ
[...]
Re: [tip: perf/core] perf: Use sample_flags for raw_data
In reply to tip-bot2 for Namhyung KimQuoted 19 lines · On 28-Sep-2022, at 12:27 PM, tip-bot2 for Namhyung Kim…
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 838d9bb62d132ec3baf1b5aba2e95ef9a7a9a3cd Gitweb: https://git.kernel.org/tip/838d9bb62d132ec3baf1b5aba2e95ef9a7a9a3cd Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 21 Sep 2022 15:00:32 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 27 Sep 2022 22:50:24 +02:00perf: Use
sample_flagsforraw_dataUse the new
sample_flagsto indicate whether the raw data field is filled by the PMU driver. Although it could check with the NULL, follow the same rule with other fields.
Quoted 6 lines
Remove the raw field from the
perf_sample_data_init()to minimize the number of cache lines touched.Signed-off-by Namhyung Kim <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Hi Namhyung,
This commit ("perf: Use sample_flags for raw_data") added PERF_SAMPLE_RAW check in perf_prepare_sample. To be in sync while we output sample to memory, do we also need to add similar check in perf_output_sample ? I am pasting change below. Please share your thoughts.
From 46d874bc4a915dd710ddbc5198588cbb66d3ea8e Mon Sep 17 00:00:00 2001
From: Athira Rajeev <[email protected]>
Date: Wed, 19 Oct 2022 13:02:06 +0530
Subject: [PATCH] perf/core: Update sample_flags for raw_data in
perf_output_sample
commit 838d9bb62d13 ("perf: Use sample_flags for raw_data") added check for PERF_SAMPLE_RAW in sample_flags in perf_prepare_sample(). But while copying the sample in memory, the check for sample_flags is not added in perf_output_sample(). Fix adds the same in perf_output_sample as well.
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -7099,7 +7099,7 @@ void perf_output_sample(struct perf_output_handle *handle,if (sample_type &PERF_SAMPLE_RAW ) {struct perf_raw_record *raw = data->raw; -if (raw) { +if (raw && (data->sample_flags &PERF_SAMPLE_RAW )) {struct perf_raw_frag *frag = &raw->frag;perf_output_put (handle, raw->size);
Signature · 4 lines
2.31.1 Thanks Athira
Quoted 95 lines
---
arch/s390/kernel/perf_cpum_cf.c | 1 + arch/s390/kernel/perf_pai_crypto.c | 1 + arch/x86/events/amd/ibs.c | 1 + include/linux/perf_event.h | 5 ++--- kernel/events/core.c | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-)arch/s390/kernel/perf_cpum_cf.c +1
-0@@ -664,6 +664,7 @@ static int cfdiag_push_sample(struct perf_event *event, raw.frag.data = cpuhw->stop; raw.size = raw.frag.size; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; } overflow =perf_event_overflow (event, &data, ®s);arch/s390/kernel/perf_pai_crypto.c +1
-0@@ -366,6 +366,7 @@ static int paicrypt_push_sample(void) raw.frag.data = cpump->save; raw.size = raw.frag.size; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; } overflow =perf_event_overflow (event, &data, ®s);arch/x86/events/amd/ibs.c +1
-0@@ -781,6 +781,7 @@ fail: }, }; data.raw = &raw; + data.sample_flags |=PERF_SAMPLE_RAW ; }/* include/linux/perf_event.h +2
-3@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -struct perf_raw_record *raw;u64 period;/* @@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_mem_data_src data_src;u64 txn;u64 addr; +struct perf_raw_record *raw;u64 type;u64 ip;@@ -1078,8 +1078,7 @@ static inline void perf_sample_data_init(struct perf_sample_data *data, u64 addr, u64 period) {/* remaining struct members initialized in perf_prepare_sample() */ - data->sample_flags =0 ; - data->raw =NULL ; + data->sample_flags =PERF_SAMPLE_PERIOD ; data->period = period;if (addr) {kernel/events/core.c +2
-1@@ -7332,7 +7332,7 @@ void perf_prepare_sample(struct perf_event_header *header,struct perf_raw_record *raw = data->raw;int size; -if (raw) { +if (raw && (data->sample_flags &PERF_SAMPLE_RAW )) {struct perf_raw_frag *frag = &raw->frag;u32 sum =0 ;@@ -7348,6 +7348,7 @@ void perf_prepare_sample(struct perf_event_header *header, frag->pad = raw->size - sum; }else { size =sizeof (u64); + data->raw =NULL ; } header->size += size;
Peter Zijlstra
maintainerQuoted 4 lines · Namhyung Kim
Use the new
sample_flagsto indicate whether the addr field is filled by the PMU driver. As most PMU drivers pass 0, it can set the flag only if it has a non-zero value. And use 0 inperf_sample_output()if it's not filled already.
So no objection to the general idea; just a question
Quoted 13 lines
include/linux/perf_event.h +0
-1@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -u64 addr;struct perf_raw_record *raw;u64 period;
include/linux/perf_event.h struct perf_sample_data { · line 1045
Quoted 7 lines
include/linux/perf_event.h +1
-0@@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_sample_weight weight;union perf_mem_data_src data_src;u64 txn; +u64 addr;u64 type;u64 ip;
Is there a reason you placed the variable where you did?
I'm thinking we should look at what perf-tool thinks is the common set of SAMPLE flags and make sure those fields are grouped in as little cachelines as possible.
Things like @ip and @type, which are basically *always* set, should definitely be on top, no?
Namhyung Kim
maintainerHi Peter,
Quoted 27 lines · Peter Zijlstra
Quoted 4 lines · Namhyung Kim
Use the new
sample_flagsto indicate whether the addr field is filled by the PMU driver. As most PMU drivers pass 0, it can set the flag only if it has a non-zero value. And use 0 inperf_sample_output()if it's not filled already.So no objection to the general idea; just a question
Quoted 18 lines
include/linux/perf_event.h +1
-1@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -u64 addr;struct perf_raw_record *raw;u64 period;@@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_sample_weight weight;union perf_mem_data_src data_src;u64 txn; +u64 addr;
Quoted 4 lines
include/linux/perf_event.h struct perf_sample_data { · line 1045
Quoted 2 lines
include/linux/perf_event.h +0
-0u64 type;u64 ip;Is there a reason you placed the variable where you did?
No I just followed the previous change.
Quoted 7 lines
I'm thinking we should look at what perf-tool thinks is the common set of SAMPLE flags and make sure those fields are grouped in as little cachelines as possible.
Things like @ip and @type, which are basically *always* set, should definitely be on top, no?
Yes, you're right. With this change we can move the optional fields and group the common fields on top - like ip, period, pid and so on.
Will send a patch to do the move on top of this, ok?
Thanks,
Namhyung
Namhyung Kim
maintainerPATCH 1/1 perf: Change the layout of perf_sample_data
With recent change, it can set fields only if it's actually used. Change the data layout so that it can have commonly used fields together in a cache line boundary. The main user (the perf tools) sets the IP, TID, TIME, PERIOD always. Also group relevant fields like addr, phys_addr and data_page_size.
--- include/linux/perf_event.h | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-)
include/linux/perf_event.h +17 -18
@@ -1023,25 +1023,13 @@ extern u64 perf_event_read_value(struct perf_event *event,struct perf_sample_data { -/* -* Fields set by perf_sample_data_init(), group so as to -* minimize the cachelines touched. -*/ u64 sample_flags;u64 period; - +u64 type;/* -* The other fields, optionally {set,used} by -* perf_{prepare,output}_sample(). +* Fields set commonly by perf tools, group so as to +* minimize the cachelines touched. */ -struct perf_branch_stack *br_stack; -union perf_sample_weight weight; -union perf_mem_data_src data_src; -u64 txn; -u64 addr; -struct perf_raw_record *raw; - -u64 type;u64 ip;struct {u32 pid;
@@ -1049,22 +1037,33 @@ struct perf_sample_data { } tid_entry;u64 time;u64 id; -u64 stream_id;struct {u32 cpu;u32 reserved; } cpu_entry; + +/* +* The other fields, optionally {set,used} by +* perf_{prepare,output}_sample(). +*/ struct perf_callchain_entry *callchain; -u64 aux_size; +struct perf_raw_record *raw; +struct perf_branch_stack *br_stack; +union perf_sample_weight weight; +union perf_mem_data_src data_src; +u64 txn;struct perf_regs regs_user;struct perf_regs regs_intr;u64 stack_user_size; -u64 phys_addr; +u64 stream_id;u64 cgroup; +u64 addr; +u64 phys_addr;u64 data_page_size;u64 code_page_size; +u64 aux_size; }____cacheline_aligned ;/* default value for data source */
Signature · 1 line
2.37.3.998.g577e59143f-goog
Peter Zijlstra
maintainerQuoted 1 line · Namhyung Kim
Will send a patch to do the move on top of this, ok?
Yes, thanks!
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 7b084630153152239d84990ac4540c2dd360186f Gitweb: https://git.kernel.org/tip/7b084630153152239d84990ac4540c2dd360186f Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 21 Sep 2022 15:00:31 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 27 Sep 2022 22:50:24 +02:00
perf: Use sample_flags for addr
Use the new sample_flags to indicate whether the addr field is filled by the PMU driver. As most PMU drivers pass 0, it can set the flag only if it has a non-zero value. And use 0 in perf_sample_output() if it's not filled already.
--- arch/x86/events/intel/ds.c | 8 ++++++-- include/linux/perf_event.h | 8 ++++++-- kernel/events/core.c | 5 +++++ 3 files changed, 17 insertions(+), 4 deletions(-)
arch/x86/events/intel/ds.c +6 -2
@@ -1621,8 +1621,10 @@ static void setup_pebs_fixed_sample_data(struct perf_event *event,if ((sample_type &PERF_SAMPLE_ADDR_TYPE ) && - x86_pmu.intel_cap.pebs_format >=1 ) + x86_pmu.intel_cap.pebs_format >=1 ) { data->addr = pebs->dla; + data->sample_flags |=PERF_SAMPLE_ADDR ; + }if (x86_pmu.intel_cap.pebs_format >=2 ) {/* Only set the TSX weight when no memory weight. */
@@ -1783,8 +1785,10 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event, data->sample_flags |=PERF_SAMPLE_DATA_SRC ; } -if (sample_type &PERF_SAMPLE_ADDR_TYPE ) +if (sample_type &PERF_SAMPLE_ADDR_TYPE ) { data->addr = meminfo->address; + data->sample_flags |=PERF_SAMPLE_ADDR ; + }if (sample_type &PERF_SAMPLE_TRANSACTION ) { data->txn = intel_get_tsx_transaction(meminfo->tsx_tuning,
include/linux/perf_event.h +6 -2
@@ -1028,7 +1028,6 @@ struct perf_sample_data {* minimize the cachelines touched. */ u64 sample_flags; -u64 addr;struct perf_raw_record *raw;u64 period;
@@ -1040,6 +1039,7 @@ struct perf_sample_data {union perf_sample_weight weight;union perf_mem_data_src data_src;u64 txn; +u64 addr;u64 type;u64 ip;
@@ -1079,9 +1079,13 @@ static inline void perf_sample_data_init(struct perf_sample_data *data, {/* remaining struct members initialized in perf_prepare_sample() */ data->sample_flags =0 ; - data->addr = addr; data->raw =NULL ; data->period = period; + +if (addr) { + data->addr = addr; + data->sample_flags |=PERF_SAMPLE_ADDR ; + } }/*
kernel/events/core.c +5 -0
@@ -7414,6 +7414,11 @@ void perf_prepare_sample(struct perf_event_header *header,if (filtered_sample_type &PERF_SAMPLE_TRANSACTION ) data->txn =0 ; +if (sample_type & (PERF_SAMPLE_ADDR |PERF_SAMPLE_PHYS_ADDR |PERF_SAMPLE_DATA_PAGE_SIZE )) { +if (filtered_sample_type &PERF_SAMPLE_ADDR ) + data->addr =0 ; + } +if (sample_type &PERF_SAMPLE_REGS_INTR ) {/* regs dump ABI info */ int size =sizeof (u64);