Received-SPF: pass (google.com: domain of linux-kernel+bounces-120396-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <894d480c-5785-4896-bb79-9560611347cb@linux.intel.com>
Date: Wed, 27 Mar 2024 14:43:54 +0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [kvm-unit-tests Patch v3 03/11] x86: pmu: Add asserts to warn
 inconsistent fixed events and counters
Content-Language: en-US
To: Mingwei Zhang <mizhang@google.com>
Cc: Sean Christopherson <seanjc@google.com>,
 Paolo Bonzini <pbonzini@redhat.com>, Jim Mattson <jmattson@google.com>,
 kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
 Zhenyu Wang <zhenyuw@linux.intel.com>, Zhang Xiong
 <xiong.y.zhang@intel.com>, Like Xu <like.xu.linux@gmail.com>,
 Jinrong Liang <cloudliang@tencent.com>, Dapeng Mi <dapeng1.mi@intel.com>
References: <20240103031409.2504051-1-dapeng1.mi@linux.intel.com>
 <20240103031409.2504051-4-dapeng1.mi@linux.intel.com>
 <ZgOu5PP2qXhbflRc@google.com>
From: "Mi, Dapeng" <dapeng1.mi@linux.intel.com>
In-Reply-To: <ZgOu5PP2qXhbflRc@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit


On 3/27/2024 1:30 PM, Mingwei Zhang wrote:
> On Wed, Jan 03, 2024, Dapeng Mi wrote:
>> Current PMU code deosn't check whether PMU fixed counter number is
>> larger than pre-defined fixed events. If so, it would cause memory
>> access out of range.
>>
>> So add assert to warn this invalid case.
>>
>> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
> Reviewed-by: Mingwei Zhang <mizhang@google.com>
>> ---
>>   x86/pmu.c | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/x86/pmu.c b/x86/pmu.c
>> index a13b8a8398c6..a42fff8d8b36 100644
>> --- a/x86/pmu.c
>> +++ b/x86/pmu.c
>> @@ -111,8 +111,12 @@ static struct pmu_event* get_counter_event(pmu_counter_t *cnt)
>>   		for (i = 0; i < gp_events_size; i++)
>>   			if (gp_events[i].unit_sel == (cnt->config & 0xffff))
>>   				return &gp_events[i];
>> -	} else
>> -		return &fixed_events[cnt->ctr - MSR_CORE_PERF_FIXED_CTR0];
>> +	} else {
>> +		int idx = cnt->ctr - MSR_CORE_PERF_FIXED_CTR0;
> maybe unsigned int is better?

Make sense. Thanks for review.

>> +
>> +		assert(idx < ARRAY_SIZE(fixed_events));
>> +		return &fixed_events[idx];
>> +	}
>>   
>>   	return (void*)0;
>>   }
>> @@ -245,6 +249,7 @@ static void check_fixed_counters(void)
>>   	};
>>   	int i;
>>   
>> +	assert(pmu.nr_fixed_counters <= ARRAY_SIZE(fixed_events));
>>   	for (i = 0; i < pmu.nr_fixed_counters; i++) {
>>   		cnt.ctr = fixed_events[i].unit_sel;
>>   		measure_one(&cnt);
>> @@ -266,6 +271,7 @@ static void check_counters_many(void)
>>   			gp_events[i % gp_events_size].unit_sel;
>>   		n++;
>>   	}
>> +	assert(pmu.nr_fixed_counters <= ARRAY_SIZE(fixed_events));
>>   	for (i = 0; i < pmu.nr_fixed_counters; i++) {
>>   		cnt[n].ctr = fixed_events[i].unit_sel;
>>   		cnt[n].config = EVNTSEL_OS | EVNTSEL_USR;
>> -- 
>> 2.34.1
>>