Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255e732c authored by Jessica Yu's avatar Jessica Yu Committed by Jiri Kosina
Browse files

livepatch: use arch_klp_init_object_loaded() to finish arch-specific tasks 



Introduce arch_klp_init_object_loaded() to complete any additional
arch-specific tasks during patching. Architecture code may override this
function.

Signed-off-by: default avatarJessica Yu <jeyu@redhat.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Acked-by: default avatarMiroslav Benes <mbenes@suse.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 694d0d0b

include/linux/livepatch.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,9 @@ int klp_unregister_patch(struct klp_patch *); 
int klp_enable_patch(struct klp_patch *);

int klp_enable_patch(struct klp_patch *);

int klp_disable_patch(struct klp_patch *);

int klp_disable_patch(struct klp_patch *);





void arch_klp_init_object_loaded(struct klp_patch *patch,

				 struct klp_object *obj);



/* Called from the module loader during module coming/going states */

/* Called from the module loader during module coming/going states */

int klp_module_coming(struct module *mod);

int klp_module_coming(struct module *mod);

void klp_module_going(struct module *mod);

void klp_module_going(struct module *mod);

kernel/livepatch/core.c

+13 −3
Original line number Original line Diff line number Diff line
@@ -274,7 +274,6 @@ static int klp_write_object_relocations(struct module *pmod, 




	objname = klp_is_module(obj) ? obj->name : "vmlinux";

	objname = klp_is_module(obj) ? obj->name : "vmlinux";





	module_disable_ro(pmod);

	/* For each klp relocation section */

	/* For each klp relocation section */

	for (i = 1; i < pmod->klp_info->hdr.e_shnum; i++) {

	for (i = 1; i < pmod->klp_info->hdr.e_shnum; i++) {

		sec = pmod->klp_info->sechdrs + i;

		sec = pmod->klp_info->sechdrs + i;
@@ -309,7 +308,6 @@ static int klp_write_object_relocations(struct module *pmod, 
			break;

			break;

	}

	}





	module_enable_ro(pmod, true);

	return ret;

	return ret;

}

}
@@ -763,6 +761,12 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func) 
				    func->old_sympos ? func->old_sympos : 1);

				    func->old_sympos ? func->old_sympos : 1);

}

}





/* Arches may override this to finish any remaining arch-specific tasks */

void __weak arch_klp_init_object_loaded(struct klp_patch *patch,

					struct klp_object *obj)

{

}



/* parts of the initialization that is done only when the object is loaded */

/* parts of the initialization that is done only when the object is loaded */

static int klp_init_object_loaded(struct klp_patch *patch,

static int klp_init_object_loaded(struct klp_patch *patch,

				  struct klp_object *obj)

				  struct klp_object *obj)
@@ -770,9 +774,15 @@ static int klp_init_object_loaded(struct klp_patch *patch, 
	struct klp_func *func;

	struct klp_func *func;

	int ret;

	int ret;





	module_disable_ro(patch->mod);

	ret = klp_write_object_relocations(patch->mod, obj);

	ret = klp_write_object_relocations(patch->mod, obj);

	if (ret)

	if (ret) {

		module_enable_ro(patch->mod, true);

		return ret;

		return ret;

	}



	arch_klp_init_object_loaded(patch, obj);

	module_enable_ro(patch->mod, true);





	klp_for_each_func(obj, func) {

	klp_for_each_func(obj, func) {

		ret = klp_find_object_symbol(obj->name, func->old_name,

		ret = klp_find_object_symbol(obj->name, func->old_name,