*** BLURB HERE ***
Chen Jiahao (1): KABI: reserve space for struct input_dev
Jialin Zhang (1): kabi: reserve space for power management related structure
Lin Ruizhe (5): msi: Add kabi_reserve in msi.h interrupt: Add kabi_reserve in interrupt.h irq: Add kabi_reserve in irq irq_desc: Add kabi_reserve in irq_desc irqdomain: Add kabi_reserve in irqdomain
Lin Yujun (14): drm: drm_atomic.h: Add kabi_reserve drm: drm_client.h: Add kabi_reserve drm: drm_connector.h: Add kabi_reserve drm: drm_crtc.h: Add kabi_reserve drm: drm_device.h: Add kabi_reserve drm: drm_drv.h: Add kabi_reserve drm: drm_fb_helper.h: Add kabi_reserve drm: drm_file.h: Add kabi_reserve drm: drm_fourcc.h: Add kabi_reserve drm: drm_gem.h: Add kabi_reserve pm: pm_domain.h: Add kabi_reserve pm: pm.h: Add kabi_reserve energy_model: Add kabi_reserve kabi: reserve space for arm64 cpufeature related structure
Yang Yingliang (1): kabi: reserve space for struct cpu_stop_work
arch/arm64/tools/cpucaps | 30 ++++++++++++++++++++++++++++++ include/drm/drm_atomic.h | 6 ++++++ include/drm/drm_client.h | 7 +++++++ include/drm/drm_connector.h | 18 ++++++++++++++++++ include/drm/drm_crtc.h | 7 +++++++ include/drm/drm_device.h | 4 ++++ include/drm/drm_drv.h | 5 +++++ include/drm/drm_fb_helper.h | 8 ++++++++ include/drm/drm_file.h | 8 ++++++++ include/drm/drm_fourcc.h | 5 +++++ include/drm/drm_gem.h | 8 ++++++++ include/linux/energy_model.h | 5 +++++ include/linux/input.h | 4 ++++ include/linux/interrupt.h | 6 ++++++ include/linux/irq.h | 8 ++++++++ include/linux/irqdesc.h | 4 +++- include/linux/irqdomain.h | 3 +++ include/linux/msi.h | 7 +++++++ include/linux/pm.h | 14 ++++++++++++++ include/linux/pm_domain.h | 10 ++++++++++ include/linux/pm_qos.h | 7 +++++++ include/linux/pm_wakeup.h | 4 ++++ include/linux/stop_machine.h | 3 +++ 23 files changed, 180 insertions(+), 1 deletion(-)
From: Chen Jiahao chenjiahao16@huawei.com
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 chenjiahao16@huawei.com
conflict: include/linux/input.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/fs.h> #include <linux/timer.h> #include <linux/mod_devicetable.h> +#include <linux/kabi.h>
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)
From: Yang Yingliang yangyingliang@huawei.com
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 yangyingliang@huawei.com conflicts: include/linux/stop_machine.h Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/cpumask.h> #include <linux/smp.h> #include <linux/list.h> +#include <linux/kabi.h>
/* * 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);
From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I4MZU1 CVE: NA
---------------------------
Add KABI_RESERVE in msi.h
Signed-off-by: Lin Ruizhe linruizhe@huawei.com conflicts: include/linux/msi.h.rej Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/list.h> #include <linux/irq.h> #include <linux/bits.h> +#include <linux/kabi.h>
#include <asm/msi.h>
@@ -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) };
/*
From: Lin Ruizhe linruizhe@huawei.com
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 linruizhe@huawei.com
conflict: include/linux/interrupt.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/hrtimer.h> #include <linux/kref.h> #include <linux/workqueue.h> +#include <linux/kabi.h> + #include <linux/jump_label.h>
#include <linux/atomic.h> @@ -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) \
From: Lin Ruizhe linruizhe@huawei.com
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 linruizhe@huawei.com conflicts: include/linux/irq.h Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/topology.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/kabi.h>
#include <asm/irq.h> #include <asm/ptrace.h> @@ -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) };
/**
From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add KABI_RESERVE in irq_desc
Signed-off-by: Lin Ruizhe linruizhe@huawei.com
conflict: include/linux/irqdesc.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/rcupdate.h> #include <linux/kobject.h> #include <linux/mutex.h> - +#include <linux/kabi.h> /* * 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
From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in irqdomain.h
Signed-off-by: Lin Ruizhe linruizhe@huawei.com
conflict: include/linux/irqdomain.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/irqdomain.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 51c254b7fec2..8594cd9b642e 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -36,6 +36,7 @@ #include <linux/of.h> #include <linux/mutex.h> #include <linux/radix-tree.h> +#include <linux/kabi.h>
struct device_node; struct fwnode_handle; @@ -174,6 +175,8 @@ struct irq_domain { irq_hw_number_t hwirq_max; unsigned int revmap_size; struct radix_tree_root revmap_tree; + KABI_RESERVE(1) + KABI_RESERVE(2) struct irq_data __rcu *revmap[]; };
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_atomic.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_crtc.h> #include <drm/drm_util.h> +#include <linux/kabi.h>
/** * 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 {
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_client.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_connector.h> #include <drm/drm_crtc.h> +#include <linux/kabi.h>
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 *
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_connector.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_property.h>
#include <uapi/drm/drm_mode.h> +#include <linux/kabi.h>
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)
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_crtc.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_plane.h> #include <drm/drm_debugfs_crc.h> #include <drm/drm_mode_config.h> +#include <linux/kabi.h>
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) };
/**
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_device.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_legacy.h> #include <drm/drm_mode_config.h> +#include <linux/kabi.h>
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
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_drv.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_device.h>
+#include <linux/kabi.h> + 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,
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 linyujun809@huawei.com --- 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 <drm/drm_client.h>
+#include <linux/kabi.h> + /** * 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 *
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_file.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_prime.h>
+#include <linux/kabi.h> + 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) };
/**
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_fourcc.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/types.h> #include <uapi/drm/drm_fourcc.h>
+#include <linux/kabi.h> + /** * 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) };
/**
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in drm_gem.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <drm/drm_vma_manager.h>
+#include <linux/kabi.h> + 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) };
/**
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in pm_domain.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/spinlock.h> #include <linux/cpumask.h> #include <linux/time64.h> +#include <linux/kabi.h>
/* * 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)
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in pm.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/timer.h> #include <linux/hrtimer.h> #include <linux/completion.h> +#include <linux/kabi.h>
/* * 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);
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------------------------
Add kabi_reserve in energy_model.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- 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 <linux/sched/cpufreq.h> #include <linux/sched/topology.h> #include <linux/types.h> +#include <linux/kabi.h>
/** * 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[]; };
From: Jialin Zhang zhangjialin11@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
-------------------------------
Reserve space for power management related structure.
Signed-off-by: Jialin Zhang zhangjialin11@huawei.com conflicts: include/linux/pm_domain.h include/linux/pm.h Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/pm.h | 3 +++ include/linux/pm_domain.h | 4 ++++ include/linux/pm_qos.h | 7 +++++++ include/linux/pm_wakeup.h | 4 ++++ 4 files changed, 18 insertions(+)
diff --git a/include/linux/pm.h b/include/linux/pm.h index f80ebfcdee08..6850c76da319 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -757,6 +757,9 @@ struct dev_pm_domain { int (*activate)(struct device *dev); void (*sync)(struct device *dev); void (*dismiss)(struct device *dev); + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/* diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 0928055376bc..4dd9a274f434 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -111,6 +111,10 @@ struct genpd_power_state { struct fwnode_handle *fwnode; u64 idle_time; void *data; + + KABI_RESERVE(1) + KABI_RESERVE(2) + };
struct genpd_lock_ops; diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 4a69d4af3ff8..4745e27680df 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -15,6 +15,7 @@ #include <linux/plist.h> #include <linux/notifier.h> #include <linux/device.h> +#include <linux/kabi.h>
enum pm_qos_flags_status { PM_QOS_FLAGS_UNDEFINED = -1, @@ -112,6 +113,9 @@ struct dev_pm_qos_request { struct freq_qos_request freq; } data; struct device *dev; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct dev_pm_qos { @@ -122,6 +126,9 @@ struct dev_pm_qos { struct dev_pm_qos_request *resume_latency_req; struct dev_pm_qos_request *latency_tolerance_req; struct dev_pm_qos_request *flags_req; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/* Action requested to pm_qos_update_target */ diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index 6eb9adaef52b..27728bec3072 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -14,6 +14,7 @@ #endif
#include <linux/types.h> +#include <linux/kabi.h>
struct wake_irq;
@@ -61,6 +62,9 @@ struct wakeup_source { struct device *dev; bool active:1; bool autosleep_enabled:1; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define for_each_wakeup_source(ws) \
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
-------------------------------
Reserve space for the structure cpu_hwcap_keys and cpu_hwcaps.
Signed-off-by: Jialin Zhang zhangjialin11@huawei.com Signed-off-by: Lin Yujun linyujun809@huawei.com --- arch/arm64/tools/cpucaps | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index c60a603d2cfe..529370b881ed 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -105,3 +105,33 @@ WORKAROUND_HISILICON_ERRATUM_162100125 WORKAROUND_HISI_HIP08_RU_PREFETCH WORKAROUND_HISILICON_1980005 WORKAROUND_HISILICON_ERRATUM_162100602 +KABI_RESERVE_1 +KABI_RESERVE_2 +KABI_RESERVE_3 +KABI_RESERVE_4 +KABI_RESERVE_5 +KABI_RESERVE_6 +KABI_RESERVE_7 +KABI_RESERVE_8 +KABI_RESERVE_9 +KABI_RESERVE_10 +KABI_RESERVE_11 +KABI_RESERVE_12 +KABI_RESERVE_13 +KABI_RESERVE_14 +KABI_RESERVE_15 +KABI_RESERVE_16 +KABI_RESERVE_17 +KABI_RESERVE_18 +KABI_RESERVE_19 +KABI_RESERVE_20 +KABI_RESERVE_21 +KABI_RESERVE_22 +KABI_RESERVE_23 +KABI_RESERVE_24 +KABI_RESERVE_25 +KABI_RESERVE_26 +KABI_RESERVE_27 +KABI_RESERVE_28 +KABI_RESERVE_29 +KABI_RESERVE_30
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/4451 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J...
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://gitee.com/openeuler/kernel/pulls/4451 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J...
-
Lin Yujun -
patchwork bot