Merge branch 'for-4.15/callbacks' into for-linus

This pulls in an infrastructure/API that allows livepatch writers to
register pre-patch and post-patch callbacks that allow for running a
glue code necessary for finalizing the patching if necessary.

Conflicts:
	kernel/livepatch/core.c
	- trivial conflict by adding a callback call into
	  module going notifier vs. moving that code block
	  to klp_cleanup_module_patches_limited()

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --cc kernel/livepatch/core.c
index bf8c8fd72589ddeeae34662a8d76352afa890678,287f71e9dbfeb6efd0d65f1dbd3e46c86427526a..de9e45dca70f6887c50f08ad3d747540f96f50f1
--- 1/kernel/livepatch/core.c
--- 2/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@@ -830,41 -844,6 +844,47 @@@ int klp_register_patch(struct klp_patc
  }
  EXPORT_SYMBOL_GPL(klp_register_patch);
  
 +/*
 + * Remove parts of patches that touch a given kernel module. The list of
 + * patches processed might be limited. When limit is NULL, all patches
 + * will be handled.
 + */
 +static void klp_cleanup_module_patches_limited(struct module *mod,
 +                                             struct klp_patch *limit)
 +{
 +      struct klp_patch *patch;
 +      struct klp_object *obj;
 +
 +      list_for_each_entry(patch, &klp_patches, list) {
 +              if (patch == limit)
 +                      break;
 +
 +              klp_for_each_object(patch, obj) {
 +                      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);
++
 +                              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_free_object_loaded(obj);
 +                      break;
 +              }
 +      }
 +}
 +
  int klp_module_coming(struct module *mod)
  {
        int ret;