livepatch: separate enabled and patched states

Once we have a consistency model, patches and their objects will be
enabled and disabled at different times.  For example, when a patch is
disabled, its loaded objects' funcs can remain registered with ftrace
indefinitely until the unpatching operation is complete and they're no
longer in use.

It's less confusing if we give them different names: patches can be
enabled or disabled; objects (and their funcs) can be patched or
unpatched:

- Enabled means that a patch is logically enabled (but not necessarily
  fully applied).

- Patched means that an object's funcs are registered with ftrace and
  added to the klp_ops func stack.

Also, since these states are binary, represent them with booleans
instead of ints.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Miroslav Benes <mbenes@suse.cz>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 6 insertions, 11 deletions

diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index 5cc20e588a22..9787a63b57ac 100644
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -28,11 +28,6 @@
 
 #include <asm/livepatch.h>
 
-enum klp_state {
-        KLP_DISABLED,
-        KLP_ENABLED
-};
-
 /**
  * struct klp_func - function structure for live patching
  * @old_name:   name of the function to be patched
@@ -41,8 +36,8 @@ enum klp_state {
  *              can be found (optional)
  * @old_addr:   the address of the function being patched
  * @kobj:       kobject for sysfs resources
- * @state:      tracks function-level patch application state
  * @stack_node: list node for klp_ops func_stack list
+ * @patched:    the func has been added to the klp_ops list
  */
 struct klp_func {
         /* external */
@@ -60,8 +55,8 @@ struct klp_func {
         /* internal */
         unsigned long old_addr;
         struct kobject kobj;
-        enum klp_state state;
         struct list_head stack_node;
+        bool patched;
 };
 
 /**
@@ -71,7 +66,7 @@ struct klp_func {
  * @kobj:       kobject for sysfs resources
  * @mod:        kernel module associated with the patched object
  *              (NULL for vmlinux)
- * @state:      tracks object-level patch application state
+ * @patched:    the object's funcs have been added to the klp_ops list
  */
 struct klp_object {
         /* external */
@@ -81,7 +76,7 @@ struct klp_object {
         /* internal */
         struct kobject kobj;
         struct module *mod;
-        enum klp_state state;
+        bool patched;
 };
 
 /**
@@ -90,7 +85,7 @@ struct klp_object {
  * @objs:       object entries for kernel objects to be patched
  * @list:       list node for global list of registered patches
  * @kobj:       kobject for sysfs resources
- * @state:      tracks patch-level application state
+ * @enabled:    the patch is enabled (but operation may be incomplete)
  */
 struct klp_patch {
         /* external */
@@ -100,7 +95,7 @@ struct klp_patch {
         /* internal */
         struct list_head list;
         struct kobject kobj;
-        enum klp_state state;
+        bool enabled;
 };
 
 #define klp_for_each_object(patch, obj) \