提交 c0f17a99 编写于 作者: S Songping Yu 提交者: Yongqiang Liu

Revert "sched: Reinit task's vruntime if a task sleep over 200 days"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6TE76
CVE: NA

--------------------------------

This reverts commit 3a44e838.
Signed-off-by: NSongping Yu <yusongping@huawei.com>
Reviewed-by: NZhang Qiao <zhangqiao22@huawei.com>
Reviewed-by: Nchenhui <judy.chenhui@huawei.com>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>
上级 88466df5
...@@ -3949,14 +3949,10 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se) ...@@ -3949,14 +3949,10 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
#endif #endif
} }
/* The threshold when the wakee's vruntime should be set cfs_rq->min_vruntime, default: 200 days */
#define WAKEUP_REINIT_THRESHOLD_NS (200 * 24 * 3600 * NSEC_PER_SEC)
static void static void
place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
{ {
u64 vruntime = cfs_rq->min_vruntime; u64 vruntime = cfs_rq->min_vruntime;
struct rq *rq = rq_of(cfs_rq);
/* /*
* The 'current' period is already promised to the current tasks, * The 'current' period is already promised to the current tasks,
...@@ -3981,9 +3977,6 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) ...@@ -3981,9 +3977,6 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
vruntime -= thresh; vruntime -= thresh;
} }
if (unlikely(!initial && (s64)(rq_clock_task(rq) - se->exec_start) > WAKEUP_REINIT_THRESHOLD_NS))
se->vruntime = vruntime;
else
/* ensure we never gain time by being placed backwards. */ /* ensure we never gain time by being placed backwards. */
se->vruntime = max_vruntime(se->vruntime, vruntime); se->vruntime = max_vruntime(se->vruntime, vruntime);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册