lkml.org 
[lkml]   [2019]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/4] livepatch: Module coming and going callbacks can proceed all listed patches
On Wed, Jan 16, 2019 at 05:17:19PM +0100, Petr Mladek wrote:
> Livepatches can not longer get enabled and disabled repeatedly.

nit: s/not longer/no longer/g

> The list klp_patches contains only enabled patches and eventually
> the patch in transition.
>
> The module coming and going callbacks do not longer need to
> check for these state. They have to proceed all listed patches.

nit: suggestion to modify "proceed all" to "proceed with" or "execute
all". Same suggestion for the subject line. (I keep reading it as
"precede all" and I'm wondering if there is some kind of ordering
change.)

>
> Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
> Signed-off-by: Petr Mladek <pmladek@suse.com>
> ---
> kernel/livepatch/core.c | 26 ++++++--------------------
> 1 file changed, 6 insertions(+), 20 deletions(-)
>
> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> index b716a6289204..684766d306ad 100644
> --- a/kernel/livepatch/core.c
> +++ b/kernel/livepatch/core.c
> @@ -1141,21 +1141,14 @@ static void klp_cleanup_module_patches_limited(struct module *mod,
> if (!klp_is_module(obj) || strcmp(obj->name, mod->name))
> 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)
> - klp_pre_unpatch_callback(obj);
> + if (patch != klp_transition_patch)
> + klp_pre_unpatch_callback(obj);
>
> - pr_notice("reverting patch '%s' on unloading module '%s'\n",
> - patch->mod->name, obj->mod->name);
> - klp_unpatch_object(obj);
> + pr_notice("reverting patch '%s' on unloading module '%s'\n",
> + patch->mod->name, obj->mod->name);
> + klp_unpatch_object(obj);
>
> - klp_post_unpatch_callback(obj);
> - }
> + klp_post_unpatch_callback(obj);
>
> klp_free_object_loaded(obj);
> break;
> @@ -1194,13 +1187,6 @@ int klp_module_coming(struct module *mod)
> 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",
> patch->mod->name, obj->mod->name);
>
> --
> 2.13.7
>

Any simplication to the callback code is welcome! Thanks for cleaning
this one up.

With a few commit msg nits,
Acked-by: Joe Lawrence <joe.lawrence@redhat.com>

-- Joe

\
 
 \ /
  Last update: 2019-01-21 23:48    [W:0.150 / U:11.676 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site