* [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
@ 2022-10-20 7:06 ` Athira Rajeev
0 siblings, 0 replies; 8+ messages in thread
From: Athira Rajeev @ 2022-10-20 7:06 UTC (permalink / raw)
To: peterz, acme, jolsa, namhyung
Cc: irogers, james.clark, mpe, linux-kernel, linux-perf-users,
linuxppc-dev, maddy, rnsastry, kjain, disgoel
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.
Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4ec3717003d5..daf387c75d33 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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);
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
@ 2022-10-20 7:06 ` Athira Rajeev
0 siblings, 0 replies; 8+ messages in thread
From: Athira Rajeev @ 2022-10-20 7:06 UTC (permalink / raw)
To: peterz, acme, jolsa, namhyung
Cc: irogers, maddy, rnsastry, linux-kernel, linux-perf-users,
james.clark, kjain, disgoel, linuxppc-dev
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.
Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4ec3717003d5..daf387c75d33 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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);
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
2022-10-20 7:06 ` Athira Rajeev
@ 2022-10-20 7:06 ` Athira Rajeev
-1 siblings, 0 replies; 8+ messages in thread
From: Athira Rajeev @ 2022-10-20 7:06 UTC (permalink / raw)
To: peterz, acme, jolsa, namhyung
Cc: irogers, james.clark, mpe, linux-kernel, linux-perf-users,
linuxppc-dev, maddy, rnsastry, kjain, disgoel
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.
Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4ec3717003d5..daf387c75d33 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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);
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
@ 2022-10-20 7:06 ` Athira Rajeev
0 siblings, 0 replies; 8+ messages in thread
From: Athira Rajeev @ 2022-10-20 7:06 UTC (permalink / raw)
To: peterz, acme, jolsa, namhyung
Cc: irogers, maddy, rnsastry, linux-kernel, linux-perf-users,
james.clark, kjain, disgoel, linuxppc-dev
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.
Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4ec3717003d5..daf387c75d33 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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);
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
2022-10-20 7:06 ` Athira Rajeev
@ 2022-10-20 14:40 ` Peter Zijlstra
-1 siblings, 0 replies; 8+ messages in thread
From: Peter Zijlstra @ 2022-10-20 14:40 UTC (permalink / raw)
To: Athira Rajeev
Cc: acme, jolsa, namhyung, irogers, james.clark, mpe, linux-kernel,
linux-perf-users, linuxppc-dev, maddy, rnsastry, kjain, disgoel
On Thu, Oct 20, 2022 at 12:36:56PM +0530, Athira Rajeev wrote:
> 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.
>
> Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
> ---
> kernel/events/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 4ec3717003d5..daf387c75d33 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -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);
Urgh.. something smells here. We already did a PERF_SAMPLE_RAW test.
And perf_prepare_sample() explicitly makes data->raw be NULL when not
set earlier.
So what's going wrong?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
@ 2022-10-20 14:40 ` Peter Zijlstra
0 siblings, 0 replies; 8+ messages in thread
From: Peter Zijlstra @ 2022-10-20 14:40 UTC (permalink / raw)
To: Athira Rajeev
Cc: irogers, maddy, rnsastry, linux-kernel, acme, linux-perf-users,
james.clark, jolsa, kjain, namhyung, disgoel, linuxppc-dev
On Thu, Oct 20, 2022 at 12:36:56PM +0530, Athira Rajeev wrote:
> 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.
>
> Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
> ---
> kernel/events/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 4ec3717003d5..daf387c75d33 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -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);
Urgh.. something smells here. We already did a PERF_SAMPLE_RAW test.
And perf_prepare_sample() explicitly makes data->raw be NULL when not
set earlier.
So what's going wrong?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
2022-10-20 14:40 ` Peter Zijlstra
@ 2022-11-02 8:19 ` Athira Rajeev
-1 siblings, 0 replies; 8+ messages in thread
From: Athira Rajeev @ 2022-11-02 8:19 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ian Rogers, Madhavan Srinivasan, Nageswara Sastry, LKML,
Arnaldo Carvalho de Melo, linux-perf-users, James Clark,
Jiri Olsa, Kajol Jain, Namhyung Kim, disgoel, linuxppc-dev
> On 20-Oct-2022, at 8:10 PM, Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Thu, Oct 20, 2022 at 12:36:56PM +0530, Athira Rajeev wrote:
>> 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.
>>
>> Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
>> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
>> ---
>> kernel/events/core.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/events/core.c b/kernel/events/core.c
>> index 4ec3717003d5..daf387c75d33 100644
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -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);
>
> Urgh.. something smells here. We already did a PERF_SAMPLE_RAW test.
>
> And perf_prepare_sample() explicitly makes data->raw be NULL when not
> set earlier.
>
> So what's going wrong?
Hi Peter,
Sorry for late response. I was out on vacation couple of days.
I didn't hit any specific issue or fail with current code. But patch intention was
to keep the perf_prepare_sample and perf_output_sample to be in sync with the checks that we
are doing.
Thanks
Athira
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample
@ 2022-11-02 8:19 ` Athira Rajeev
0 siblings, 0 replies; 8+ messages in thread
From: Athira Rajeev @ 2022-11-02 8:19 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ian Rogers, Madhavan Srinivasan, Nageswara Sastry, Kajol Jain,
LKML, Arnaldo Carvalho de Melo, linux-perf-users, James Clark,
Jiri Olsa, Namhyung Kim, disgoel, linuxppc-dev
> On 20-Oct-2022, at 8:10 PM, Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Thu, Oct 20, 2022 at 12:36:56PM +0530, Athira Rajeev wrote:
>> 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.
>>
>> Fixes: 838d9bb62d13 ("perf: Use sample_flags for raw_data")
>> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
>> ---
>> kernel/events/core.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/events/core.c b/kernel/events/core.c
>> index 4ec3717003d5..daf387c75d33 100644
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -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);
>
> Urgh.. something smells here. We already did a PERF_SAMPLE_RAW test.
>
> And perf_prepare_sample() explicitly makes data->raw be NULL when not
> set earlier.
>
> So what's going wrong?
Hi Peter,
Sorry for late response. I was out on vacation couple of days.
I didn't hit any specific issue or fail with current code. But patch intention was
to keep the perf_prepare_sample and perf_output_sample to be in sync with the checks that we
are doing.
Thanks
Athira
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-11-02 8:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-20 7:06 [PATCH] [perf/core: Update sample_flags for raw_data in perf_output_sample Athira Rajeev
2022-10-20 7:06 ` Athira Rajeev
2022-10-20 7:06 ` Athira Rajeev
2022-10-20 7:06 ` Athira Rajeev
2022-10-20 14:40 ` Peter Zijlstra
2022-10-20 14:40 ` Peter Zijlstra
2022-11-02 8:19 ` Athira Rajeev
2022-11-02 8:19 ` Athira Rajeev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.