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

!3118 sched: smart grid: check is active in affinity timer 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yipeng Zou <zouyipeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PO46DEFJCVB4UFM3MXETON32HDOVHNZO/ 
 
https://gitee.com/openeuler/kernel/issues/I8KZ3H 
 
Link:https://gitee.com/openeuler/kernel/pulls/3118

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents a350dc6e c342722e

kernel/sched/fair.c

+6 −2
Original line number Diff line number Diff line
@@ -5403,6 +5403,12 @@ static enum hrtimer_restart sched_auto_affi_period_timer(struct hrtimer *timer) 
	}



	raw_spin_lock_irqsave(&auto_affi->lock, flags);

	/* May be re-entrant by stop_auto_affinity, So check again. */

	if (auto_affi->period_active == 0) {

		raw_spin_unlock_irqrestore(&auto_affi->lock, flags);

		return HRTIMER_NORESTART;

	}



	if (util_avg_sum * 100 >= tg_capacity * sysctl_sched_util_low_pct) {

		affinity_domain_up(tg);

	} else if (util_avg_sum * 100 < tg_capacity *
@@ -5496,8 +5502,6 @@ void stop_auto_affinity(struct auto_affinity *auto_affi) 
		mutex_unlock(&smart_grid_used_mutex);

		return;

	}



	hrtimer_cancel(&auto_affi->period_timer);

	auto_affi->period_active = 0;

	auto_affi->mode = 0;

	ad->curr_level = ad->dcount > 0 ? ad->dcount - 1 : 0;