Unverified Commit 8af60e31 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11784 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/A7NWYS5PJXFQNRDZXUW3JM2UFWUJF6FW/ 
 
https://gitee.com/openeuler/kernel/issues/IAMTVO 
 
Link:https://gitee.com/openeuler/kernel/pulls/11784

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents a7cf5c04 4b1bd46a

arch/x86/events/core.c

+5 −0
Original line number Diff line number Diff line
@@ -2529,6 +2529,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;
@@ -2542,6 +2543,8 @@ static ssize_t set_attr_rdpmc(struct device *cdev, 
	if (x86_pmu.attr_rdpmc_broken)

		return -ENOTSUPP;



	mutex_lock(&rdpmc_mutex);



	if (val != x86_pmu.attr_rdpmc) {

		/*

		 * Changing into or out of never available or always available,
@@ -2562,6 +2565,8 @@ static ssize_t set_attr_rdpmc(struct device *cdev, 
		x86_pmu.attr_rdpmc = val;

	}



	mutex_unlock(&rdpmc_mutex);



	return count;

}