Commit a087cdd4 authored by Petr Mladek's avatar Petr Mladek
Browse files

livepatch: Module coming and going callbacks can proceed with all listed patches 



Livepatches can no longer get enabled and disabled repeatedly.
The list klp_patches contains only enabled patches and eventually
the patch in transition.

The module coming and going callbacks do no longer need to check
for these state. They have to proceed with all listed patches.

Suggested-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Acked-by: default avatarMiroslav Benes <mbenes@suse.cz>
Acked-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 49ee4dd2

kernel/livepatch/core.c

+6 −20
Original line number Original line Diff line number Diff line
@@ -1141,12 +1141,6 @@ static void klp_cleanup_module_patches_limited(struct module *mod, 
			if (!klp_is_module(obj) || strcmp(obj->name, mod->name))

			if (!klp_is_module(obj) || strcmp(obj->name, mod->name))

				continue;

				continue;





			/*

			 * Only unpatch the module if the patch is enabled or

			 * is in transition.

			 */

			if (patch->enabled || patch == klp_transition_patch) {



			if (patch != klp_transition_patch)

			if (patch != klp_transition_patch)

				klp_pre_unpatch_callback(obj);

				klp_pre_unpatch_callback(obj);
@@ -1155,7 +1149,6 @@ static void klp_cleanup_module_patches_limited(struct module *mod, 
			klp_unpatch_object(obj);

			klp_unpatch_object(obj);





			klp_post_unpatch_callback(obj);

			klp_post_unpatch_callback(obj);

			}





			klp_free_object_loaded(obj);

			klp_free_object_loaded(obj);

			break;

			break;
@@ -1194,13 +1187,6 @@ int klp_module_coming(struct module *mod) 
				goto err;

				goto err;

			}

			}





			/*

			 * Only patch the module if the patch is enabled or is

			 * in transition.

			 */

			if (!patch->enabled && patch != klp_transition_patch)

				break;



			pr_notice("applying patch '%s' to loading module '%s'\n",

			pr_notice("applying patch '%s' to loading module '%s'\n",

				  patch->mod->name, obj->mod->name);

				  patch->mod->name, obj->mod->name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE