*** BLURB HERE ***
Chen Jiahao (2): KABI: reserve space for several i2c structures KABI: reserve space for struct input_dev
Lin Ruizhe (6): bootparam: Add kabi_reserve in bootparam 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 msi: Add kabi_reserve in msi.h
arch/x86/include/uapi/asm/bootparam.h | 2 ++ include/linux/i2c.h | 11 +++++++++++ include/linux/input.h | 4 ++++ include/linux/interrupt.h | 4 ++++ include/linux/irq.h | 6 ++++++ include/linux/irqdesc.h | 3 ++- include/linux/irqdomain.h | 2 ++ include/linux/msi.h | 3 +++ 8 files changed, 34 insertions(+), 1 deletion(-)
From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------
Add kabi_resetve in struct acpi_rsdp_addr and setup_header
Signed-off-by: Lin Yujun linyujun809@huawei.com --- arch/x86/include/uapi/asm/bootparam.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 01d19fc22346..15c5fb41777c 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -44,6 +44,7 @@ #include <linux/types.h> #include <linux/screen_info.h> #include <linux/apm_bios.h> +#include <linux/kabi.h> #include <linux/edd.h> #include <asm/ist.h> #include <video/edid.h> @@ -104,6 +105,7 @@ struct setup_header { __u32 init_size; __u32 handover_offset; __u32 kernel_info_offset; + KABI_RESERVE(1) } __attribute__((packed));
struct sys_desc_table {
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
conflict: include/linux/interrupt.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/interrupt.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 4a1dc88ddbff..d5d4b06dd434 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,7 @@ 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) };
/** @@ -650,6 +653,7 @@ struct tasklet_struct void (*callback)(struct tasklet_struct *t); }; unsigned long data; + KABI_RESERVE(1) };
#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 Yujun linyujun809@huawei.com --- include/linux/irq.h | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/include/linux/irq.h b/include/linux/irq.h index 90081afa10ce..62b3a646a4dd 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,7 @@ struct irq_chip { void (*irq_nmi_teardown)(struct irq_data *data);
unsigned long flags; + KABI_RESERVE(1) };
/* @@ -1023,6 +1028,7 @@ struct irq_chip_type { u32 type; u32 mask_cache_priv; u32 *mask_cache; + KABI_RESERVE(1) };
/**
From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------
Add KABI_RESERVE in irq_desc
conflict: include/linux/irqdesc.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/irqdesc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index d9451d456a73..1736250b3210 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,7 @@ struct irq_desc { #ifdef CONFIG_HARDIRQS_SW_RESEND struct hlist_node resend_node; #endif + KABI_RESERVE(1) } ____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
conflict: include/linux/irqdomain.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/irqdomain.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 51c254b7fec2..b6c97f46a4af 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,7 @@ struct irq_domain { irq_hw_number_t hwirq_max; unsigned int revmap_size; struct radix_tree_root revmap_tree; + KABI_RESERVE(1) struct irq_data __rcu *revmap[]; };
From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------
Add KABI_RESERVE in msi.h
conflict: include/linux/msi.h.rej
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/msi.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/linux/msi.h b/include/linux/msi.h index ddace8c34dcf..e3bc03fc38bc 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>
@@ -203,6 +204,8 @@ struct msi_desc { struct pci_msi_desc pci; struct msi_desc_data data; }; + KABI_RESERVE(1) + KABI_RESERVE(2) };
/*
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 i2c_bus_recovery_info, i2c_adapter, i2c_board_info and i2c_algorithm for future development.
conflict: include/linux/i2c.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/i2c.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 0dae9db27538..5a2f46e9f9c4 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -22,6 +22,7 @@ #include <linux/of.h> /* for struct device_node */ #include <linux/swab.h> /* for swab16 */ #include <uapi/linux/i2c.h> +#include <linux/kabi.h>
extern struct bus_type i2c_bus_type; extern struct device_type i2c_adapter_type; @@ -433,6 +434,8 @@ struct i2c_board_info { const struct resource *resources; unsigned int num_resources; int irq; + + KABI_RESERVE(1) };
/** @@ -566,6 +569,9 @@ struct i2c_algorithm { int (*reg_slave)(struct i2c_client *client); int (*unreg_slave)(struct i2c_client *client); #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/** @@ -655,6 +661,9 @@ struct i2c_bus_recovery_info { struct pinctrl *pinctrl; struct pinctrl_state *pins_default; struct pinctrl_state *pins_gpio; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
int i2c_recover_bus(struct i2c_adapter *adap); @@ -746,6 +755,8 @@ struct i2c_adapter {
struct irq_domain *host_notify_domain; struct regulator *bus_regulator; + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
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.
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)
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/3485 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/V...
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/3485 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/V...
-
Lin Yujun -
patchwork bot