Skip to content

Commit 77a27d8

Browse files
committed
sched: Add some KABI padding
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). Add a few more for task_struct. Signed-off-by: Phil Auld <pauld@redhat.com>
1 parent af99dee commit 77a27d8

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
@@ -744,6 +744,7 @@ struct cfs_rq {
744744
struct list_head throttled_csd_list;
745745
#endif /* CONFIG_CFS_BANDWIDTH */
746746
#endif /* CONFIG_FAIR_GROUP_SCHED */
747+
RH_KABI_RESERVE(1)
747748
};
748749

749750
#ifdef CONFIG_SCHED_CLASS_EXT
@@ -784,6 +785,7 @@ struct scx_rq {
784785
struct balance_callback deferred_bal_cb;
785786
struct irq_work deferred_irq_work;
786787
struct irq_work kick_cpus_irq_work;
788+
RH_KABI_RESERVE(1)
787789
};
788790
#endif /* CONFIG_SCHED_CLASS_EXT */
789791

@@ -1012,6 +1014,8 @@ struct root_domain {
10121014
cpumask_var_t rto_mask;
10131015
struct cpupri cpupri;
10141016

1017+
RH_KABI_RESERVE(1)
1018+
10151019
/*
10161020
* NULL-terminated list of performance domains intersecting with the
10171021
* CPUs of the rd. Protected by RCU.
@@ -1288,6 +1292,8 @@ struct rq {
12881292
call_single_data_t cfsb_csd;
12891293
struct list_head cfsb_csd_list;
12901294
#endif
1295+
RH_KABI_RESERVE(1)
1296+
RH_KABI_RESERVE(2)
12911297
};
12921298

12931299
#ifdef CONFIG_FAIR_GROUP_SCHED

0 commit comments

Comments
 (0)