[PATCH OLK-6.6 0/3] kabi OLK-6.6 reverve space
Luo Gengkun (3): kabi: reserve space for perf_event.h kabi: reserve space for internal.h kabi: reserve space for uprobes.h include/linux/perf_event.h | 16 ++++++++++++++++ include/linux/uprobes.h | 9 +++++++++ kernel/events/internal.h | 10 ++++++++++ 3 files changed, 35 insertions(+) -- 2.34.1
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/14225 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y... 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/14225 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y...
hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBC1PM -------------------------------- reserve space for perf_event.h Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- include/linux/perf_event.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 89f2a02db563..fe692e9bd0b2 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1010,6 +1010,14 @@ struct perf_cpu_pmu_context { struct hrtimer hrtimer; ktime_t hrtimer_interval; unsigned int hrtimer_active; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) }; /** @@ -1031,6 +1039,14 @@ struct perf_cpu_context { int heap_size; struct perf_event **heap; struct perf_event *heap_default[2]; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) }; struct perf_output_handle { -- 2.34.1
hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBC1PM -------------------------------- reserve space for internal.h Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- kernel/events/internal.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kernel/events/internal.h b/kernel/events/internal.h index d2e6e6144c54..d1ffa00b91b6 100644 --- a/kernel/events/internal.h +++ b/kernel/events/internal.h @@ -5,6 +5,7 @@ #include <linux/hardirq.h> #include <linux/uaccess.h> #include <linux/refcount.h> +#include <linux/kabi.h> /* Buffer handling */ @@ -54,6 +55,15 @@ struct perf_buffer { void **aux_pages; void *aux_priv; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + struct perf_event_mmap_page *user_page; void *data_pages[]; }; -- 2.34.1
hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBC1PM -------------------------------- reserve space for uprobes.h Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- include/linux/uprobes.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index f46e0ca0169c..86d0868b584a 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -47,6 +47,7 @@ struct uprobe_consumer { #ifdef CONFIG_UPROBES #include <asm/uprobes.h> +#include <linux/kabi.h> enum uprobe_task_state { UTASK_RUNNING, @@ -78,6 +79,14 @@ struct uprobe_task { struct return_instance *return_instances; unsigned int depth; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) }; struct return_instance { -- 2.34.1
participants (2)
-
Luo Gengkun -
patchwork bot