Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH] perf/core: Fix perf_sample_data not properly initialized
 for different swevents in perf_tp_event()
To:     Peter Zijlstra <peterz@infradead.org>
CC:     <mingo@redhat.com>, <acme@kernel.org>, <mark.rutland@arm.com>,
        <alexander.shishkin@linux.intel.com>, <jolsa@kernel.org>,
        <namhyung@kernel.org>, <irogers@google.com>,
        <adrian.hunter@intel.com>, <linux-perf-users@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
References: <20230412095240.181516-1-yangjihong1@huawei.com>
 <20230417114512.GK83892@hirez.programming.kicks-ass.net>
 <15805714-27c0-b8ff-143a-8f768704a673@huawei.com>
 <20230418102545.GX4253@hirez.programming.kicks-ass.net>
From:   Yang Jihong <yangjihong1@huawei.com>
Message-ID: <e01e3e5c-0a48-2394-ac59-2c0541fa181a@huawei.com>
Date:   Wed, 19 Apr 2023 09:47:04 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.6.1
MIME-Version: 1.0
In-Reply-To: <20230418102545.GX4253@hirez.programming.kicks-ass.net>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hello,

On 2023/4/18 18:25, Peter Zijlstra wrote:
> On Tue, Apr 18, 2023 at 09:35:23AM +0800, Yang Jihong wrote:
> 
>>> I'm thinking perhaps those flags that update ->dyn_size are the problem?
>>> At the same time, Should you not also then clear dyn_size?
> 
>> Yes, according to the code, dyn_size should also be cleared.
>> Maybe we need to change it to the following, which would be more
>> appropriate?
>>
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -10144,14 +10144,14 @@ void perf_tp_event(u16 event_type, u64 count, void
>> *record, int entry_size,
>>                  },
>>          };
>>
>> -       perf_sample_data_init(&data, 0, 0);
>> -       perf_sample_save_raw_data(&data, &raw);
>> -
>>          perf_trace_buf_update(record, event_type);
>>
>>          hlist_for_each_entry_rcu(event, head, hlist_entry) {
>> -               if (perf_tp_event_match(event, &data, regs))
>> +               if (perf_tp_event_match(event, &data, regs)) {
>> +                       perf_sample_data_init(&data, 0, 0);
>> +                       perf_sample_save_raw_data(&data, &raw);
>>                          perf_swevent_event(event, count, &data, regs);
>> +               }
>>          }
> 
> That is certainly the safe option. I just went through the list and
> while there's certainly a number of options we'll recompute for naught,
> most of them are indeed either dyn_size or event specific :/
> 
> So yeah, please send the above as v2.
> 
OK, will send v2 according to above fix solution.

Thanks,
Yang.