mirrors
/
anolis-cloud-kernel
mirror of https://gitee.com/anolis/cloud-kernel.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

anolis: kabi: Replace hotfix reserve macros with KABI reserve macros 

ANBZ: #3879

Unify hotfix reserve macros and KABI reserve macros, now KABI reserve
macros are used for both KABI and hotfix.

Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Reviewed-by: Xunlei Pang <xlpang@linux.alibaba.com>
Link: https://gitee.com/anolis/cloud-kernel/pulls/1087
This commit is contained in:
Guixin Liu 2023-01-31 16:34:20 +08:00 committed by 小龙
parent 04254695b6
commit a027e85f84
33 changed files with 306 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/backing-dev-defs.h
View File

@ -163,8 +163,8 @@ struct bdi_writeback {
};
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
struct backing_dev_info {
@ -204,8 +204,8 @@ struct backing_dev_info {
struct dentry *debug_dir;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
enum {

4
include/linux/bio.h
View File

@ -710,8 +710,8 @@ struct bio_set {
struct work_struct rescue_work;
struct workqueue_struct *rescue_workqueue;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
struct biovec_slab {

13
include/linux/blk-cgroup.h
View File

@ -25,6 +25,7 @@
#include <linux/kthread.h>
#include <linux/fs.h>
#include <linux/blk-mq.h>
#include <linux/ck_kabi.h>
/* percpu_counter batch for blkg_[rw]stats, per-cpu drift doesn't matter */
#define BLKG_STAT_CPU_BATCH (INT_MAX / 2)
@ -60,10 +61,10 @@ struct blkcg {
struct list_head cgwb_list;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
struct blkg_iostat {
@ -176,8 +177,8 @@ struct blkcg_policy {
blkcg_pol_reset_pd_stats_fn *pd_reset_stats_fn;
blkcg_pol_stat_pd_fn *pd_stat_fn;
CK_HOTFIX_RESERVE_P(1)
CK_HOTFIX_RESERVE_P(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
extern struct blkcg blkcg_root;

22
include/linux/blk-mq.h
View File

@ -174,10 +174,10 @@ struct blk_mq_hw_ctx {
*/
struct list_head hctx_list;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
/**
* @srcu: Sleepable RCU. Use as lock when type of the hardware queue is
@ -272,10 +272,10 @@ struct blk_mq_tag_set {
struct mutex tag_list_lock;
struct list_head tag_list;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
/**
@ -288,7 +288,7 @@ struct blk_mq_queue_data {
struct request *rq;
bool last;
CK_HOTFIX_RESERVE(1)
CK_KABI_RESERVE(1)
};
typedef bool (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *,
@ -399,8 +399,8 @@ struct blk_mq_ops {
void (*show_rq)(struct seq_file *m, struct request *rq);
#endif
CK_HOTFIX_RESERVE_P(1)
CK_HOTFIX_RESERVE_P(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
enum {

10
include/linux/blk_types.h
View File

@ -11,7 +11,7 @@
#include <linux/ktime.h>
#include <linux/sched/clock.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
struct bio_set;
struct bio;
@ -50,8 +50,8 @@ struct block_device {
/* Mutex for freeze */
struct mutex bd_fsfreeze_mutex;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
} __randomize_layout;
/*
@ -271,8 +271,8 @@ struct bio {
unsigned long bi_ext_flags; /* extend the bi_flags */
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
/*
* We can inline a number of vecs at the end of the bio, to avoid

12
include/linux/blkdev.h
View File

@ -355,8 +355,8 @@ struct queue_limits {
unsigned char raid_partial_stripes_expensive;
enum blk_zoned_model zoned;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx,
@ -607,10 +607,10 @@ struct request_queue {
#define BLK_MAX_WRITE_HINTS 5
u64 write_hints[BLK_MAX_WRITE_HINTS];
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
/* Keep blk_queue_flag_name[] in sync with the definitions below */

16
include/linux/bpf.h
View File

@ -175,10 +175,10 @@ struct bpf_map {
struct mutex freeze_mutex;
atomic64_t writecnt;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
static inline bool map_value_has_spin_lock(const struct bpf_map *map)
@ -915,10 +915,10 @@ struct bpf_prog_aux {
struct rcu_head rcu;
};
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
struct bpf_array_aux {

16
include/linux/cgroup-defs.h
View File

@ -199,8 +199,8 @@ struct cgroup_subsys_state {
struct work_struct destroy_work;
struct rcu_work destroy_rwork;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
/*
* PI: the parent css. Placed here for cache proximity to following
@ -305,8 +305,8 @@ struct css_set {
/* For RCU-protected deletion */
struct rcu_head rcu_head;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
struct cgroup_base_stat {
@ -552,8 +552,8 @@ struct cgroup_root {
/* Hierarchy-specific flags */
unsigned int flags;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
/* The path to use for release notifications. */
char release_agent_path[PATH_MAX];
@ -681,8 +681,8 @@ struct cgroup_subsys {
void (*release)(struct task_struct *task);
void (*bind)(struct cgroup_subsys_state *root_css);
CK_HOTFIX_RESERVE_P(1)
CK_HOTFIX_RESERVE_P(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
bool early_init:1;

54
include/linux/ck_hotfix.h
View File

@ -1,54 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0
*
* Copyright (c) 2019 Xunlei Pang <xlpang@linux.alibaba.com>
*/
#ifndef _LINUX_CK_HOTFIX_H
#define _LINUX_CK_HOTFIX_H
#include <linux/compiler.h>
/*
* CK_HOTFIX_RESERVE* - reserve fields for core structures prone to change
* CK_HOTFIX_USE* - use the reserved field in your hotfix
* CK_HOTFIX_REPLACE - replacement of _orig with a union of _orig and _new
*/
#define _CK_HOTFIX_REPLACE(_orig, _new) \
union { \
_new; \
struct { \
_orig; \
} __UNIQUE_ID(ck_hotfix_hide); \
}
#define CK_HOTFIX_REPLACE(_orig, _new) _CK_HOTFIX_REPLACE(_orig, _new);
/*
* We tried to standardize on ck kernel reserved names. These wrappers leverage
* those common names making it easier to read and find in the code.
*/
#define _CK_HOTFIX_RESERVE(n) unsigned long ck_reserved##n
#define _CK_HOTFIX_RESERVE_P(n) void (*ck_reserved##n)(void)
#define CK_HOTFIX_RESERVE(n) _CK_HOTFIX_RESERVE(n);
#define CK_HOTFIX_RESERVE_P(n) _CK_HOTFIX_RESERVE_P(n);
/*
* Wrappers to replace standard ck kernel reserved elements.
*/
#define CK_HOTFIX_USE(n, _new) \
CK_HOTFIX_REPLACE(_CK_HOTFIX_RESERVE(n), _new)
#define CK_HOTFIX_USE_P(n, _new) \
CK_HOTFIX_REPLACE(_CK_HOTFIX_RESERVE_P(n), _new)
/*
* Macros for breaking up a reserved element into two smaller chunks using an
* anonymous struct inside an anonymous union.
*/
#define CK_HOTFIX_USE2(n, _new1, _new2) \
CK_HOTFIX_REPLACE(_CK_HOTFIX_RESERVE(n), struct{ _new1; _new2; })
#define CK_HOTFIX_USE2_P(n, _new1, _new2) \
CK_HOTFIX_REPLACE(_CK_HOTFIX_RESERVE_P(n), struct{ _new1; _new2; })
#endif /* _LINUX_CK_HOTFIX_H */

4
include/linux/elevator.h
View File

@ -51,8 +51,8 @@ struct elevator_mq_ops {
void (*init_icq)(struct io_cq *);
void (*exit_icq)(struct io_cq *);
CK_HOTFIX_RESERVE_P(1)
CK_HOTFIX_RESERVE_P(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
#define ELV_NAME_MAX (16)

8
include/linux/filter.h
View File

@ -560,10 +560,10 @@ struct bpf_prog {
unsigned int (*bpf_func)(const void *ctx,
const struct bpf_insn *insn);
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
/* Instructions for interpreter */
struct sock_filter insns[0];

4
include/linux/fs.h
View File

@ -474,8 +474,8 @@ struct address_space {
struct list_head private_list;
void *private_data;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
} __attribute__((aligned(sizeof(long)))) __randomize_layout;
/*
* On most architectures that alignment is already the case; but

10
include/linux/genhd.h
View File

@ -4,7 +4,7 @@
/*
* genhd.h Copyright (C) 1992 Drew Eckhardt
* Generic hard disk header file by
* Generic hard disk header file by
* Drew Eckhardt
*
* <drew@colorado.edu>
@ -74,8 +74,8 @@ struct hd_struct {
#endif
struct rcu_work rcu_work;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
/**
@ -212,8 +212,8 @@ struct gendisk {
struct badblocks *bb;
struct lockdep_map lockdep_map;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
#if IS_REACHABLE(CONFIG_CDROM)

20
include/linux/memcontrol.h
View File

@ -220,10 +220,10 @@ struct reclaim_coldpgs_control {
unsigned long size;
unsigned long flags;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
enum reclaim_coldpgs_stat_item {
@ -245,8 +245,8 @@ enum reclaim_coldpgs_stat_item {
struct reclaim_coldpgs_stats {
unsigned long counts[RECLAIM_COLDPGS_STAT_MAX];
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
#endif /* CONFIG_RECLAIM_COLDPGS */
@ -474,10 +474,10 @@ struct mem_cgroup {
unsigned long fast_copy_mm;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
struct mem_cgroup_per_node *nodeinfo[0];
/* WARNING: nodeinfo must be the last member here */

4
include/linux/mm.h
View File

@ -627,8 +627,8 @@ struct vm_operations_struct {
struct page *(*find_special_page)(struct vm_area_struct *vma,
unsigned long addr);
CK_HOTFIX_RESERVE_P(1)
CK_HOTFIX_RESERVE_P(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
static inline void vma_init(struct vm_area_struct *vma, struct mm_struct *mm)

14
include/linux/mm_types.h
View File

@ -18,7 +18,7 @@
#include <asm/mmu.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
#ifndef AT_VECTOR_SIZE_ARCH
#define AT_VECTOR_SIZE_ARCH 0
@ -384,10 +384,10 @@ struct vm_area_struct {
struct vm_area_struct *fcm_vma;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
} __randomize_layout;
struct core_thread {
@ -600,8 +600,8 @@ struct mm_struct {
#endif
} __randomize_layout;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
/*
* The mm_cpumask needs to be at the end of mm_struct, because it

10
include/linux/mmzone.h
View File

@ -22,7 +22,7 @@
#include <linux/page-flags.h>
#include <asm/page.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
/* Free memory management - zoned buddy allocator. */
#ifndef CONFIG_FORCE_MAX_ZONEORDER
@ -614,8 +614,8 @@ struct zone {
atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
atomic_long_t vm_numa_stat[NR_VM_NUMA_STAT_ITEMS];
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
} ____cacheline_internodealigned_in_smp;
enum pgdat_flags {
@ -870,8 +870,8 @@ typedef struct pglist_data {
struct per_cpu_nodestat __percpu *per_cpu_nodestats;
atomic_long_t vm_stat[NR_VM_NODE_STAT_ITEMS];
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
} pg_data_t;
#define node_present_pages(nid) (NODE_DATA(nid)->node_present_pages)

6
include/linux/netdevice.h
View File

@ -49,7 +49,7 @@
#include <uapi/linux/pkt_cls.h>
#include <linux/hashtable.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
struct netpoll_info;
struct device;
@ -1484,8 +1484,8 @@ struct net_device_ops {
struct ip_tunnel_parm *p, int cmd);
struct net_device * (*ndo_get_peer_dev)(struct net_device *dev);
CK_HOTFIX_RESERVE_P(1)
CK_HOTFIX_RESERVE_P(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
/**

6
include/linux/netfilter/x_tables.h
View File

@ -8,7 +8,7 @@
#include <linux/netfilter.h>
#include <uapi/linux/netfilter/x_tables.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
/* Test a struct->invflags and a boolean for inequality */
#define NF_INVF(ptr, flag, boolean) \
@ -220,8 +220,8 @@ struct xt_target {
unsigned short family;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
/* Furniture shopping... */

130
include/linux/sched.h
View File

@ -35,7 +35,7 @@
#include <linux/seqlock.h>
#include <linux/kcsan.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
/* task_struct member predeclarations (sorted alphabetically): */
struct audit_context;
@ -316,14 +316,14 @@ struct sched_info {
/* When were we last queued to run? */
unsigned long long last_queued;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
#endif /* CONFIG_SCHED_INFO */
};
@ -345,14 +345,14 @@ struct load_weight {
unsigned long weight;
u32 inv_weight;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
/**
@ -447,14 +447,14 @@ struct sched_avg {
unsigned long util_avg;
struct util_est util_est;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
} ____cacheline_aligned;
struct sched_statistics {
@ -496,14 +496,14 @@ struct sched_statistics {
u64 nr_wakeups_passive;
u64 nr_wakeups_idle;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
#endif
};
@ -565,14 +565,14 @@ struct sched_entity {
struct sched_avg avg;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
struct sched_rt_entity {
@ -592,14 +592,14 @@ struct sched_rt_entity {
struct rt_rq *my_q;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
} __randomize_layout;
struct sched_dl_entity {
@ -678,14 +678,14 @@ struct sched_dl_entity {
struct sched_dl_entity *pi_se;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
#ifdef CONFIG_UCLAMP_TASK
@ -1468,14 +1468,14 @@ struct task_struct {
int mce_count;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
/*
* New fields for task_struct should be added above here, so that

4
include/linux/sched/signal.h
View File

@ -235,8 +235,8 @@ struct signal_struct {
* and may have inconsistent
* permissions.
*/
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
} __randomize_layout;
/*

32
include/linux/sched/topology.h
View File

@ -75,14 +75,14 @@ struct sched_domain_shared {
atomic_t nr_busy_cpus;
int has_idle_cores;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
struct sched_domain {
@ -154,14 +154,14 @@ struct sched_domain {
unsigned int span_weight;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
/*
* Span of all CPUs in this domain.

2
include/linux/skbuff.h
View File

@ -914,7 +914,7 @@ struct sk_buff {
__u32 headers_end[0];
/* public: */
CK_HOTFIX_RESERVE(1)
CK_KABI_RESERVE(1)
/* These elements must be at the end, see alloc_skb() for details. */
sk_buff_data_t tail;

6
include/linux/timer.h
View File

@ -8,7 +8,7 @@
#include <linux/debugobjects.h>
#include <linux/stringify.h>
#include <linux/ck_hotfix.h>
#include <linux/ck_kabi.h>
struct timer_list {
/*
@ -24,8 +24,8 @@ struct timer_list {
struct lockdep_map lockdep_map;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
#ifdef CONFIG_LOCKDEP

6
include/linux/writeback.h
View File

@ -93,8 +93,8 @@ struct writeback_control {
size_t wb_tcand_bytes; /* bytes written by this candidate */
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
static inline int wbc_to_write_flags(struct writeback_control *wbc)
@ -189,7 +189,7 @@ static inline void wb_domain_size_changed(struct wb_domain *dom)
/*
* fs/fs-writeback.c
*/
*/
struct bdi_writeback;
void writeback_inodes_sb(struct super_block *, enum wb_reason reason);
void writeback_inodes_sb_nr(struct super_block *, unsigned long nr,

2
include/net/dst.h
View File

@ -77,7 +77,7 @@ struct dst_entry {
atomic_t __refcnt; /* 32-bit offset 64 */
#endif
CK_HOTFIX_RESERVE(1)
CK_KABI_RESERVE(1)
};
struct dst_metrics {

4
include/net/dst_ops.h
View File

@ -40,8 +40,8 @@ struct dst_ops {
struct kmem_cache *kmem_cachep;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
struct percpu_counter pcpuc_entries ____cacheline_aligned_in_smp;
};

2
include/net/fib_rules.h
View File

@ -45,7 +45,7 @@ struct fib_rule {
struct fib_rule_port_range dport_range;
struct rcu_head rcu;
CK_HOTFIX_RESERVE(1)
CK_KABI_RESERVE(1)
};
struct fib_lookup_arg {

4
include/net/sock.h
View File

@ -528,8 +528,8 @@ struct sock {
pid_t sk_pid;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
};
enum sk_pacing {

8
kernel/sched/cpuacct.c
View File

@ -119,10 +119,10 @@ struct cpuacct {
unsigned long avenrun_r[3];
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
};
static inline struct cpuacct *cgroup_ca(struct cgroup *cgrp)

16
kernel/sched/cpudeadline.h
View File

@ -14,14 +14,14 @@ struct cpudl {
cpumask_var_t free_cpus;
struct cpudl_item *elements;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
#ifdef CONFIG_SMP

16
kernel/sched/fair.c
View File

@ -2827,14 +2827,14 @@ struct numa_group {
*/
unsigned long *faults_cpu;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
unsigned long faults[];
};

192
kernel/sched/sched.h
View File

@ -277,14 +277,14 @@ struct rt_bandwidth {
struct hrtimer rt_period_timer;
unsigned int rt_period_active;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
void __dl_clear_params(struct task_struct *p);
@ -323,14 +323,14 @@ struct dl_bw {
u64 bw;
u64 total_bw;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
static inline void __dl_update(struct dl_bw *dl_b, s64 bw);
@ -421,14 +421,14 @@ struct cfs_bandwidth {
u64 throttled_time;
u64 burst_time;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
#endif
};
@ -491,14 +491,14 @@ struct task_group {
bool need_ht_stable;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
#ifdef CONFIG_FAIR_GROUP_SCHED
@ -700,14 +700,14 @@ struct cfs_rq {
unsigned long nr_uninterruptible;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
static inline int rt_bandwidth_enabled(void)
@ -757,14 +757,14 @@ struct rt_rq {
unsigned long nr_uninterruptible;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
static inline bool rt_rq_is_runnable(struct rt_rq *rt_rq)
@ -828,14 +828,14 @@ struct dl_rq {
*/
u64 bw_ratio;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
#ifdef CONFIG_FAIR_GROUP_SCHED
@ -954,14 +954,14 @@ struct root_domain {
*/
struct perf_domain __rcu *pd;
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
extern void init_defrootdomain(void);
@ -1219,14 +1219,14 @@ struct rq {
bool in_ht_stable;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
};
#ifdef CONFIG_FAIR_GROUP_SCHED
@ -1666,14 +1666,14 @@ struct sched_group_capacity {
int id;
#endif
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
unsigned long cpumask[]; /* Balance mask */
};
@ -1686,14 +1686,14 @@ struct sched_group {
struct sched_group_capacity *sgc;
int asym_prefer_cpu; /* CPU of highest priority in group */
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
/*
* The CPUs this group covers.
@ -2054,14 +2054,14 @@ struct sched_class {
void (*update_nr_uninterruptible)(struct task_struct *p, long inc);
void (*update_nr_iowait)(struct task_struct *p, long inc);
CK_HOTFIX_RESERVE(1)
CK_HOTFIX_RESERVE(2)
CK_HOTFIX_RESERVE(3)
CK_HOTFIX_RESERVE(4)
CK_HOTFIX_RESERVE(5)
CK_HOTFIX_RESERVE(6)
CK_HOTFIX_RESERVE(7)
CK_HOTFIX_RESERVE(8)
CK_KABI_RESERVE(1)
CK_KABI_RESERVE(2)
CK_KABI_RESERVE(3)
CK_KABI_RESERVE(4)
CK_KABI_RESERVE(5)
CK_KABI_RESERVE(6)
CK_KABI_RESERVE(7)
CK_KABI_RESERVE(8)
} __aligned(STRUCT_ALIGNMENT); /* STRUCT_ALIGN(), vmlinux.lds.h */
static inline void put_prev_task(struct rq *rq, struct task_struct *prev)