Unverified Commit 14558c56 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11785 perf/x86: Serialize set_attr_rdpmc() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NOXEPPJ3ZNMXZFAI43Z3EWKUQNN3XC4Q/ 
 
https://gitee.com/openeuler/kernel/issues/IASLM9 
 
Link:https://gitee.com/openeuler/kernel/pulls/11785

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 5c63bd0f 246e562a

arch/x86/events/core.c

+5 −0
Original line number Diff line number Diff line
@@ -2235,6 +2235,7 @@ static ssize_t set_attr_rdpmc(struct device *cdev, 
			      struct device_attribute *attr,

			      const char *buf, size_t count)

{

	static DEFINE_MUTEX(rdpmc_mutex);

	unsigned long val;

	ssize_t ret;
@@ -2248,6 +2249,8 @@ static ssize_t set_attr_rdpmc(struct device *cdev, 
	if (x86_pmu.attr_rdpmc_broken)

		return -ENOTSUPP;



	mutex_lock(&rdpmc_mutex);



	if ((val == 2) != (x86_pmu.attr_rdpmc == 2)) {

		/*

		 * Changing into or out of always available, aka
@@ -2263,6 +2266,8 @@ static ssize_t set_attr_rdpmc(struct device *cdev, 


	x86_pmu.attr_rdpmc = val;



	mutex_unlock(&rdpmc_mutex);



	return count;

}