[PATCH OLK-6.6 0/2] resolve hungtask
*** BLURB HERE *** Chen Jinghuang (1): sched: Fix struct sched_entity kabi broken Ingo Molnar (1): sched/fair: Separate se->vlag from se->vprot include/linux/sched.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) -- 2.34.1
From: Ingo Molnar <mingo@kernel.org> mainline inclusion from mainline-v7.0-rc1 commit 80390ead2080071cbd6f427ff8deb94d10a4a50f category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/10165 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... -------------------------------- There's no real space concerns here and keeping these fields in a union makes reading (and tracing) the scheduler code harder. Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://patch.msgid.link/20251201064647.1851919-4-mingo@kernel.org Conflicts: include/linux/sched.h [a trival context conflict about kabi] Signed-off-by: Chen Jinghuang <chenjinghuang2@huawei.com> --- include/linux/sched.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index c7229faef4c7..639851dbd85e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -595,18 +595,10 @@ struct sched_entity { u64 sum_exec_runtime; u64 prev_sum_exec_runtime; u64 vruntime; - KABI_BROKEN_REPLACE( - s64 vlag, - union { - /* - * When !@on_rq this field is vlag. - * When cfs_rq->curr == se (which implies @on_rq) - * this field is vprot. See protect_slice(). - */ - s64 vlag; - u64 vprot; - } - ) + /* Approximated virtual lag: */ + s64 vlag; + /* 'Protected' deadline, to give out minimum quantums: */ + u64 vprot; u64 slice; u64 nr_migrations; -- 2.34.1
hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/10165 -------------------------------- Fixes: e943e5c2a5d1 ("sched/fair: Separate se->vlag from se->vprot") Signed-off-by: Chen Jinghuang <chenjinghuang2@huawei.com> --- include/linux/sched.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 639851dbd85e..374d611befee 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -597,8 +597,6 @@ struct sched_entity { u64 vruntime; /* Approximated virtual lag: */ s64 vlag; - /* 'Protected' deadline, to give out minimum quantums: */ - u64 vprot; u64 slice; u64 nr_migrations; @@ -625,7 +623,8 @@ struct sched_entity { #endif KABI_USE(1, u64 min_slice) KABI_USE(2, u64 max_slice) - KABI_RESERVE(3) + /* 'Protected' deadline, to give out minimum quantums: */ + KABI_USE(3, u64 vprot) KABI_RESERVE(4) }; -- 2.34.1
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://atomgit.com/openeuler/kernel/merge_requests/30041 邮件列表地址：https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/6TL... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://atomgit.com/openeuler/kernel/merge_requests/30041 Mailing list address: https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/6TL...
participants (2)
-
Chen Jinghuang -
patchwork bot