2403 SP1 kpatch软件支持5.10内核热补丁制作

【特性描述】
希望2403 SP1 kpatch软件支持5.10内核热补丁制作，目前测试发现制作失败
【特性竞争力】
欧拉支持5.10和6.6双内核模式，同时kpatch软件包也希望可以兼容两种内核。
【失败复现步骤】

我们使用的gcc版本号为10.3.1
使用的kpatch软件包版本为0.9.9-13
制作热补丁的内核版本为5.10.0-218.0.0（来自2203 SP4）
使用的patch【0001-sched-smart_grid-Prevent-double-free-in-sched_grid_q.patch】内容如下

```
From 39ed1a70617c4ad01b58302683ed1c17d78efba1 Mon Sep 17 00:00:00 2001
From: Yipeng Zou <zouyipeng@huawei.com>
Date: Tue, 12 Nov 2024 10:46:44 +0800
Subject: [PATCH] sched: smart_grid: Prevent double-free in sched_grid_qos_free

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB3N2A

----------------------------------------

KASAN detected a double-free bug in the smart grid.

This issue arises from the uninitialized use of p->grid_qos
within the task {fork,free} processes.

The sequence of events leading to the double-free is as follows:

CPU0				CPU1
fork
(in some error process)
goto bad_fork_free
call_rcu(__delayed_free_task)
				__delayed_free_task
				sched_grid_qos_free
realse_task
delayed_put_task_struct
				__put_task_struct
				sched_grid_qos_free(double free)

When copy_process returns with an error, grid_qos is double-freed.

To address this, grid_qos is initialized to NULL in dup_task_struct,
and a NULL check is added for p->grid_qos before freeing.

Bug report details:
==================================================================
BUG: KASAN: double-free or invalid-free in sched_grid_qos_free+0x3c/0x90

CPU: 343 PID: 0 Comm: swapper/343 Kdump: loaded Tainted: G    B       E
Call trace:
 dump_backtrace+0x0/0x3e0
 show_stack+0x1c/0x28
 dump_stack+0x13c/0x190
 print_address_description.constprop.0+0x28/0x1f0
 kasan_report_invalid_free+0x44/0x6c
 __kasan_slab_free+0x158/0x180
 kasan_slab_free+0x10/0x20
 kfree+0xe0/0x6e0
 sched_grid_qos_free+0x3c/0x90
 free_task+0xc4/0x164
 __put_task_struct+0x264/0x31c
 delayed_put_task_struct+0x94/0x180
 rcu_do_batch+0x2ec/0x9f0
 rcu_core+0x34c/0x530
 rcu_core_si+0x14/0x30
 __do_softirq+0x284/0x900
 irq_exit+0x2d4/0x35c
 __handle_domain_irq+0x108/0x1f0
 gic_handle_irq+0x74/0x620
 el1_irq+0xbc/0x140
 arch_cpu_idle+0x14/0x3c
 default_idle_call+0x80/0x320
 cpuidle_idle_call+0x244/0x2b0
 do_idle+0x138/0x260
 cpu_startup_entry+0x2c/0x70
 secondary_start_kernel+0x35c/0x4e4

Allocated by task 44027:
 kasan_save_stack+0x24/0x50
 __kasan_kmalloc.constprop.0+0xa0/0xcc
 kasan_kmalloc+0xc/0x14
 kmem_cache_alloc_trace+0xdc/0x5d0
 sched_grid_qos_fork+0x50/0x20c
 copy_process+0x8fc/0x3f60
 kernel_clone+0x12c/0x660
 __se_sys_clone+0xc0/0x110
 __arm64_sys_clone+0xa8/0x110
 invoke_syscall+0x70/0x274
 el0_svc_common.constprop.0+0x1fc/0x2dc
 do_el0_svc+0xe8/0x140
 el0_svc+0x1c/0x2c
 el0_sync_handler+0xb0/0xb4
 el0_sync+0x168/0x180

Freed by task 1748:
 kasan_save_stack+0x24/0x50
 kasan_set_track+0x24/0x34
 kasan_set_free_info+0x24/0x4c
 __kasan_slab_free+0xf8/0x180
 kasan_slab_free+0x10/0x20
 kfree+0xe0/0x6e0
 sched_grid_qos_free+0x3c/0x90
 free_task+0xc4/0x164
 __delayed_free_task+0x18/0x3c
 rcu_do_batch+0x2ec/0x9f0
 rcu_core+0x34c/0x530
 rcu_core_si+0x14/0x30
 __do_softirq+0x284/0x900

Fixes: 700bfc4068cf ("sched: smart grid: init sched_grid_qos structure on QOS purpose")
Signed-off-by: Yipeng Zou <zouyipeng@huawei.com>
---
 kernel/fork.c           | 4 ++++
 kernel/sched/grid/qos.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/kernel/fork.c b/kernel/fork.c
index dcf1f9c655d8..9b1ea79deaa5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -953,6 +953,10 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
 	tsk->prefer_cpus = NULL;
 #endif

+#ifdef CONFIG_QOS_SCHED_SMART_GRID
+	tsk->grid_qos = NULL;
+#endif
+
 #ifdef CONFIG_SCHED_TASK_RELATIONSHIP
 	tsk->rship = NULL;
 #endif
diff --git a/kernel/sched/grid/qos.c b/kernel/sched/grid/qos.c
index 7ee3687347ce..60b1ff843bbb 100644
--- a/kernel/sched/grid/qos.c
+++ b/kernel/sched/grid/qos.c
@@ -70,6 +70,9 @@ int sched_grid_qos_fork(struct task_struct *p, struct task_struct *orig)

void sched_grid_qos_free(struct task_struct *p)
 {
+	if (!p->grid_qos)
+		return;
+
 	kfree(p->grid_qos);
 	p->grid_qos = NULL;
 }
--
2.39.3 (Apple Git-145)

```

制作热补丁的命令为

```
syscare build --patch-name 56599  --source kernel-5.10.0-218.0.0.mt20250120.565.mt2203sp4.src.rpm --debuginfo kernel-debuginfo-5.10.0-218.0.0.mt20250120.565.mt2203sp4.x86_64.rpm --output kpatch-out --patch 0001-sched-smart_grid-Prevent-double-free-in-sched_grid_q.patch
```

终端显示的报错内容如下

```
------------------------------
Build Parameters
------------------------------
patch_name:          56599
patch_type:          KernelPatch
patch_version:       1
patch_release:       1
patch_arch:          x86_64
patch_description:   (none)
build_source:        /opt/zhaoxuedong/kpatch-build/syscare-build.154679/package/source/root/rpmbuild/BUILD/kernel-5.10.0
build_spec:          /opt/zhaoxuedong/kpatch-build/syscare-build.154679/package/source/root/rpmbuild/SPECS/kernel.spec
jobs:                48
skip_compiler_check: false
skip_cleanup:        false
verbose:             false
patch_files:
* 0001-sched-smart_grid-Prevent-double-free-in-sched_grid_q.patch
------------------------------
Building patch, this may take a while
Error: KernelPatchBuilder: Failed to build patch

Caused by:
    Process "kpatch-build" exited unsuccessfully, exit_code=1
For more information, please check "/opt/zhaoxuedong/kpatch-build/syscare-build.154679/build.log"
```

查看热补丁制作日志/opt/zhaoxuedong/kpatch-build/syscare-build.154679/patch/build报错内容如下：

```
arch_hibernation_header_restore'
ld: warning: orphan section `.text.relocate_restore_code' from `arch/x86/power/hibernate.o' being placed in section `.text.relocate_restore_code'
ld: warning: orphan section `.text.arch_resume_nosmt' from `arch/x86/power/hibernate.o' being placed in section `.text.arch_resume_nosmt'
ld: warning: orphan section `.bss.relocated_restore_code' from `arch/x86/power/hibernate.o' being placed in section `.bss.relocated_restore_code'
ld: warning: orphan section `.bss.temp_pgt' from `arch/x86/power/hibernate.o' being placed in section `.bss.temp_pgt'
ld: warning: orphan section `.bss.restore_cr3' from `arch/x86/power/hibernate.o' being placed in section `.bss.restore_cr3'
ld: warning: orphan section `.bss.jump_address_phys' from `arch/x86/power/hibernate.o' being placed in section `.bss.jump_address_phys'
ld: warning: orphan section `.bss.restore_jump_address' from `arch/x86/power/hibernate.o' being placed in section `.bss.restore_jump_address'
ld: warning: orphan section `.text.fb_is_primary_device' from `arch/x86/video/fbdev.o' being placed in section `.text.fb_is_primary_device'
  BTFIDS  vmlinux
libbpf: failed to get section(1) name from vmlinux
FAILED: load BTF from vmlinux: Unknown error -4001make: *** [Makefile:1219: vmlinux] Error 255
```

同时我尝试绕过syscare制作热补丁，直接使用下面命令制作热补丁，同样失败。

```
kpatch-build --name vmlinux-dc290264-69ae-48d9-a186-c756582542eb --sourcedir /opt/zhaoxuedong/kpatch-build/syscare-build.154679/package/source/root/rpmbuild/BUILD/kernel-5.10.0/linux-5.10.0-218.0.0.mt20250120.565.x86_64 --config /opt/zhaoxuedong/kpatch-build/syscare-build.154679/package/source/root/rpmbuild/BUILD/kernel-5.10.0/linux-5.10.0-218.0.0.mt20250120.565.x86_64/.config --vmlinux /opt/zhaoxuedong/kpatch-build/syscare-build.154679/package/debuginfo/usr/lib/debug/lib/modules/5.10.0-218.0.0.mt20250120.565.mt2203sp4.x86_64/vmlinux --jobs 48 --output /opt/zhaoxuedong/kpatch-build/syscare-build.154679/patch/output --non-replace --skip-cleanup /opt/zhaoxuedong/kpatch-build/0001-sched-smart_grid-Prevent-double-free-in-sched_grid_q.patch
```

该命令报错日志/root/.kpatch/build.log如下

```
ld: warning: orphan section `.text.relocate_restore_code' from `arch/x86/power/hibernate.o' being placed in section `.text.relocate_restore_code'
ld: warning: orphan section `.text.arch_resume_nosmt' from `arch/x86/power/hibernate.o' being placed in section `.text.arch_resume_nosmt'
ld: warning: orphan section `.bss.relocated_restore_code' from `arch/x86/power/hibernate.o' being placed in section `.bss.relocated_restore_code'
ld: warning: orphan section `.bss.temp_pgt' from `arch/x86/power/hibernate.o' being placed in section `.bss.temp_pgt'
ld: warning: orphan section `.bss.restore_cr3' from `arch/x86/power/hibernate.o' being placed in section `.bss.restore_cr3'
ld: warning: orphan section `.bss.jump_address_phys' from `arch/x86/power/hibernate.o' being placed in section `.bss.jump_address_phys'
ld: warning: orphan section `.bss.restore_jump_address' from `arch/x86/power/hibernate.o' being placed in section `.bss.restore_jump_address'
ld: warning: orphan section `.text.fb_is_primary_device' from `arch/x86/video/fbdev.o' being placed in section `.text.fb_is_primary_device'
  BTFIDS  vmlinux
libbpf: failed to get section(1) name from vmlinux
FAILED: load BTF from vmlinux: Unknown error -4001make: *** [Makefile:1219: vmlinux] Error 255
```

【其他信息】
patch本身应该没有问题，因为这个patch可以使用2203 SP4的kpatch正常制作热补丁并安装
我们5.10和6.6内核都使用gcc版本号为10.3.1，5.10可以使用2203 SP4的kpatch正常制作热补丁，6.6可以使用2204 SP1的kpatch正常制作热补丁。

【硬件架构】
NoArch
【特性约束】
简单说明已知的约束或者影响，没有可以填写NA
【涉及仓库】
kpatch
【交付个人/团队】

src-openEuler/kpatch

内容风险标识

评论 (1)

src-openEuler/kpatch .gitee-modal { width: 500px !important; }

内容风险标识