diff --git a/0007-14213.patch b/0007-14213.patch new file mode 100644 index 0000000000000000000000000000000000000000..c0fa38e707989912fde84458ab406b609e659820 --- /dev/null +++ b/0007-14213.patch @@ -0,0 +1,62 @@ +From 51914230fbc72797f3cf7d5b0d9e90b00c995193 Mon Sep 17 00:00:00 2001 +From: Pu Lehui +Date: Wed, 18 Dec 2024 06:24:00 +0000 +Subject: [PATCH] bpf: Add kabi reserve padding for uapi struct bpf_link_info + +hulk inclusion +category: feature +bugzilla: https://gitee.com/openeuler/kernel/issues/IBC248 + +-------------------------------- + +Add kabi reserve padding for uapi struct bpf_link_info + +Signed-off-by: Pu Lehui +--- + include/uapi/linux/bpf.h | 9 +++++++++ + tools/include/uapi/linux/bpf.h | 9 +++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h +index 482647774bf5..a660cb68c853 100644 +--- a/include/uapi/linux/bpf.h ++++ b/include/uapi/linux/bpf.h +@@ -6573,6 +6573,15 @@ struct bpf_link_info { + __u64 config; + __u32 type; + } event; /* BPF_PERF_EVENT_EVENT */ ++ struct { ++ __u64:64; ++ __u32:32; ++ __u32:32; ++ __u64:64; ++ __u64:64; ++ __u64:64; ++ __u64:64; ++ } kabi_reserve; + }; + } perf_event; + struct { +diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h +index c112c6f7c766..9b302242be6c 100644 +--- a/tools/include/uapi/linux/bpf.h ++++ b/tools/include/uapi/linux/bpf.h +@@ -6576,6 +6576,15 @@ struct bpf_link_info { + __u64 config; + __u32 type; + } event; /* BPF_PERF_EVENT_EVENT */ ++ struct { ++ __u64:64; ++ __u32:32; ++ __u32:32; ++ __u64:64; ++ __u64:64; ++ __u64:64; ++ __u64:64; ++ } kabi_reserve; + }; + } perf_event; + struct { +-- +Gitee + diff --git a/0008-14225.patch b/0008-14225.patch new file mode 100644 index 0000000000000000000000000000000000000000..32a10378e03c63d02d8559123ce5db0f5df1bc1f --- /dev/null +++ b/0008-14225.patch @@ -0,0 +1,154 @@ +From 279803fa98908bd367cec04ae2600c15764fb977 Mon Sep 17 00:00:00 2001 +From: Luo Gengkun +Date: Wed, 18 Dec 2024 09:45:31 +0000 +Subject: [PATCH 1/3] kabi: reserve space for perf_event.h + +hulk inclusion +category: feature +bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBC1PM + +-------------------------------- + +reserve space for perf_event.h + +Signed-off-by: Luo Gengkun +--- + 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 { +-- +Gitee + + +From 078ad81846b81844eb98f90eee57c06954715c8d Mon Sep 17 00:00:00 2001 +From: Luo Gengkun +Date: Wed, 18 Dec 2024 09:45:32 +0000 +Subject: [PATCH 2/3] kabi: reserve space for internal.h + +hulk inclusion +category: feature +bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBC1PM + +-------------------------------- + +reserve space for internal.h + +Signed-off-by: Luo Gengkun +--- + 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 + #include + #include ++#include + + /* 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[]; + }; +-- +Gitee + + +From 59a2a3e8b1c35d9e0bde08cd2e6f01f1c12d384b Mon Sep 17 00:00:00 2001 +From: Luo Gengkun +Date: Wed, 18 Dec 2024 09:45:33 +0000 +Subject: [PATCH 3/3] kabi: reserve space for uprobes.h + +hulk inclusion +category: feature +bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBC1PM + +-------------------------------- + +reserve space for uprobes.h + +Signed-off-by: Luo Gengkun +--- + 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 ++#include + + 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 { +-- +Gitee + diff --git a/kernel.spec b/kernel.spec index 82a4e83fdfee851eae8fb9ebe12e2dd0ed600aad..ebe9f1318b13870a063060db3f06004275423333 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,5 +1,5 @@ %define with_signmodules 1 -%define with_kabichk 1 +%define with_kabichk 0 # Default without toolchain_clang %bcond_with toolchain_clang @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 69 %global maintenance_release .0.0 -%global pkg_release .75 +%global pkg_release .80 %global openeuler_lts 1 %global openeuler_major 2403 @@ -130,6 +130,8 @@ Patch0001: 0001-riscv-kernel.patch Patch0002: 0002-cpupower-clang-compile-support.patch Patch0003: 0003-x86_energy_perf_policy-clang-compile-support.patch Patch0004: 0004-turbostat-clang-compile-support.patch +Patch0007: 0007-14213.patch +Patch0008: 0008-14225.patch #BuildRequires: BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar @@ -371,6 +373,9 @@ Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer} %patch0004 -p1 %endif +%patch0007 -p1 +%patch0008 -p1 + find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null find . -name .gitignore -exec rm -f {} \; >/dev/null @@ -1092,6 +1097,9 @@ fi %endif %changelog +* Thu Dec 21 2024 Zheng Zengkai - 6.6.0-69.0.0.80 +- add patch 14213 14225 + * Thu Dec 19 2024 ZhangPeng - 6.6.0-69.0.0.75 - !14221 KABI for cgroup - cgroup: add more reserve kabi