From 61e06d99c19e914c8b9b95bb9b317cacb9ac416d Mon Sep 17 00:00:00 2001 From: Chen Jiahao Date: Mon, 29 Jan 2024 16:21:35 +0800 Subject: [PATCH 01/20] KABI: reserve space for struct input_dev hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Reserving some fields in struct input_dev for future development. Signed-off-by: Chen Jiahao conflict: include/linux/input.h Signed-off-by: Lin Yujun --- include/linux/input.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/input.h b/include/linux/input.h index 49790c1bd2c4..124432f404df 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -20,6 +20,7 @@ #include #include #include +#include struct input_dev_poller; @@ -209,6 +210,9 @@ struct input_dev { ktime_t timestamp[INPUT_CLK_MAX]; bool inhibited; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define to_input_dev(d) container_of(d, struct input_dev, dev) -- Gitee From a8cf98a6ee62eb645d652b322c5cca2c989f09dd Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Mon, 29 Jan 2024 16:21:36 +0800 Subject: [PATCH 02/20] kabi: reserve space for struct cpu_stop_work hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4JBL0 CVE: NA ------------------------------- Reserve space for struct cpu_stop_work. Changing this struct will affect set_cpus_allowed_ptr(), so reserve one kabi field. Signed-off-by: Yang Yingliang conflicts: include/linux/stop_machine.h Signed-off-by: Lin Yujun --- include/linux/stop_machine.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h index ea7a74ea7389..bd81cbe553cc 100644 --- a/include/linux/stop_machine.h +++ b/include/linux/stop_machine.h @@ -6,6 +6,7 @@ #include #include #include +#include /* * stop_cpu[s]() is simplistic per-cpu maximum priority cpu @@ -27,6 +28,8 @@ struct cpu_stop_work { unsigned long caller; void *arg; struct cpu_stop_done *done; + KABI_RESERVE(1) + KABI_RESERVE(2) }; int stop_one_cpu(unsigned int cpu, cpu_stop_fn_t fn, void *arg); -- Gitee From e6a40a7ddf347d41d59756344121bbf95afcbe47 Mon Sep 17 00:00:00 2001 From: Lin Ruizhe Date: Mon, 29 Jan 2024 16:21:37 +0800 Subject: [PATCH 03/20] msi: Add kabi_reserve in msi.h hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I4MZU1 CVE: NA --------------------------- Add KABI_RESERVE in msi.h Signed-off-by: Lin Ruizhe conflicts: include/linux/msi.h.rej Signed-off-by: Lin Yujun --- include/linux/msi.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/msi.h b/include/linux/msi.h index ddace8c34dcf..6c23f778eddd 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -26,6 +26,7 @@ #include #include #include +#include #include @@ -128,6 +129,8 @@ struct pci_msi_desc { u8 mask_pos; void __iomem *mask_base; }; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -203,6 +206,10 @@ struct msi_desc { struct pci_msi_desc pci; struct msi_desc_data data; }; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* -- Gitee From 83084458c092b0461624031c71f888d219ad338b Mon Sep 17 00:00:00 2001 From: Lin Ruizhe Date: Mon, 29 Jan 2024 16:21:38 +0800 Subject: [PATCH 04/20] interrupt: Add kabi_reserve in interrupt.h hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve tasklet_struct and irq_affinity in interrupt.h Signed-off-by: Lin Ruizhe conflict: include/linux/interrupt.h Signed-off-by: Lin Yujun --- include/linux/interrupt.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 4a1dc88ddbff..9aac2ab156ca 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -13,6 +13,8 @@ #include #include #include +#include + #include #include @@ -289,6 +291,8 @@ struct irq_affinity { unsigned int set_size[IRQ_AFFINITY_MAX_SETS]; void (*calc_sets)(struct irq_affinity *, unsigned int nvecs); void *priv; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -650,6 +654,8 @@ struct tasklet_struct void (*callback)(struct tasklet_struct *t); }; unsigned long data; + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define DECLARE_TASKLET(name, _callback) \ -- Gitee From 82cdc1b136ac5e3edb5ff293f43c7e00ddd2d0ec Mon Sep 17 00:00:00 2001 From: Lin Ruizhe Date: Mon, 29 Jan 2024 16:21:39 +0800 Subject: [PATCH 05/20] irq: Add kabi_reserve in irq hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in irq_common_data irq_chip irq_chip_type in irq.h Signed-off-by: Lin Ruizhe conflicts: include/linux/irq.h Signed-off-by: Lin Yujun --- include/linux/irq.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/irq.h b/include/linux/irq.h index 90081afa10ce..a5a904a1304f 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -160,6 +161,9 @@ struct irq_common_data { #ifdef CONFIG_GENERIC_IRQ_IPI unsigned int ipi_offset; #endif + KABI_RESERVE(1) + KABI_RESERVE(2) + }; /** @@ -548,6 +552,8 @@ struct irq_chip { void (*irq_nmi_teardown)(struct irq_data *data); unsigned long flags; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* @@ -1023,6 +1029,8 @@ struct irq_chip_type { u32 type; u32 mask_cache_priv; u32 *mask_cache; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** -- Gitee From 4c1e3778dac11f82e28a7d919aad1252c0ece9e3 Mon Sep 17 00:00:00 2001 From: Lin Ruizhe Date: Mon, 29 Jan 2024 16:21:40 +0800 Subject: [PATCH 06/20] irq_desc: Add kabi_reserve in irq_desc hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add KABI_RESERVE in irq_desc Signed-off-by: Lin Ruizhe conflict: include/linux/irqdesc.h Signed-off-by: Lin Yujun --- include/linux/irqdesc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index d9451d456a73..fea156ae551c 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -5,7 +5,7 @@ #include #include #include - +#include /* * Core internal functions to deal with irq descriptors */ @@ -105,6 +105,8 @@ struct irq_desc { #ifdef CONFIG_HARDIRQS_SW_RESEND struct hlist_node resend_node; #endif + KABI_RESERVE(1) + KABI_RESERVE(2) } ____cacheline_internodealigned_in_smp; #ifdef CONFIG_SPARSE_IRQ -- Gitee From a47c88a39756b24b55a89743f9df797c5cb4fa85 Mon Sep 17 00:00:00 2001 From: Lin Ruizhe Date: Mon, 29 Jan 2024 16:21:41 +0800 Subject: [PATCH 07/20] irqdomain: Add kabi_reserve in irqdomain hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in irqdomain.h Signed-off-by: Lin Ruizhe conflict: include/linux/irqdomain.h Signed-off-by: Lin Yujun --- include/linux/irqdomain.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 51c254b7fec2..e9f4bb2b7676 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -36,6 +36,7 @@ #include #include #include +#include struct device_node; struct fwnode_handle; @@ -175,6 +176,8 @@ struct irq_domain { unsigned int revmap_size; struct radix_tree_root revmap_tree; struct irq_data __rcu *revmap[]; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* Irq domain flags */ -- Gitee From 72cfbac1d579ac91662aec9cf23bf6da5db9331e Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:42 +0800 Subject: [PATCH 08/20] drm: drm_atomic.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_atomic.h Signed-off-by: Lin Yujun --- include/drm/drm_atomic.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 9a022caacf93..2a1b79a299fb 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -30,6 +30,7 @@ #include #include +#include /** * struct drm_crtc_commit - track modeset commits on a CRTC @@ -239,6 +240,9 @@ struct drm_private_state_funcs { */ void (*atomic_print_state)(struct drm_printer *p, const struct drm_private_state *state); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -338,6 +342,8 @@ struct drm_private_state { * @obj: backpointer to the private object */ struct drm_private_obj *obj; + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct __drm_private_objs_state { -- Gitee From e5c9fe97056f0f5f42e02817f8a8341d6efe3ef7 Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:43 +0800 Subject: [PATCH 09/20] drm: drm_client.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_client.h Signed-off-by: Lin Yujun --- include/drm/drm_client.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h index c0a14b40c039..7bbc9d5bcd76 100644 --- a/include/drm/drm_client.h +++ b/include/drm/drm_client.h @@ -10,6 +10,7 @@ #include #include +#include struct drm_client_dev; struct drm_device; @@ -114,6 +115,9 @@ struct drm_client_dev { * before. It is usually not tried again. */ bool hotplug_failed; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; int drm_client_init(struct drm_device *dev, struct drm_client_dev *client, @@ -153,6 +157,9 @@ struct drm_client_buffer { * @fb: DRM framebuffer */ struct drm_framebuffer *fb; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct drm_client_buffer * -- Gitee From 387c659c0694b80e0035fd1efe88ce480a78858c Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:44 +0800 Subject: [PATCH 10/20] drm: drm_connector.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_connector.h Signed-off-by: Lin Yujun --- include/drm/drm_connector.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index d300fde6c1a4..d304ec8dd06b 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -33,6 +33,7 @@ #include #include +#include struct drm_connector_helper_funcs; struct drm_modeset_acquire_ctx; @@ -321,6 +322,9 @@ struct drm_hdmi_info { /** @dsc_cap: DSC capabilities of the sink */ struct drm_hdmi_dsc_cap dsc_cap; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -816,6 +820,9 @@ struct drm_display_info { * @quirks: EDID based quirks. Internal to EDID parsing. */ u32 quirks; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; int drm_display_info_set_bus_formats(struct drm_display_info *info, @@ -876,6 +883,8 @@ struct drm_tv_connector_state { unsigned int overscan; unsigned int saturation; unsigned int hue; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -1335,6 +1344,9 @@ struct drm_connector_funcs { * Allows connectors to create connector-specific debugfs files. */ void (*debugfs_init)(struct drm_connector *connector, struct dentry *root); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -1481,6 +1493,9 @@ struct drm_cmdline_mode { * Did the mode have a preferred TV mode? */ bool tv_mode_specified; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -1876,6 +1891,9 @@ struct drm_connector { /** @hdr_sink_metadata: HDR Metadata Information read from sink */ struct hdr_sink_metadata hdr_sink_metadata; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define obj_to_connector(x) container_of(x, struct drm_connector, base) -- Gitee From 68fd30761660359215ab3ba169e101681765cc1d Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:45 +0800 Subject: [PATCH 11/20] drm: drm_crtc.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_crtc.h Signed-off-by: Lin Yujun --- include/drm/drm_crtc.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8b48a1974da3..4476b01f063d 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -34,6 +34,7 @@ #include #include #include +#include struct drm_connector; struct drm_device; @@ -385,6 +386,9 @@ struct drm_crtc_state { /** @state: backpointer to global drm_atomic_state */ struct drm_atomic_state *state; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -1175,6 +1179,9 @@ struct drm_crtc { * Initialized via drm_self_refresh_helper_init(). */ struct drm_self_refresh_data *self_refresh_data; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** -- Gitee From 73176afb1a273a4ab1ad5300549f0b706d06b193 Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:46 +0800 Subject: [PATCH 12/20] drm: drm_device.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_device.h Signed-off-by: Lin Yujun --- include/drm/drm_device.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index 7cf4afae2e79..2f2e2c069753 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -8,6 +8,7 @@ #include #include +#include struct drm_driver; struct drm_minor; @@ -391,6 +392,9 @@ struct drm_device { bool irq_enabled; int irq; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #endif -- Gitee From 6eb312801443337304e3a2090dfe603c1fd12dc9 Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:47 +0800 Subject: [PATCH 13/20] drm: drm_drv.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_drv.h Signed-off-by: Lin Yujun --- include/drm/drm_drv.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 9813fa759b75..fe52bff7eba5 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -34,6 +34,8 @@ #include +#include + struct drm_file; struct drm_gem_object; struct drm_master; @@ -452,6 +454,9 @@ struct drm_driver { void (*disable_vblank)(struct drm_device *dev, unsigned int pipe); int dev_priv_size; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; void *__devm_drm_dev_alloc(struct device *parent, -- Gitee From d3378dbb8657259c0299828b62757c254481acca Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:48 +0800 Subject: [PATCH 14/20] drm: drm_fb_helper.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_fb_helper.h Signed-off-by: Lin Yujun --- include/drm/drm_fb_helper.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 375737fd6c36..38dc5ea44198 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -37,6 +37,8 @@ struct drm_fb_helper; #include +#include + /** * struct drm_fb_helper_surface_size - describes fbdev size and scanout surface size * @fb_width: fbdev width @@ -99,6 +101,9 @@ struct drm_fb_helper_funcs { * 0 on success, or an error code otherwise. */ int (*fb_dirty)(struct drm_fb_helper *helper, struct drm_clip_rect *clip); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -206,6 +211,9 @@ struct drm_fb_helper { */ struct fb_deferred_io fbdefio; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; static inline struct drm_fb_helper * -- Gitee From 640843e52cd31e0cf945f89dbef7ff5c316f30df Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:49 +0800 Subject: [PATCH 15/20] drm: drm_file.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_file.h Signed-off-by: Lin Yujun --- include/drm/drm_file.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 010239392adf..18b3a8389e40 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -38,6 +38,8 @@ #include +#include + struct dma_fence; struct drm_file; struct drm_device; @@ -83,6 +85,9 @@ struct drm_minor { struct list_head debugfs_list; struct mutex debugfs_lock; /* Protects debugfs_list. */ + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -374,6 +379,9 @@ struct drm_file { #if IS_ENABLED(CONFIG_DRM_LEGACY) unsigned long lock_count; /* DRI1 legacy lock count */ #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** -- Gitee From 2383c9e9de7f901605c864d77cb15a274c41b4fb Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:50 +0800 Subject: [PATCH 16/20] drm: drm_fourcc.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_fourcc.h Signed-off-by: Lin Yujun --- include/drm/drm_fourcc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h index 532ae78ca747..adfd1b891d5e 100644 --- a/include/drm/drm_fourcc.h +++ b/include/drm/drm_fourcc.h @@ -25,6 +25,8 @@ #include #include +#include + /** * DRM_FORMAT_MAX_PLANES - maximum number of planes a DRM format can have */ @@ -141,6 +143,9 @@ struct drm_format_info { /** @is_color_indexed: Is it a color-indexed format? */ bool is_color_indexed; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** -- Gitee From 281bba47642ced54c5f0a60376d1d9d28174903b Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:51 +0800 Subject: [PATCH 17/20] drm: drm_gem.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in drm_gem.h Signed-off-by: Lin Yujun --- include/drm/drm_gem.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index bc9f6aa2f3fe..4b7ec8eab65c 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -41,6 +41,8 @@ #include +#include + struct iosys_map; struct drm_gem_object; @@ -216,6 +218,9 @@ struct drm_gem_object_funcs { * This is optional but necessary for mmap support. */ const struct vm_operations_struct *vm_ops; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -421,6 +426,9 @@ struct drm_gem_object { * The current LRU list that the GEM object is on. */ struct drm_gem_lru *lru; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** -- Gitee From 106f095c425f237a58acd11887f30cd9cf2999ed Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:52 +0800 Subject: [PATCH 18/20] pm: pm_domain.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in pm_domain.h Signed-off-by: Lin Yujun --- include/linux/pm_domain.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index f776fb93eaa0..0928055376bc 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -18,6 +18,7 @@ #include #include #include +#include /* * Flags to control the behaviour of a genpd. @@ -167,6 +168,11 @@ struct generic_pm_domain { }; }; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + }; static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd) -- Gitee From 70c3e1dd7d2254ab614c905f1a304a74b7fa0715 Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:53 +0800 Subject: [PATCH 19/20] pm: pm.h: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in pm.h Signed-off-by: Lin Yujun --- include/linux/pm.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/linux/pm.h b/include/linux/pm.h index 629c1633bbd0..f80ebfcdee08 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -16,6 +16,7 @@ #include #include #include +#include /* * Callbacks for platform drivers to implement. @@ -600,6 +601,10 @@ enum rpm_status { RPM_RESUMING, RPM_SUSPENDED, RPM_SUSPENDING, + RPM_KABI_RESERVE_1, + RPM_KABI_RESERVE_2, + RPM_KABI_RESERVE_3, + RPM_KABI_RESERVE_4, }; /* @@ -640,6 +645,9 @@ struct pm_subsys_data { #ifdef CONFIG_PM_GENERIC_DOMAINS struct pm_domain_data *domain_data; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* @@ -720,6 +728,9 @@ struct dev_pm_info { struct pm_subsys_data *subsys_data; /* Owned by the subsystem. */ void (*set_latency_tolerance)(struct device *, s32); struct dev_pm_qos *qos; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern int dev_pm_get_subsys_data(struct device *dev); -- Gitee From 0a96e5ef50f8a301be2ac3aa6e94b49e1bf02e47 Mon Sep 17 00:00:00 2001 From: Lin Yujun Date: Mon, 29 Jan 2024 16:21:54 +0800 Subject: [PATCH 20/20] energy_model: Add kabi_reserve hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add kabi_reserve in energy_model.h Signed-off-by: Lin Yujun --- include/linux/energy_model.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h index b9caa01dfac4..0091bf129f77 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -9,6 +9,7 @@ #include #include #include +#include /** * struct em_perf_state - Performance state of a performance domain @@ -24,6 +25,8 @@ struct em_perf_state { unsigned long power; unsigned long cost; unsigned long flags; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* @@ -56,6 +59,8 @@ struct em_perf_domain { struct em_perf_state *table; int nr_perf_states; unsigned long flags; + KABI_RESERVE(1) + KABI_RESERVE(2) unsigned long cpus[]; }; -- Gitee