livepatch: new API to track system state changes
Subsystems (3)
Petr Mladek
maintainerv3 cover livepatch: new API to track system state changes
Hi,
this is another piece in the puzzle that helps to maintain more livepatches.
Especially pre/post (un)patch callbacks might change a system state. Any newly installed livepatch has to somehow deal with system state modifications done be already installed livepatches.
This patchset provides a simple and generic API that helps to keep and pass information between the livepatches. It is also usable to prevent loading incompatible livepatches.
Changes since v2:
+ Typo fixes [Miroslav]
+ Move the documentation at the end of the list [Miroslav]
+ Add Miroslav's acks
Changes since v1:
+ Use "unsigned long" instead of "int" for "state.id" [Nicolai]
+ Use "unsigned int" instead of "int" for "state.version [Petr]
+ Include "state.h" to avoid warning about non-static func [Miroslav]
+ Simplify logic in klp_is_state_compatible() [Miroslav]
+ Document how livepatches should handle the state [Nicolai]
+ Fix some typos, formulation, module metadata [Joe, Miroslav]
Petr Mladek (5):
livepatch: Keep replaced patches until post_patch callback is called
livepatch: Basic API to track system state changes
livepatch: Allow to distinguish different version of system state
changes
livepatch: Documentation of the new API for tracking system state
changes
livepatch: Selftests of the API for tracking system state changes
Documentation/livepatch/index.rst | 1 + Documentation/livepatch/system-state.rst | 167 +++++++++++++++++++++ include/linux/livepatch.h | 17 +++ kernel/livepatch/Makefile | 2 +- kernel/livepatch/core.c | 44 ++++-- kernel/livepatch/core.h | 5 +- kernel/livepatch/state.c | 122 +++++++++++++++ kernel/livepatch/state.h | 9 ++ kernel/livepatch/transition.c | 12 +- lib/livepatch/Makefile | 5 +- lib/livepatch/test_klp_state.c | 161 ++++++++++++++++++++ lib/livepatch/test_klp_state2.c | 190 ++++++++++++++++++++++++ lib/livepatch/test_klp_state3.c | 5 + tools/testing/selftests/livepatch/Makefile | 3 +- tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++ 15 files changed, 902 insertions(+), 21 deletions(-) create mode 100644 Documentation/livepatch/system-state.rst create mode 100644 kernel/livepatch/state.c create mode 100644 kernel/livepatch/state.h create mode 100644 lib/livepatch/test_klp_state.c create mode 100644 lib/livepatch/test_klp_state2.c create mode 100644 lib/livepatch/test_klp_state3.c create mode 100755 tools/testing/selftests/livepatch/test-state.sh
Signature · 1 line
2.16.4
Petr Mladek
maintainerPATCH v3 1/5 livepatch: Keep replaced patches until post_patch callback is called
Pre/post (un)patch callbacks might manipulate the system state. Cumulative livepatches might need to take over the changes made by the replaced ones. For this they might need to access some data stored or referenced by the old livepatches.
Therefore the replaced livepatches have to stay around until post_patch() callback is called. It is achieved by calling the free functions later. It is the same location where disabled livepatches have already been freed.
--- kernel/livepatch/core.c | 36 ++++++++++++++++++++++++++---------- kernel/livepatch/core.h | 5 +++-- kernel/livepatch/transition.c | 12 ++++++------ 3 files changed, 35 insertions(+), 18 deletions(-)
kernel/livepatch/core.c +26 -10
@@ -632,7 +632,7 @@ static void klp_free_objects_dynamic(struct klp_patch *patch)* The operation must be completed by calling klp_free_patch_finish() * outside klp_mutex. */ -void klp_free_patch_start (struct klp_patch *patch) +static void klp_free_patch_start (struct klp_patch *patch) {if (!list_empty (&patch->list))list_del (&patch->list);
@@ -677,6 +677,23 @@ static void klp_free_patch_work_fn(struct work_struct *work)klp_free_patch_finish (patch); } +void klp_free_patch_async (struct klp_patch *patch) +{ +klp_free_patch_start (patch); +schedule_work (&patch->free_work); +} + +void klp_free_replaced_patches_async (struct klp_patch *new_patch) +{ +struct klp_patch *old_patch, *tmp_patch; + +klp_for_each_patch_safe (old_patch, tmp_patch) { +if (old_patch == new_patch) +return ; +klp_free_patch_async (old_patch); + } +} +static int klp_init_func (struct klp_object *obj,struct klp_func *func) {if (!func->old_name)
@@ -1022,12 +1039,13 @@ int klp_enable_patch(struct klp_patch *patch)EXPORT_SYMBOL_GPL (klp_enable_patch);/* -* This function removes replaced patches. +* This function unpatches objects from the replaced livepatches. * * We could be pretty aggressive here. It is called in the situation where -* these structures are no longer accessible. All functions are redirected -* by the klp_transition_patch. They use either a new code or they are in -* the original code because of the special nop function patches. +* these structures are no longer accessed from the ftrace handler. +* All functions are redirected by the klp_transition_patch. They +* use either a new code or they are in the original code because +* of the special nop function patches. * * The only exception is when the transition was forced. In this case, * klp_ftrace_handler() might still see the replaced patch on the stack.
@@ -1035,18 +1053,16 @@ EXPORT_SYMBOL_GPL(klp_enable_patch);* thanks to RCU. We only have to keep the patches on the system. Also * this is handled transparently by patch->module_put. */ -void klp_discard_replaced_patches (struct klp_patch *new_patch) +void klp_unpatch_replaced_patches (struct klp_patch *new_patch) { -struct klp_patch *old_patch, *tmp_patch; +struct klp_patch *old_patch; -klp_for_each_patch_safe (old_patch, tmp_patch) { +klp_for_each_patch (old_patch) {if (old_patch == new_patch)return ; old_patch->enabled = false;klp_unpatch_objects (old_patch); -klp_free_patch_start (old_patch); -schedule_work (&old_patch->free_work); } }
kernel/livepatch/core.h +3 -2
@@ -13,8 +13,9 @@ extern struct list_head klp_patches;#define klp_for_each_patch (patch) \ list_for_each_entry(patch, &klp_patches, list) -void klp_free_patch_start (struct klp_patch *patch); -void klp_discard_replaced_patches (struct klp_patch *new_patch); +void klp_free_patch_async (struct klp_patch *patch); +void klp_free_replaced_patches_async (struct klp_patch *new_patch); +void klp_unpatch_replaced_patches (struct klp_patch *new_patch);void klp_discard_nops (struct klp_patch *new_patch);static inline bool klp_is_object_loaded (struct klp_object *obj)
kernel/livepatch/transition.c +6 -6
@@ -78,7 +78,7 @@ static void klp_complete_transition(void) klp_target_state == KLP_PATCHED ? "patching" : "unpatching");if (klp_transition_patch->replace && klp_target_state ==KLP_PATCHED ) { -klp_discard_replaced_patches (klp_transition_patch); +klp_unpatch_replaced_patches (klp_transition_patch);klp_discard_nops (klp_transition_patch); }
@@ -446,14 +446,14 @@ void klp_try_complete_transition(void)klp_complete_transition ();/* -* It would make more sense to free the patch in +* It would make more sense to free the unused patches in * klp_complete_transition() but it is called also * from klp_cancel_transition(). */ -if (!patch->enabled) { -klp_free_patch_start (patch); -schedule_work (&patch->free_work); - } +if (!patch->enabled) +klp_free_patch_async (patch); +else if (patch->replace) +klp_free_replaced_patches_async (patch); }/*
Signature · 1 line
2.16.4
Petr Mladek
maintainerPATCH v3 2/5 livepatch: Basic API to track system state changes
In reply to Petr MladekThis is another step how to help maintaining more livepatches.
One big help was the atomic replace and cumulative livepatches. These livepatches replace the already installed ones. Therefore it should be enough when each cumulative livepatch is consistent.
The problems might come with shadow variables and callbacks. They might change the system behavior or state so that it is no longer safe to go back and use an older livepatch or the original kernel code. Also, a new livepatch must be able to detect changes which were made by the already installed livepatches.
This is where the livepatch system state tracking gets useful. It allows to:
- find whether a system state has already been modified by previous livepatches
- store data needed to manipulate and restore the system state
The information about the manipulated system states is stored in an array of struct klp_state. It can be searched by two new functions klp_get_state() and klp_get_prev_state().
The dependencies are going to be solved by a version field added later. The only important information is that it will be allowed to modify the same state by more non-cumulative livepatches. It is similar to allowing to modify the same function several times. The livepatch author is responsible for preventing incompatible changes.
--- include/linux/livepatch.h | 15 +++++++++ kernel/livepatch/Makefile | 2 +- kernel/livepatch/state.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 kernel/livepatch/state.c
include/linux/livepatch.h +15 -0
@@ -130,10 +130,21 @@ struct klp_object {bool patched; }; +/** +* struct klp_state - state of the system modified by the livepatch +* @id: system state identifier (non-zero) +* @data: custom data +*/ +struct klp_state { +unsigned long id; +void *data; +}; +/** * struct klp_patch - patch structure for live patching * @mod: reference to the live patch module * @objs: object entries for kernel objects to be patched +* @states: system states that can get modified * @replace: replace all actively used patches * @list: list node for global list of actively used patches * @kobj: kobject for sysfs resources
@@ -147,6 +158,7 @@ struct klp_patch {/* external */ struct module *mod;struct klp_object *objs; +struct klp_state *states;bool replace;/* internal */
@@ -217,6 +229,9 @@ void *klp_shadow_get_or_alloc(void *obj, unsigned long id,void klp_shadow_free (void *obj,unsigned long id,klp_shadow_dtor_t dtor);void klp_shadow_free_all (unsigned long id,klp_shadow_dtor_t dtor); +struct klp_state *klp_get_state (struct klp_patch *patch,unsigned long id); +struct klp_state *klp_get_prev_state (unsigned long id); +#else /* !CONFIG_LIVEPATCH */ static inline int klp_module_coming (struct module *mod) {return 0 ; }
kernel/livepatch/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_LIVEPATCH) += livepatch.o -livepatch-objs := core.o patch.o shadow.o transition.o +livepatch-objs := core.o patch.o shadow.o state.o transition.o
kernel/livepatch/state.c new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.16.4
Petr Mladek
maintainerPATCH v3 3/5 livepatch: Allow to distinguish different version of system state changes
In reply to Petr MladekThe atomic replace runs pre/post (un)install callbacks only from the new livepatch. There are several reasons for this:
+ Simplicity: clear ordering of operations, no interactions between old and new callbacks.
+ Reliability: only new livepatch knows what changes can already be made by older livepatches and how to take over the state.
+ Testing: the atomic replace can be properly tested only when a newer livepatch is available. It might be too late to fix unwanted effect
of callbacks from older livepatches.
It might happen that an older change is not enough and the same system state has to be modified another way. Different changes need to get distinguished by a version number added to struct klp_state.
The version can also be used to prevent loading incompatible livepatches. The check is done when the livepatch is enabled. The rules are:
+ Any completely new system state modification is allowed.
+ System state modifications with the same or higher version are allowed for already modified system states.
+ Cumulative livepatches must handle all system state modifications from already installed livepatches.
+ Non-cumulative livepatches are allowed to touch already modified system states.
--- include/linux/livepatch.h | 2 ++ kernel/livepatch/core.c | 8 ++++++++ kernel/livepatch/state.c | 39 ++++++++++++++++++++++++++++++++++++++- kernel/livepatch/state.h | 9 +++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 kernel/livepatch/state.h
include/linux/livepatch.h +2 -0
@@ -133,10 +133,12 @@ struct klp_object {/** * struct klp_state - state of the system modified by the livepatch * @id: system state identifier (non-zero) +* @version: version of the change (non-zero) * @data: custom data */ struct klp_state {unsigned long id; +unsigned int version;void *data; };
kernel/livepatch/core.c +8 -0
@@ -22,6 +22,7 @@#include <asm/cacheflush.h> #include "core.h" #include "patch.h" +#include "state.h" #include "transition.h" /*
@@ -1009,6 +1010,13 @@ int klp_enable_patch(struct klp_patch *patch)mutex_lock (&klp_mutex); +if (!klp_is_patch_compatible (patch)) { +pr_err ("Livepatch patch (%s) is not compatible with the already installed livepatches.\n" , + patch->mod->name); +mutex_unlock (&klp_mutex); +return -EINVAL ; + } + ret =klp_init_patch_early (patch);if (ret) {mutex_unlock (&klp_mutex);
kernel/livepatch/state.c +38 -1
@@ -9,11 +9,12 @@#include <linux/livepatch.h> #include "core.h" +#include "state.h" #include "transition.h" #define klp_for_each_state (patch, state) \ for (state = patch->states; \ - state && state->id; \ + state && state->id && state->version; \ state++)/**
@@ -83,3 +84,39 @@ struct klp_state *klp_get_prev_state(unsigned long id)return last_state; }EXPORT_SYMBOL_GPL (klp_get_prev_state); + +/* Check if the patch is able to deal with the given system state. */ +static bool klp_is_state_compatible (struct klp_patch *patch, +struct klp_state *state) +{ +struct klp_state *new_state; + + new_state =klp_get_state (patch, state->id); + +if (new_state) +return new_state->version >= state->version; + +/* Cumulative livepatch must handle all already modified states. */ +return !patch->replace; +} + +/* +* Check that the new livepatch will not break the existing system states. +* Cumulative patches must handle all already modified states. +* Non-cumulative patches can touch already modified states. +*/ +bool klp_is_patch_compatible (struct klp_patch *patch) +{ +struct klp_patch *old_patch; +struct klp_state *state; + + +klp_for_each_patch (old_patch) { +klp_for_each_state (old_patch, state) { +if (!klp_is_state_compatible (patch, state)) +return false; + } + } + +return true; +}
kernel/livepatch/state.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LIVEPATCH_STATE_H +#define _LIVEPATCH_STATE_H + +#include <linux/livepatch.h> + +bool klp_is_patch_compatible (struct klp_patch *patch); + +#endif /* _LIVEPATCH_STATE_H */
Signature · 1 line
2.16.4
Re: [PATCH v3 3/5] livepatch: Allow to distinguish different version of system state changes
Hi Petr,
Sorry for taking so long...
include/linux/livepatch.h struct klp_object { · line 136
Quoted 9 lines · Petr Mladek
include/linux/livepatch.h +1
-0@@ -133,10 +133,12 @@ struct klp_object {/** * struct klp_state - state of the system modified by the livepatch * @id: system state identifier (non-zero) +* @version: version of the change (non-zero)
Is it necessary to assume that 'version' is non-zero? It would be easy for a user to not realize that and start with version 0. Then the patch state would be silently ignored.
I have the same concern about 'id', but I guess at least one of them has to be non-zero to differentiate valid entries from the array terminator.
Quoted 4 lines
include/linux/livepatch.h +4
-0+/* Check if the patch is able to deal with the given system state. */ +static bool klp_is_state_compatible (struct klp_patch *patch, +struct klp_state *state) +{
include/linux/livepatch.h struct klp_object {
Quoted 10 lines
include/linux/livepatch.h +10
-0+struct klp_state *new_state; + + new_state =klp_get_state (patch, state->id); + +if (new_state) +return new_state->version >= state->version; + +/* Cumulative livepatch must handle all already modified states. */ +return !patch->replace; +}
From my perspective I view '!new_state' as an error condition. I'd find it easier to read if the ordering were changed to check for the error first:
if (!new_state) {
/*
* A cumulative livepatch must handle all already
* modified states.
*/
return !patch->replace;
}
return new_state->version >= state->version;include/linux/livepatch.h
Quoted 13 lines
include/linux/livepatch.h +13
-0+ +/* +* Check that the new livepatch will not break the existing system states. +* Cumulative patches must handle all already modified states. +* Non-cumulative patches can touch already modified states. +*/ +bool klp_is_patch_compatible (struct klp_patch *patch) +{ +struct klp_patch *old_patch; +struct klp_state *state; + + +klp_for_each_patch (old_patch) {
Extra newline above.
include/linux/livepatch.h
Quoted 5 lines
include/linux/livepatch.h +5
-0+klp_for_each_state (old_patch, state) { +if (!klp_is_state_compatible (patch, state)) +return false; + } + }
I think renaming 'state' to 'old_state' would make the intention a little clearer, and would be consistent with 'old_patch'.
Signature · 1 line
Josh
Petr Mladek
maintainerRe: [PATCH v3 3/5] livepatch: Allow to distinguish different version of system state changes
Quoted 19 lines · Josh Poimboeuf
Hi Petr,
Sorry for taking so long...
include/linux/livepatch.h struct klp_object { · line 136
Quoted 9 lines · Petr Mladek
include/linux/livepatch.h +1
-0@@ -133,10 +133,12 @@ struct klp_object {/** * struct klp_state - state of the system modified by the livepatch * @id: system state identifier (non-zero) +* @version: version of the change (non-zero) Is it necessary to assume that 'version' is non-zero? It would be easy for a user to not realize that and start with version 0. Then the patch state would be silently ignored.
Quoted 2 lines
I have the same concern about 'id', but I guess at least one of them has to be non-zero to differentiate valid entries from the array terminator.
Exactly. At least one struct member must be non-zero to differentiate the array terminator.
I do not mind to allow zero version. Will do so in v4.
Quoted 19 lines
Quoted 15 lines
include/linux/livepatch.h +14
-0+/* Check if the patch is able to deal with the given system state. */ +static bool klp_is_state_compatible (struct klp_patch *patch, +struct klp_state *state) +{ +struct klp_state *new_state; + + new_state =klp_get_state (patch, state->id); + +if (new_state) +return new_state->version >= state->version; + +/* Cumulative livepatch must handle all already modified states. */ +return !patch->replace; +}Quoted 1 line
From my perspective I view '!new_state' as an error condition. I'd find
it easier to read if the ordering were changed to check for the error first:
Quoted 9 lines
if (!new_state) {
/*
* A cumulative livepatch must handle all already
* modified states.
*/
return !patch->replace;
}
return new_state->version >= state->version;-> v4
Quoted 16 lines
include/linux/livepatch.h
Quoted 13 lines
include/linux/livepatch.h +13
-0+ +/* +* Check that the new livepatch will not break the existing system states. +* Cumulative patches must handle all already modified states. +* Non-cumulative patches can touch already modified states. +*/ +bool klp_is_patch_compatible (struct klp_patch *patch) +{ +struct klp_patch *old_patch; +struct klp_state *state; + + +klp_for_each_patch (old_patch) {Extra newline above.
Quoted 8 lines
include/linux/livepatch.h
Quoted 5 lines
include/linux/livepatch.h +5
-0+klp_for_each_state (old_patch, state) { +if (!klp_is_state_compatible (patch, state)) +return false; + } + }I think renaming 'state' to '
old_state' would make the intention a little clearer, and would be consistent with 'old_patch'.
Makes sense. I'll make the names consistent also in klp_is_state_compatible():
/* Check if the patch is able to deal with the given system state. */ static bool klp_is_state_compatible(struct klp_patch *patch,
struct klp_state *old_state)
{
struct klp_state *state = klp_get_state(patch, state->id);
if (!state) {
/*
* A cumulative livepatch must handle all already
* modified states.
*/
return !patch->replace;
}
return state->version >= old_state->version;
}Best Regards,
Petr
Petr Mladek
maintainerPATCH v3 4/5 livepatch: Documentation of the new API for tracking system state changes
In reply to Petr MladekDocumentation explaining the motivation, capabilities, and usage of the new API for tracking system state changes.
--- Documentation/livepatch/index.rst | 1 + Documentation/livepatch/system-state.rst | 167 +++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 Documentation/livepatch/system-state.rst
Documentation/livepatch/index.rst +1 -0
@@ -12,6 +12,7 @@ Kernel Livepatching cumulative-patches module-elf-format shadow-vars + system-state .. only:: subproject and html
Documentation/livepatch/system-state.rst new file +167 -0
167 lines not on this page · raw message
Signature · 1 line
2.16.4
Petr Mladek
maintainerPATCH v3 5/5 livepatch: Selftests of the API for tracking system state changes
In reply to Petr MladekFour selftests for the new API.
--- lib/livepatch/Makefile | 5 +- lib/livepatch/test_klp_state.c | 161 ++++++++++++++++++++ lib/livepatch/test_klp_state2.c | 190 ++++++++++++++++++++++++ lib/livepatch/test_klp_state3.c | 5 + tools/testing/selftests/livepatch/Makefile | 3 +- tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++ 6 files changed, 542 insertions(+), 2 deletions(-) create mode 100644 lib/livepatch/test_klp_state.c create mode 100644 lib/livepatch/test_klp_state2.c create mode 100644 lib/livepatch/test_klp_state3.c create mode 100755 tools/testing/selftests/livepatch/test-state.sh
lib/livepatch/Makefile +4 -1
@@ -8,7 +8,10 @@ obj-$(CONFIG_TEST_LIVEPATCH) += test_klp_atomic_replace.o \ test_klp_callbacks_busy.o \ test_klp_callbacks_mod.o \ test_klp_livepatch.o \ - test_klp_shadow_vars.o + test_klp_shadow_vars.o \ + test_klp_state.o \ + test_klp_state2.o \ + test_klp_state3.o # Target modules to be livepatched require CC_FLAGS_FTRACE CFLAGS_test_klp_callbacks_busy.o += $(CC_FLAGS_FTRACE)
lib/livepatch/test_klp_state.c new file +161 -0
161 lines not on this page · raw message
lib/livepatch/test_klp_state2.c new file +190 -0
190 lines not on this page · raw message
lib/livepatch/test_klp_state3.c new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019 SUSE + +/* The console loglevel fix is the same in the next cumulative patch. */ +#include "test_klp_state2.c"
tools/testing/selftests/livepatch/Makefile +2 -1
@@ -4,6 +4,7 @@ TEST_PROGS_EXTENDED := functions.sh TEST_PROGS := \ test-livepatch.sh \ test-callbacks.sh \ - test-shadow-vars.sh + test-shadow-vars.sh \ + test-state.sh include ../lib.mk
tools/testing/selftests/livepatch/test-state.sh new file +180 -0
180 lines not on this page · raw message
Signature · 1 line
2.16.4
Joe Lawrence
maintainerRe: [PATCH v3 5/5] livepatch: Selftests of the API for tracking system state changes
Quoted 24 lines · Petr Mladek
Four selftests for the new API.
Signed-off-by Petr Mladek <[email protected]>Acked-by Miroslav Benes <[email protected]>--- lib/livepatch/Makefile | 5 +- lib/livepatch/test_klp_state.c | 161 ++++++++++++++++++++ lib/livepatch/test_klp_state2.c | 190 ++++++++++++++++++++++++ lib/livepatch/test_klp_state3.c | 5 + tools/testing/selftests/livepatch/Makefile | 3 +- tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++ 6 files changed, 542 insertions(+), 2 deletions(-) create mode 100644 lib/livepatch/test_klp_state.c create mode 100644 lib/livepatch/test_klp_state2.c create mode 100644 lib/livepatch/test_klp_state3.c create mode 100755 tools/testing/selftests/livepatch/test-state.sh[ ... snip ... ]
tools/testing/selftests/livepatch/test-state.sh new file +0
-0
tools/testing/selftests/livepatch/test-state.sh line 4
Quoted 4 lines
tools/testing/selftests/livepatch/test-state.sh new file +4
-0@@ -0,0 +1,180 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2018 Joe Lawrence <[email protected]> +
nit: this should probably read as:
# Copyright (C) 2019 Petr Mladek <[email protected]>
Quoted 29 lines
tools/testing/selftests/livepatch/test-state.sh new file +29
-0+. $(dirname $0)/functions.sh + +MOD_LIVEPATCH=test_klp_state +MOD_LIVEPATCH2=test_klp_state2 +MOD_LIVEPATCH3=test_klp_state3 + +set_dynamic_debug + + +# TEST: Loading and removing a module that modifies the system state + +echo -n "TEST: system state modification ... " +dmesg -C + +load_lp $MOD_LIVEPATCH +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "% modprobe test_klp_state +livepatch: enabling patch 'test_klp_state' +livepatch: 'test_klp_state': initializing patching transition +test_klp_state: pre_patch_callback: vmlinux +test_klp_state: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: 'test_klp_state': starting patching transition +livepatch: 'test_klp_state': completing patching transition +test_klp_state: post_patch_callback: vmlinux +test_klp_state: fix_console_loglevel: fixing console_loglevel +livepatch: 'test_klp_state': patching complete +% echo 0 > /sys/kernel/livepatch/test_klp_state/enabled
tools/testing/selftests/livepatch/test-state.sh line 43
Quoted 10 lines
tools/testing/selftests/livepatch/test-state.sh new file +10
-0+livepatch: 'test_klp_state': initializing unpatching transition +test_klp_state: pre_unpatch_callback: vmlinux +test_klp_state: restore_console_loglevel: restoring console_loglevel +livepatch: 'test_klp_state': starting unpatching transition +livepatch: 'test_klp_state': completing unpatching transition +test_klp_state: post_unpatch_callback: vmlinux +test_klp_state: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: 'test_klp_state': unpatching complete +% rmmod test_klp_state" +
nit: a matter of style, and I don't mind either, but the other test scripts used $MOD_LIVEPATCH{2,3} variable replacement in the check_result string. I think I originally did that when we were reviewing the first self-test patchset and the filenames may or may not have changed. Those names are stable now, so I don't have a strong opinion either way.
FWIW, if someone wants to make the copyright change on merge, I'm cool with this version.
-- Joe
Re: [PATCH v3 5/5] livepatch: Selftests of the API for tracking system state changes
Quoted 39 lines · Joe Lawrence
tools/testing/selftests/livepatch/test-state.sh line 4
Quoted 9 lines · Petr Mladek
Four selftests for the new API.
tools/testing/selftests/livepatch/test-state.sh new file +4
-0@@ -0,0 +1,180 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2018 Joe Lawrence <[email protected]> +nit: this should probably read as:
# Copyright (C) 2019 Petr Mladek <[email protected]>Quoted 25 lines
tools/testing/selftests/livepatch/test-state.sh new file +25
-0+ +load_lp $MOD_LIVEPATCH +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "% modprobe test_klp_state +livepatch: enabling patch 'test_klp_state' +livepatch: 'test_klp_state': initializing patching transition +test_klp_state: pre_patch_callback: vmlinux +test_klp_state: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: 'test_klp_state': starting patching transition +livepatch: 'test_klp_state': completing patching transition +test_klp_state: post_patch_callback: vmlinux +test_klp_state: fix_console_loglevel: fixing console_loglevel +livepatch: 'test_klp_state': patching complete +% echo 0 > /sys/kernel/livepatch/test_klp_state/enabled +livepatch: 'test_klp_state': initializing unpatching transition +test_klp_state: pre_unpatch_callback: vmlinux +test_klp_state: restore_console_loglevel: restoring console_loglevel +livepatch: 'test_klp_state': starting unpatching transition +livepatch: 'test_klp_state': completing unpatching transition +test_klp_state: post_unpatch_callback: vmlinux +test_klp_state: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: 'test_klp_state': unpatching complete +% rmmod test_klp_state"
Quoted 8 lines
tools/testing/selftests/livepatch/test-state.sh line 30
Quoted 1 line
tools/testing/selftests/livepatch/test-state.sh new file +1
-0+nit: a matter of style, and I don't mind either, but the other test scripts used $MOD_LIVEPATCH{2,3} variable replacement in the
check_resultstring. I think I originally did that when we were reviewing the first self-test patchset and the filenames may or may not have changed. Those names are stable now, so I don't have a strong opinion either way.
Please, find below and updated version of the patch that fixes the two above problems and also the kbuild robot failure.
The build failure was fixed by #include <linux/slab.h>
Here we go:
From 206e0a53de25ddb042e5947c2a736e33ca4a2b4c Mon Sep 17 00:00:00 2001
From: Petr Mladek <[email protected]>
Date: Mon, 10 Jun 2019 14:02:42 +0200
Subject: [PATCH v3.1 5/5] livepatch: Selftests of the API for tracking system state
changes
Four selftests for the new API.
--- lib/livepatch/Makefile | 5 +- lib/livepatch/test_klp_state.c | 162 ++++++++++++++++++++ lib/livepatch/test_klp_state2.c | 191 ++++++++++++++++++++++++ lib/livepatch/test_klp_state3.c | 5 + tools/testing/selftests/livepatch/Makefile | 3 +- tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++ 6 files changed, 544 insertions(+), 2 deletions(-) create mode 100644 lib/livepatch/test_klp_state.c create mode 100644 lib/livepatch/test_klp_state2.c create mode 100644 lib/livepatch/test_klp_state3.c create mode 100755 tools/testing/selftests/livepatch/test-state.sh
lib/livepatch/Makefile +4 -1
@@ -8,7 +8,10 @@ obj-$(CONFIG_TEST_LIVEPATCH) += test_klp_atomic_replace.o \ test_klp_callbacks_busy.o \ test_klp_callbacks_mod.o \ test_klp_livepatch.o \ - test_klp_shadow_vars.o + test_klp_shadow_vars.o \ + test_klp_state.o \ + test_klp_state2.o \ + test_klp_state3.o # Target modules to be livepatched require CC_FLAGS_FTRACE CFLAGS_test_klp_callbacks_busy.o += $(CC_FLAGS_FTRACE)
lib/livepatch/test_klp_state.c new file +162 -0
162 lines not on this page · raw message
lib/livepatch/test_klp_state2.c new file +191 -0
191 lines not on this page · raw message
lib/livepatch/test_klp_state3.c new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019 SUSE + +/* The console loglevel fix is the same in the next cumulative patch. */ +#include "test_klp_state2.c"
tools/testing/selftests/livepatch/Makefile +2 -1
@@ -4,6 +4,7 @@ TEST_PROGS_EXTENDED := functions.sh TEST_PROGS := \ test-livepatch.sh \ test-callbacks.sh \ - test-shadow-vars.sh + test-shadow-vars.sh \ + test-state.sh include ../lib.mk
tools/testing/selftests/livepatch/test-state.sh new file +180 -0
180 lines not on this page · raw message
Signature · 1 line
2.16.4
Re: [PATCH v3 5/5] livepatch: Selftests of the API for tracking system state changes
Quoted 674 lines · Petr Mladek
Quoted 39 lines · Joe Lawrence
tools/testing/selftests/livepatch/test-state.sh line 4
Quoted 9 lines · Petr Mladek
Four selftests for the new API.
tools/testing/selftests/livepatch/test-state.sh new file +4
-0@@ -0,0 +1,180 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2018 Joe Lawrence <[email protected]> +nit: this should probably read as:
# Copyright (C) 2019 Petr Mladek <[email protected]>Quoted 25 lines
tools/testing/selftests/livepatch/test-state.sh new file +25
-0+ +load_lp $MOD_LIVEPATCH +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "% modprobe test_klp_state +livepatch: enabling patch 'test_klp_state' +livepatch: 'test_klp_state': initializing patching transition +test_klp_state: pre_patch_callback: vmlinux +test_klp_state: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: 'test_klp_state': starting patching transition +livepatch: 'test_klp_state': completing patching transition +test_klp_state: post_patch_callback: vmlinux +test_klp_state: fix_console_loglevel: fixing console_loglevel +livepatch: 'test_klp_state': patching complete +% echo 0 > /sys/kernel/livepatch/test_klp_state/enabled +livepatch: 'test_klp_state': initializing unpatching transition +test_klp_state: pre_unpatch_callback: vmlinux +test_klp_state: restore_console_loglevel: restoring console_loglevel +livepatch: 'test_klp_state': starting unpatching transition +livepatch: 'test_klp_state': completing unpatching transition +test_klp_state: post_unpatch_callback: vmlinux +test_klp_state: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: 'test_klp_state': unpatching complete +% rmmod test_klp_state"Quoted 8 lines
tools/testing/selftests/livepatch/test-state.sh line 30
Quoted 1 line
tools/testing/selftests/livepatch/test-state.sh new file +1
-0+nit: a matter of style, and I don't mind either, but the other test scripts used $MOD_LIVEPATCH{2,3} variable replacement in the
check_resultstring. I think I originally did that when we were reviewing the first self-test patchset and the filenames may or may not have changed. Those names are stable now, so I don't have a strong opinion either way.Please, find below and updated version of the patch that fixes the two above problems and also the kbuild robot failure.
The build failure was fixed by #include <
linux/slab.h>Here we go:
From
206e0a53de25ddb042e5947c2a736e33ca4a2b4cMon Sep 17 00:00:00 2001
From: Petr Mladek <[email protected]>
Date: Mon, 10 Jun 2019 14:02:42 +0200
Subject: [PATCH v3.1 5/5] livepatch: Selftests of the API for tracking system state
changesFour selftests for the new API.
Signed-off-by Petr Mladek <[email protected]>Acked-by Miroslav Benes <[email protected]>--- lib/livepatch/Makefile | 5 +- lib/livepatch/test_klp_state.c | 162 ++++++++++++++++++++ lib/livepatch/test_klp_state2.c | 191 ++++++++++++++++++++++++ lib/livepatch/test_klp_state3.c | 5 + tools/testing/selftests/livepatch/Makefile | 3 +- tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++ 6 files changed, 544 insertions(+), 2 deletions(-) create mode 100644 lib/livepatch/test_klp_state.c create mode 100644 lib/livepatch/test_klp_state2.c create mode 100644 lib/livepatch/test_klp_state3.c create mode 100755 tools/testing/selftests/livepatch/test-state.shlib/livepatch/Makefile +4
-1@@ -8,7 +8,10 @@ obj-$(CONFIG_TEST_LIVEPATCH) += test_klp_atomic_replace.o \ test_klp_callbacks_busy.o \ test_klp_callbacks_mod.o \ test_klp_livepatch.o \ - test_klp_shadow_vars.o + test_klp_shadow_vars.o \ + test_klp_state.o \ + test_klp_state2.o \ + test_klp_state3.o # Target modules to be livepatched require CC_FLAGS_FTRACE CFLAGS_test_klp_callbacks_busy.o += $(CC_FLAGS_FTRACE)lib/livepatch/test_klp_state.c new file +162
-0@@ -0,0 +1,162 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019 SUSE + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/printk.h> +#include <linux/livepatch.h> + +#define CONSOLE_LOGLEVEL_STATE 1 +/* Version 1 does not support migration. */ +#define CONSOLE_LOGLEVEL_STATE_VERSION 1 + +static const char *const module_state[] = { + [MODULE_STATE_LIVE ] ="[MODULE_STATE_LIVE] Normal state" , + [MODULE_STATE_COMING ] ="[MODULE_STATE_COMING] Full formed, running module_init" , + [MODULE_STATE_GOING ] ="[MODULE_STATE_GOING] Going away" , + [MODULE_STATE_UNFORMED ] ="[MODULE_STATE_UNFORMED] Still setting it up" , +}; + +static void callback_info (const char *callback,struct klp_object *obj) +{ +if (obj->mod) +pr_info ("%s: %s -> %s\n" , callback, obj->mod->name, + module_state[obj->mod->state]); +else +pr_info ("%s: vmlinux\n" , callback); +} + +static struct klp_patch patch; + +static int allocate_loglevel_state (void ) +{ +struct klp_state *loglevel_state; + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return -EINVAL ; + + loglevel_state->data =kzalloc (sizeof (console_loglevel),GFP_KERNEL ); +if (!loglevel_state->data) +return -ENOMEM ; + +pr_info ("%s: allocating space to store console_loglevel\n" , + __func__); +return 0 ; +} + +static void fix_console_loglevel (void ) +{ +struct klp_state *loglevel_state; + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return ; + +pr_info ("%s: fixing console_loglevel\n" , __func__); + *(int *)loglevel_state->data = console_loglevel; + console_loglevel =CONSOLE_LOGLEVEL_MOTORMOUTH ; +} + +static void restore_console_loglevel (void ) +{ +struct klp_state *loglevel_state; + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return ; + +pr_info ("%s: restoring console_loglevel\n" , __func__); + console_loglevel = *(int *)loglevel_state->data; +} + +static void free_loglevel_state (void ) +{ +struct klp_state *loglevel_state; + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return ; + +pr_info ("%s: freeing space for the stored console_loglevel\n" , + __func__); +kfree (loglevel_state->data); +} + +/* Executed on object patching (ie, patch enablement) */ +static int pre_patch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +return allocate_loglevel_state (); +} + +/* Executed on object unpatching (ie, patch disablement) */ +static void post_patch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +fix_console_loglevel (); +} + +/* Executed on object unpatching (ie, patch disablement) */ +static void pre_unpatch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +restore_console_loglevel (); +} + +/* Executed on object unpatching (ie, patch disablement) */ +static void post_unpatch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +free_loglevel_state (); +} + +static struct klp_func no_funcs[] = { + {} +}; + +static struct klp_object objs[] = { + { + .name =NULL ,/* vmlinux */ + .funcs = no_funcs, + .callbacks = { + .pre_patch = pre_patch_callback, + .post_patch = post_patch_callback, + .pre_unpatch = pre_unpatch_callback, + .post_unpatch = post_unpatch_callback, + }, + }, { } +}; + +static struct klp_state states[] = { + { + .id =CONSOLE_LOGLEVEL_STATE , + .version =CONSOLE_LOGLEVEL_STATE_VERSION , + }, { } +}; + +static struct klp_patch patch = { + .mod =THIS_MODULE , + .objs = objs, + .states = states, + .replace = true, +}; + +static int test_klp_callbacks_demo_init (void ) +{ +return klp_enable_patch (&patch); +} + +static void test_klp_callbacks_demo_exit (void ) +{ +} + +module_init (test_klp_callbacks_demo_init); +module_exit (test_klp_callbacks_demo_exit); +MODULE_LICENSE ("GPL" ); +MODULE_INFO (livepatch,"Y" ); +MODULE_AUTHOR ("Petr Mladek <[email protected]>" ); +MODULE_DESCRIPTION ("Livepatch test: system state modification" );lib/livepatch/test_klp_state2.c new file +191
-0@@ -0,0 +1,191 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019 SUSE + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/printk.h> +#include <linux/livepatch.h> + +#define CONSOLE_LOGLEVEL_STATE 1 +/* Version 2 supports migration. */ +#define CONSOLE_LOGLEVEL_STATE_VERSION 2 + +static const char *const module_state[] = { + [MODULE_STATE_LIVE ] ="[MODULE_STATE_LIVE] Normal state" , + [MODULE_STATE_COMING ] ="[MODULE_STATE_COMING] Full formed, running module_init" , + [MODULE_STATE_GOING ] ="[MODULE_STATE_GOING] Going away" , + [MODULE_STATE_UNFORMED ] ="[MODULE_STATE_UNFORMED] Still setting it up" , +}; + +static void callback_info (const char *callback,struct klp_object *obj) +{ +if (obj->mod) +pr_info ("%s: %s -> %s\n" , callback, obj->mod->name, + module_state[obj->mod->state]); +else +pr_info ("%s: vmlinux\n" , callback); +} + +static struct klp_patch patch; + +static int allocate_loglevel_state (void ) +{ +struct klp_state *loglevel_state, *prev_loglevel_state; + + prev_loglevel_state =klp_get_prev_state (CONSOLE_LOGLEVEL_STATE ); +if (prev_loglevel_state) { +pr_info ("%s: space to store console_loglevel already allocated\n" , + __func__); +return 0 ; + } + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return -EINVAL ; + + loglevel_state->data =kzalloc (sizeof (console_loglevel),GFP_KERNEL ); +if (!loglevel_state->data) +return -ENOMEM ; + +pr_info ("%s: allocating space to store console_loglevel\n" , + __func__); +return 0 ; +} + +static void fix_console_loglevel (void ) +{ +struct klp_state *loglevel_state, *prev_loglevel_state; + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return ; + + prev_loglevel_state =klp_get_prev_state (CONSOLE_LOGLEVEL_STATE ); +if (prev_loglevel_state) { +pr_info ("%s: taking over the console_loglevel change\n" , + __func__); + loglevel_state->data = prev_loglevel_state->data; +return ; + } + +pr_info ("%s: fixing console_loglevel\n" , __func__); + *(int *)loglevel_state->data = console_loglevel; + console_loglevel =CONSOLE_LOGLEVEL_MOTORMOUTH ; +} + +static void restore_console_loglevel (void ) +{ +struct klp_state *loglevel_state, *prev_loglevel_state; + + prev_loglevel_state =klp_get_prev_state (CONSOLE_LOGLEVEL_STATE ); +if (prev_loglevel_state) { +pr_info ("%s: passing the console_loglevel change back to the old livepatch\n" , + __func__); +return ; + } + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return ; + +pr_info ("%s: restoring console_loglevel\n" , __func__); + console_loglevel = *(int *)loglevel_state->data; +} + +static void free_loglevel_state (void ) +{ +struct klp_state *loglevel_state, *prev_loglevel_state; + + prev_loglevel_state =klp_get_prev_state (CONSOLE_LOGLEVEL_STATE ); +if (prev_loglevel_state) { +pr_info ("%s: keeping space to store console_loglevel\n" , + __func__); +return ; + } + + loglevel_state =klp_get_state (&patch,CONSOLE_LOGLEVEL_STATE ); +if (!loglevel_state) +return ; + +pr_info ("%s: freeing space for the stored console_loglevel\n" , + __func__); +kfree (loglevel_state->data); +} + +/* Executed on object patching (ie, patch enablement) */ +static int pre_patch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +return allocate_loglevel_state (); +} + +/* Executed on object unpatching (ie, patch disablement) */ +static void post_patch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +fix_console_loglevel (); +} + +/* Executed on object unpatching (ie, patch disablement) */ +static void pre_unpatch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +restore_console_loglevel (); +} + +/* Executed on object unpatching (ie, patch disablement) */ +static void post_unpatch_callback (struct klp_object *obj) +{ +callback_info (__func__, obj); +free_loglevel_state (); +} + +static struct klp_func no_funcs[] = { + {} +}; + +static struct klp_object objs[] = { + { + .name =NULL ,/* vmlinux */ + .funcs = no_funcs, + .callbacks = { + .pre_patch = pre_patch_callback, + .post_patch = post_patch_callback, + .pre_unpatch = pre_unpatch_callback, + .post_unpatch = post_unpatch_callback, + }, + }, { } +}; + +static struct klp_state states[] = { + { + .id =CONSOLE_LOGLEVEL_STATE , + .version =CONSOLE_LOGLEVEL_STATE_VERSION , + }, { } +}; + +static struct klp_patch patch = { + .mod =THIS_MODULE , + .objs = objs, + .states = states, + .replace = true, +}; + +static int test_klp_callbacks_demo_init (void ) +{ +return klp_enable_patch (&patch); +} + +static void test_klp_callbacks_demo_exit (void ) +{ +} + +module_init (test_klp_callbacks_demo_init); +module_exit (test_klp_callbacks_demo_exit); +MODULE_LICENSE ("GPL" ); +MODULE_INFO (livepatch,"Y" ); +MODULE_AUTHOR ("Petr Mladek <[email protected]>" ); +MODULE_DESCRIPTION ("Livepatch test: system state modification" );lib/livepatch/test_klp_state3.c new file +5
-0@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019 SUSE + +/* The console loglevel fix is the same in the next cumulative patch. */ +#include "test_klp_state2.c" tools/testing/selftests/livepatch/Makefile +2
-1@@ -4,6 +4,7 @@ TEST_PROGS_EXTENDED := functions.sh TEST_PROGS := \ test-livepatch.sh \ test-callbacks.sh \ - test-shadow-vars.sh + test-shadow-vars.sh \ + test-state.sh include ../lib.mktools/testing/selftests/livepatch/test-state.sh new file +180
-0@@ -0,0 +1,180 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2019 SUSE + +. $(dirname $0)/functions.sh + +MOD_LIVEPATCH=test_klp_state +MOD_LIVEPATCH2=test_klp_state2 +MOD_LIVEPATCH3=test_klp_state3 + +set_dynamic_debug + + +# TEST: Loading and removing a module that modifies the system state + +echo -n "TEST: system state modification ... " +dmesg -C + +load_lp $MOD_LIVEPATCH +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "% modprobe $MOD_LIVEPATCH +livepatch: enabling patch '$MOD_LIVEPATCH' +livepatch: '$MOD_LIVEPATCH': initializing patching transition +$MOD_LIVEPATCH: pre_patch_callback: vmlinux +$MOD_LIVEPATCH: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: '$MOD_LIVEPATCH': starting patching transition +livepatch: '$MOD_LIVEPATCH': completing patching transition +$MOD_LIVEPATCH: post_patch_callback: vmlinux +$MOD_LIVEPATCH: fix_console_loglevel: fixing console_loglevel +livepatch: '$MOD_LIVEPATCH': patching complete +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled +livepatch: '$MOD_LIVEPATCH': initializing unpatching transition +$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux +$MOD_LIVEPATCH: restore_console_loglevel: restoring console_loglevel +livepatch: '$MOD_LIVEPATCH': starting unpatching transition +livepatch: '$MOD_LIVEPATCH': completing unpatching transition +$MOD_LIVEPATCH: post_unpatch_callback: vmlinux +$MOD_LIVEPATCH: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: '$MOD_LIVEPATCH': unpatching complete +% rmmod $MOD_LIVEPATCH" + + +# TEST: Take over system state change by a cumulative patch + +echo -n "TEST: taking over system state modification ... " +dmesg -C + +load_lp $MOD_LIVEPATCH +load_lp $MOD_LIVEPATCH2 +unload_lp $MOD_LIVEPATCH +disable_lp $MOD_LIVEPATCH2 +unload_lp $MOD_LIVEPATCH2 + +check_result "% modprobe $MOD_LIVEPATCH +livepatch: enabling patch '$MOD_LIVEPATCH' +livepatch: '$MOD_LIVEPATCH': initializing patching transition +$MOD_LIVEPATCH: pre_patch_callback: vmlinux +$MOD_LIVEPATCH: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: '$MOD_LIVEPATCH': starting patching transition +livepatch: '$MOD_LIVEPATCH': completing patching transition +$MOD_LIVEPATCH: post_patch_callback: vmlinux +$MOD_LIVEPATCH: fix_console_loglevel: fixing console_loglevel +livepatch: '$MOD_LIVEPATCH': patching complete +% modprobe $MOD_LIVEPATCH2 +livepatch: enabling patch '$MOD_LIVEPATCH2' +livepatch: '$MOD_LIVEPATCH2': initializing patching transition +$MOD_LIVEPATCH2: pre_patch_callback: vmlinux +$MOD_LIVEPATCH2: allocate_loglevel_state: space to store console_loglevel already allocated +livepatch: '$MOD_LIVEPATCH2': starting patching transition +livepatch: '$MOD_LIVEPATCH2': completing patching transition +$MOD_LIVEPATCH2: post_patch_callback: vmlinux +$MOD_LIVEPATCH2: fix_console_loglevel: taking over the console_loglevel change +livepatch: '$MOD_LIVEPATCH2': patching complete +% rmmod $MOD_LIVEPATCH +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled +livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition +$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux +$MOD_LIVEPATCH2: restore_console_loglevel: restoring console_loglevel +livepatch: '$MOD_LIVEPATCH2': starting unpatching transition +livepatch: '$MOD_LIVEPATCH2': completing unpatching transition +$MOD_LIVEPATCH2: post_unpatch_callback: vmlinux +$MOD_LIVEPATCH2: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: '$MOD_LIVEPATCH2': unpatching complete +% rmmod $MOD_LIVEPATCH2" + + +# TEST: Take over system state change by a cumulative patch + +echo -n "TEST: compatible cumulative livepatches ... " +dmesg -C + +load_lp $MOD_LIVEPATCH2 +load_lp $MOD_LIVEPATCH3 +unload_lp $MOD_LIVEPATCH2 +load_lp $MOD_LIVEPATCH2 +disable_lp $MOD_LIVEPATCH2 +unload_lp $MOD_LIVEPATCH2 +unload_lp $MOD_LIVEPATCH3 + +check_result "% modprobe $MOD_LIVEPATCH2 +livepatch: enabling patch '$MOD_LIVEPATCH2' +livepatch: '$MOD_LIVEPATCH2': initializing patching transition +$MOD_LIVEPATCH2: pre_patch_callback: vmlinux +$MOD_LIVEPATCH2: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: '$MOD_LIVEPATCH2': starting patching transition +livepatch: '$MOD_LIVEPATCH2': completing patching transition +$MOD_LIVEPATCH2: post_patch_callback: vmlinux +$MOD_LIVEPATCH2: fix_console_loglevel: fixing console_loglevel +livepatch: '$MOD_LIVEPATCH2': patching complete +% modprobe $MOD_LIVEPATCH3 +livepatch: enabling patch '$MOD_LIVEPATCH3' +livepatch: '$MOD_LIVEPATCH3': initializing patching transition +$MOD_LIVEPATCH3: pre_patch_callback: vmlinux +$MOD_LIVEPATCH3: allocate_loglevel_state: space to store console_loglevel already allocated +livepatch: '$MOD_LIVEPATCH3': starting patching transition +livepatch: '$MOD_LIVEPATCH3': completing patching transition +$MOD_LIVEPATCH3: post_patch_callback: vmlinux +$MOD_LIVEPATCH3: fix_console_loglevel: taking over the console_loglevel change +livepatch: '$MOD_LIVEPATCH3': patching complete +% rmmod $MOD_LIVEPATCH2 +% modprobe $MOD_LIVEPATCH2 +livepatch: enabling patch '$MOD_LIVEPATCH2' +livepatch: '$MOD_LIVEPATCH2': initializing patching transition +$MOD_LIVEPATCH2: pre_patch_callback: vmlinux +$MOD_LIVEPATCH2: allocate_loglevel_state: space to store console_loglevel already allocated +livepatch: '$MOD_LIVEPATCH2': starting patching transition +livepatch: '$MOD_LIVEPATCH2': completing patching transition +$MOD_LIVEPATCH2: post_patch_callback: vmlinux +$MOD_LIVEPATCH2: fix_console_loglevel: taking over the console_loglevel change +livepatch: '$MOD_LIVEPATCH2': patching complete +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled +livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition +$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux +$MOD_LIVEPATCH2: restore_console_loglevel: restoring console_loglevel +livepatch: '$MOD_LIVEPATCH2': starting unpatching transition +livepatch: '$MOD_LIVEPATCH2': completing unpatching transition +$MOD_LIVEPATCH2: post_unpatch_callback: vmlinux +$MOD_LIVEPATCH2: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: '$MOD_LIVEPATCH2': unpatching complete +% rmmod $MOD_LIVEPATCH2 +% rmmod $MOD_LIVEPATCH3" + + +# TEST: Failure caused by incompatible cumulative livepatches + +echo -n "TEST: incompatible cumulative livepatches ... " +dmesg -C + +load_lp $MOD_LIVEPATCH2 +load_failing_mod $MOD_LIVEPATCH +disable_lp $MOD_LIVEPATCH2 +unload_lp $MOD_LIVEPATCH2 + +check_result "% modprobe $MOD_LIVEPATCH2 +livepatch: enabling patch '$MOD_LIVEPATCH2' +livepatch: '$MOD_LIVEPATCH2': initializing patching transition +$MOD_LIVEPATCH2: pre_patch_callback: vmlinux +$MOD_LIVEPATCH2: allocate_loglevel_state: allocating space to store console_loglevel +livepatch: '$MOD_LIVEPATCH2': starting patching transition +livepatch: '$MOD_LIVEPATCH2': completing patching transition +$MOD_LIVEPATCH2: post_patch_callback: vmlinux +$MOD_LIVEPATCH2: fix_console_loglevel: fixing console_loglevel +livepatch: '$MOD_LIVEPATCH2': patching complete +% modprobe $MOD_LIVEPATCH +livepatch: Livepatch patch ($MOD_LIVEPATCH) is not compatible with the already installed livepatches. +modprobe: ERROR: could not insert '$MOD_LIVEPATCH': Invalid argument +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled +livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition +$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux +$MOD_LIVEPATCH2: restore_console_loglevel: restoring console_loglevel +livepatch: '$MOD_LIVEPATCH2': starting unpatching transition +livepatch: '$MOD_LIVEPATCH2': completing unpatching transition +$MOD_LIVEPATCH2: post_unpatch_callback: vmlinux +$MOD_LIVEPATCH2: free_loglevel_state: freeing space for the stored console_loglevel +livepatch: '$MOD_LIVEPATCH2': unpatching complete +% rmmod $MOD_LIVEPATCH2" + +exit 0Signature · 1 line
2.16.4
Looks good to me...
-- Joe
kbuild test robot
build botRe: [PATCH v3 5/5] livepatch: Selftests of the API for tracking system state changes
In reply to Petr MladekI love your patch! Yet something to improve:
Hi Petr,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.4-rc2 next-20191008]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Petr-Mladek/livepatch-Keep-replaced-patches-until-post_patch-callback-is-called/20191003-171833
config: x86_64-randconfig-e004-201940 (attached as .config)
compiler: gcc-7 (Debian 7.4.0-13) 7.4.0
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 If you fix the issue, kindly add following tag
All error/warnings (new ones prefixed by >>):
lib/livepatch/test_klp_state.c: In function 'allocate_loglevel_state':
>> lib/livepatch/test_klp_state.c:41:25: error: implicit declaration of function 'kzalloc'; did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
^~~~~~~
kvzalloc
>> lib/livepatch/test_klp_state.c:41:23: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
^
lib/livepatch/test_klp_state.c: In function 'free_loglevel_state':
>> lib/livepatch/test_klp_state.c:85:2: error: implicit declaration of function 'kfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
kfree(loglevel_state->data);
^~~~~
kvfree
cc1: some warnings being treated as errors
--
lib/livepatch/test_klp_state2.c: In function 'allocate_loglevel_state':
>> lib/livepatch/test_klp_state2.c:48:25: error: implicit declaration of function 'kzalloc'; did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
^~~~~~~
kvzalloc
>> lib/livepatch/test_klp_state2.c:48:23: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
^
lib/livepatch/test_klp_state2.c: In function 'free_loglevel_state':
>> lib/livepatch/test_klp_state2.c:114:2: error: implicit declaration of function 'kfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
kfree(loglevel_state->data);
^~~~~
kvfreecc1: some warnings being treated as errors
vim +41 lib/livepatch/test_klp_state.c
32
33 static int allocate_loglevel_state(void)
34 {
35 struct klp_state *loglevel_state;
36
37 loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
38 if (!loglevel_state)
39 return -EINVAL;
40
> 41 loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
42 if (!loglevel_state->data)
43 return -ENOMEM;
44
45 pr_info("%s: allocating space to store console_loglevel\n",
46 __func__);
47 return 0;
48 }
49
50 static void fix_console_loglevel(void)
51 {
52 struct klp_state *loglevel_state;
53
54 loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
55 if (!loglevel_state)
56 return;
57
58 pr_info("%s: fixing console_loglevel\n", __func__);
59 *(int *)loglevel_state->data = console_loglevel;
60 console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
61 }
62
63 static void restore_console_loglevel(void)
64 {
65 struct klp_state *loglevel_state;
66
67 loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
68 if (!loglevel_state)
69 return;
70
71 pr_info("%s: restoring console_loglevel\n", __func__);
72 console_loglevel = *(int *)loglevel_state->data;
73 }
74
75 static void free_loglevel_state(void)
76 {
77 struct klp_state *loglevel_state;
78
79 loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
80 if (!loglevel_state)
81 return;
82
83 pr_info("%s: freeing space for the stored console_loglevel\n",
84 __func__);
> 85 kfree(loglevel_state->data);
86 }
87 ---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Quoted 52 lines · Petr Mladek
Hi,
this is another piece in the puzzle that helps to maintain more livepatches.
Especially pre/post (un)patch callbacks might change a system state. Any newly installed livepatch has to somehow deal with system state modifications done be already installed livepatches.
This patchset provides a simple and generic API that helps to keep and pass information between the livepatches. It is also usable to prevent loading incompatible livepatches.
Changes since v2:
+ Typo fixes [Miroslav]
+ Move the documentation at the end of the list [Miroslav]
+ Add Miroslav's acksChanges since v1:
+ Use "unsigned long" instead of "int" for "state.id" [Nicolai]
+ Use "unsigned int" instead of "int" for "state.version [Petr]
+ Include "state.h" to avoid warning about non-static func [Miroslav]
+ Simplify logic inklp_is_state_compatible()[Miroslav]
+ Document how livepatches should handle the state [Nicolai]
+ Fix some typos, formulation, module metadata [Joe, Miroslav]Petr Mladek (5):
livepatch: Keep replaced patches untilpost_patchcallback is called
livepatch: Basic API to track system state changes
livepatch: Allow to distinguish different version of system state
changes
livepatch: Documentation of the new API for tracking system state
changes
livepatch: Selftests of the API for tracking system state changesDocumentation/livepatch/index.rst | 1 + Documentation/livepatch/system-state.rst | 167 +++++++++++++++++++++ include/linux/livepatch.h | 17 +++ kernel/livepatch/Makefile | 2 +- kernel/livepatch/core.c | 44 ++++-- kernel/livepatch/core.h | 5 +- kernel/livepatch/state.c | 122 +++++++++++++++ kernel/livepatch/state.h | 9 ++ kernel/livepatch/transition.c | 12 +- lib/livepatch/Makefile | 5 +- lib/livepatch/test_klp_state.c | 161 ++++++++++++++++++++ lib/livepatch/test_klp_state2.c | 190 ++++++++++++++++++++++++ lib/livepatch/test_klp_state3.c | 5 + tools/testing/selftests/livepatch/Makefile | 3 +- tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++
Quoted 12 lines
15 files changed, 902 insertions(+), 21 deletions(-) create mode 100644 Documentation/livepatch/system-state.rst create mode 100644 kernel/livepatch/state.c create mode 100644 kernel/livepatch/state.h create mode 100644 lib/livepatch/test_klp_state.c create mode 100644 lib/livepatch/test_klp_state2.c create mode 100644 lib/livepatch/test_klp_state3.c create mode 100755 tools/testing/selftests/livepatch/test-state.shSignature · 1 line
2.16.4
Hi Petr,
Thanks for respinning this one with the latest updates. The implementation looks fine to me. I have two really minor nits for the selftest (I'll reply to that commit), but I wouldn't hold up the series for them.
-- Joe