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

!14891 s390/cpum_sf: Handle CPU hotplug remove during sampling 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BAWHFJLGCX7NP2JKPAYRAVHDEX3E5BXC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBI7GX 
 
Link:https://gitee.com/openeuler/kernel/pulls/14891

 

Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 938bb38a 31ee40d0

arch/s390/kernel/perf_cpum_sf.c

+3 −1
Original line number Diff line number Diff line
@@ -1900,6 +1900,8 @@ static void cpumsf_pmu_stop(struct perf_event *event, int flags) 
	event->hw.state |= PERF_HES_STOPPED;



	if ((flags & PERF_EF_UPDATE) && !(event->hw.state & PERF_HES_UPTODATE)) {

		/* CPU hotplug off removes SDBs. No samples to extract. */

		if (cpuhw->flags & PMU_F_RESERVED)

			hw_perf_event_update(event, 1);

		event->hw.state |= PERF_HES_UPTODATE;

	}