From 5e77c08872f116f9e96a79b7a206a9cddf07575e Mon Sep 17 00:00:00 2001 From: liankong Date: Sun, 30 Mar 2025 17:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D:=20?= =?UTF-8?q?=E5=86=85=E5=AD=98=E6=AE=B5=E7=BC=93=E5=AD=98/=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/kpm/kpm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/kpm/kpm.c b/kernel/kpm/kpm.c index 273306d0..e67e198d 100644 --- a/kernel/kpm/kpm.c +++ b/kernel/kpm/kpm.c @@ -106,6 +106,8 @@ void *kpm_malloc_exec(size_t size) #endif #endif + flush_icache_all(); + return addr; } @@ -802,7 +804,7 @@ static int kpm_move_module(struct kpm_module *mod, struct kpm_load_info *info) /* 分配连续内存（按页对齐） */ mod->size = ALIGN(mod->size, PAGE_SIZE); - mod->start = module_alloc(mod->size); // 使用内核的 module_alloc 接口 + mod->start = kpm_malloc_exec(mod->size); if (!mod->start) { printk(KERN_ERR "ARM64 KPM Loader: Failed to allocate module memory\n"); return -ENOMEM; @@ -811,6 +813,7 @@ static int kpm_move_module(struct kpm_module *mod, struct kpm_load_info *info) /* 设置内存可执行权限（关键修复） */ set_memory_x((unsigned long)mod->start, mod->size >> PAGE_SHIFT); + flush_icache_all(); printk(KERN_INFO "ARM64 KPM Loader: Final section addresses (aligned base=0x%px):\n", mod->start); @@ -835,6 +838,8 @@ static int kpm_move_module(struct kpm_module *mod, struct kpm_load_info *info) } } + flush_icache_all(); + /* 更新段头中的虚拟地址 */ shdr->sh_addr = (unsigned long)dest; curr_offset += shdr->sh_size; @@ -1005,6 +1010,7 @@ long kpm_load_module(const void *data, int len, const char *args, /* 替换 flush_icache_all() 为 flush_icache_range() */ flush_icache_range((unsigned long)mod->start, (unsigned long)mod->start + mod->size); + flush_icache_all(); rc = mod->init(mod->args, event, reserved); if (!rc) {