Skip to content

Commit 7b1d267

Browse files
author
CKI KWF Bot
committed
Merge: sched: Add some KABI padding
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1580 JIRA: https://issues.redhat.com/browse/RHEL-114238 Upstream Status: RHEL Only Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1424 Add a bit of KABI padding to help potential z-stream fixes. We are doing a smaller collection than had been done in the past due to the new KABI restrictions. Only a handful have been used in RHEL9 so far. This set hits some of the structures that seem most likely to have potential changes due to active developement (sched_ext, eevdf etc). Signed-off-by: Phil Auld <pauld@redhat.com> Approved-by: Marc Milgram <mmilgram@redhat.com> Approved-by: Waiman Long <longman@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents e56c441 + 77a27d8 commit 7b1d267

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

include/linux/sched.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,9 @@ struct sched_entity {
611611
* collide with read-mostly values above.
612612
*/
613613
struct sched_avg avg;
614+
615+
RH_KABI_RESERVE(1)
616+
RH_KABI_RESERVE(2)
614617
};
615618

616619
struct sched_rt_entity {
@@ -1637,6 +1640,11 @@ struct task_struct {
16371640
struct user_event_mm *user_event_mm;
16381641
#endif
16391642

1643+
RH_KABI_RESERVE(1)
1644+
RH_KABI_RESERVE(2)
1645+
RH_KABI_RESERVE(3)
1646+
RH_KABI_RESERVE(4)
1647+
16401648
/*
16411649
* New fields for task_struct should be added above here, so that
16421650
* they are included in the randomized portion of task_struct.

kernel/sched/sched.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ struct cfs_rq {
741741
struct list_head throttled_csd_list;
742742
#endif /* CONFIG_CFS_BANDWIDTH */
743743
#endif /* CONFIG_FAIR_GROUP_SCHED */
744+
RH_KABI_RESERVE(1)
744745
};
745746

746747
#ifdef CONFIG_SCHED_CLASS_EXT
@@ -781,6 +782,7 @@ struct scx_rq {
781782
struct balance_callback deferred_bal_cb;
782783
struct irq_work deferred_irq_work;
783784
struct irq_work kick_cpus_irq_work;
785+
RH_KABI_RESERVE(1)
784786
};
785787
#endif /* CONFIG_SCHED_CLASS_EXT */
786788

@@ -1009,6 +1011,8 @@ struct root_domain {
10091011
cpumask_var_t rto_mask;
10101012
struct cpupri cpupri;
10111013

1014+
RH_KABI_RESERVE(1)
1015+
10121016
/*
10131017
* NULL-terminated list of performance domains intersecting with the
10141018
* CPUs of the rd. Protected by RCU.
@@ -1285,6 +1289,8 @@ struct rq {
12851289
call_single_data_t cfsb_csd;
12861290
struct list_head cfsb_csd_list;
12871291
#endif
1292+
RH_KABI_RESERVE(1)
1293+
RH_KABI_RESERVE(2)
12881294
};
12891295

12901296
#ifdef CONFIG_FAIR_GROUP_SCHED

0 commit comments

Comments
 (0)