Commit 3c2830a6 authored by Zheng Yejian's avatar Zheng Yejian Committed by Zheng Zengkai
Browse files

livepatch: Print logs when patch text failed 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I53WZ9



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

Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
Reviewed-by: default avatarKuohai Xu <xukuohai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 448e07ca

arch/arm64/kernel/livepatch.c

+17 −4
Original line number Diff line number Diff line
@@ -342,12 +342,16 @@ long arch_klp_save_old_code(struct arch_klp_data *arch_data, void *old_func) 
static int do_patch(unsigned long pc, unsigned long new_addr)

{

	u32 insns[LJMP_INSN_SIZE];

	int ret;



	if (offset_in_range(pc, new_addr, SZ_128M)) {

		insns[0] = aarch64_insn_gen_branch_imm(pc, new_addr,

						       AARCH64_INSN_BRANCH_NOLINK);

		if (aarch64_insn_patch_text_nosync((void *)pc, insns[0]))

		ret = aarch64_insn_patch_text_nosync((void *)pc, insns[0]);

		if (ret) {

			pr_err("patch instruction small range failed, ret=%d\n", ret);

			return -EPERM;

		}

	} else {

#ifdef CONFIG_ARM64_MODULE_PLTS

		int i;
@@ -357,9 +361,13 @@ static int do_patch(unsigned long pc, unsigned long new_addr) 
		insns[2] = cpu_to_le32(0xf2c00010 | (((new_addr >> 32) & 0xffff)) << 5);

		insns[3] = cpu_to_le32(0xd61f0200);

		for (i = 0; i < LJMP_INSN_SIZE; i++) {

			if (aarch64_insn_patch_text_nosync(((u32 *)pc) + i, insns[i]))

			ret = aarch64_insn_patch_text_nosync(((u32 *)pc) + i, insns[i]);

			if (ret) {

				pr_err("patch instruction(%d) large range failed, ret=%d\n",

				       i, ret);

				return -EPERM;

			}

		}

#else

		/*

		 * When offset from 'new_addr' to 'pc' is out of SZ_128M range but
@@ -391,14 +399,19 @@ void arch_klp_unpatch_func(struct klp_func *func) 
	struct klp_func *next_func;

	unsigned long pc;

	int i;

	int ret;



	func_node = func->func_node;

	pc = (unsigned long)func_node->old_func;

	list_del_rcu(&func->stack_node);

	if (list_empty(&func_node->func_stack)) {

		for (i = 0; i < LJMP_INSN_SIZE; i++) {

			aarch64_insn_patch_text_nosync(((u32 *)pc) + i,

			ret = aarch64_insn_patch_text_nosync(((u32 *)pc) + i,

							     func_node->arch_data.old_insns[i]);

			if (ret) {

				pr_err("restore instruction(%d) failed, ret=%d\n", i, ret);

				return;

			}

		}

	} else {

		next_func = list_first_or_null_rcu(&func_node->func_stack,

arch/powerpc/kernel/livepatch_32.c

+16 −5
Original line number Diff line number Diff line
@@ -403,8 +403,10 @@ static int do_patch(unsigned long pc, unsigned long new_addr) 


		create_branch(&instr, (struct ppc_inst *)pc, new_addr, 0);

		ret = patch_instruction((struct ppc_inst *)pc, instr);

		if (ret)

		if (ret) {

			pr_err("patch instruction small range failed, ret=%d\n", ret);

			return -EPERM;

		}

	} else {

		/*

		 * lis r12,sym@ha
@@ -420,10 +422,13 @@ static int do_patch(unsigned long pc, unsigned long new_addr) 
		for (i = 0; i < LJMP_INSN_SIZE; i++) {

			ret = patch_instruction((struct ppc_inst *)(((u32 *)pc) + i),

						ppc_inst(insns[i]));

			if (ret)

			if (ret) {

				pr_err("patch instruction(%d) large range failed, ret=%d\n",

				       i, ret);

				return -EPERM;

			}

		}

	}

	return 0;

}
@@ -446,14 +451,20 @@ void arch_klp_unpatch_func(struct klp_func *func) 
	struct klp_func *next_func;

	unsigned long pc;

	int i;

	int ret;



	func_node = func->func_node;

	pc = (unsigned long)func_node->old_func;

	list_del_rcu(&func->stack_node);

	if (list_empty(&func_node->func_stack)) {

		for (i = 0; i < LJMP_INSN_SIZE; i++)

			patch_instruction((struct ppc_inst *)(((u32 *)pc) + i),

		for (i = 0; i < LJMP_INSN_SIZE; i++) {

			ret = patch_instruction((struct ppc_inst *)(((u32 *)pc) + i),

						ppc_inst(func_node->arch_data.old_insns[i]));

			if (ret) {

				pr_err("restore instruction(%d) failed, ret=%d\n", i, ret);

				return;

			}

		}

	} else {

		next_func = list_first_or_null_rcu(&func_node->func_stack,

					struct klp_func, stack_node);

arch/powerpc/kernel/livepatch_64.c

+12 −4
Original line number Diff line number Diff line
@@ -446,8 +446,10 @@ static int do_patch(unsigned long pc, unsigned long new_addr, 


	ret = livepatch_create_branch(pc, (unsigned long)&arch_data->trampoline,

				      new_addr, old_mod);

	if (ret)

	if (ret) {

		pr_err("create branch failed, ret=%d\n", ret);

		return -EPERM;

	}

	flush_icache_range(pc, pc + LJMP_INSN_SIZE * PPC64_INSN_SIZE);

	pr_debug("[%s %d] old = 0x%lx/0x%lx/%pS, new = 0x%lx/0x%lx/%pS\n",

		 __func__, __LINE__,
@@ -478,14 +480,20 @@ void arch_klp_unpatch_func(struct klp_func *func) 
	struct klp_func *next_func;

	unsigned long pc;

	int i;

	int ret;



	func_node = func->func_node;

	pc = (unsigned long)func_node->old_func;

	list_del_rcu(&func->stack_node);

	if (list_empty(&func_node->func_stack)) {

		for (i = 0; i < LJMP_INSN_SIZE; i++)

			patch_instruction((struct ppc_inst *)((u32 *)pc + i),

		for (i = 0; i < LJMP_INSN_SIZE; i++) {

			ret = patch_instruction((struct ppc_inst *)((u32 *)pc + i),

						ppc_inst(func_node->arch_data.old_insns[i]));

			if (ret) {

				pr_err("restore instruction(%d) failed, ret=%d\n", i, ret);

				break;

			}

		}



		pr_debug("[%s %d] restore insns at 0x%lx\n", __func__, __LINE__, pc);

		flush_icache_range(pc, pc + LJMP_INSN_SIZE * PPC64_INSN_SIZE);