livepatch: Add "replace" sysfs attribute
Subsystems (2)
v3 cover livepatch: Add "replace" sysfs attribute
There are situations when it might make sense to combine livepatches with and without the atomic replace on the same system. For example, the livepatch without the atomic replace might provide a hotfix or extra tuning.
Managing livepatches on such systems might be challenging. And the information which of the installed livepatches do not use the atomic replace would be useful. Therefore, "replace" sysfs attribute is added to show whether a livepatch supports atomic replace or not.
A minor cleanup is also included in this patchset.
v2->v3:
- Improve the commit log (Petr)
v1->v2: https://lore.kernel.org/live-patching/[email protected]/
- Refine the subject (Miroslav)
- Use sysfs_emit() instead and replace other snprintf() as well (Miroslav)
- Add selftests (Marcos)
v1: https://lore.kernel.org/live-patching/[email protected]/
Yafang Shao (3):
livepatch: Add "replace" sysfs attribute selftests/livepatch: Add selftests for "replace" sysfs attribute
livepatch: Replace snprintf() with sysfs_emit()
.../ABI/testing/sysfs-kernel-livepatch | 8 ++++ kernel/livepatch/core.c | 17 +++++-- .../testing/selftests/livepatch/test-sysfs.sh | 48 +++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-)
Signature · 1 line
2.39.1
PATCH v3 1/3 livepatch: Add "replace" sysfs attribute
There are situations when it might make sense to combine livepatches with and without the atomic replace on the same system. For example, the livepatch without the atomic replace might provide a hotfix or extra tuning.
Managing livepatches on such systems might be challenging. And the information which of the installed livepatches do not use the atomic replace would be useful.
Add new sysfs interface 'replace'. It works as follows:
$ cat /sys/kernel/livepatch/livepatch-non_replace/replace 0
$ cat /sys/kernel/livepatch/livepatch-replace/replace 1
[ commit log improved by Petr ]
--- Documentation/ABI/testing/sysfs-kernel-livepatch | 8 ++++++++ kernel/livepatch/core.c | 12 ++++++++++++ 2 files changed, 20 insertions(+)
Documentation/ABI/testing/sysfs-kernel-livepatch +8 -0
@@ -47,6 +47,14 @@ Description: disabled when the feature is used. See Documentation/livepatch/livepatch.rst for more information. +What: /sys/kernel/livepatch/<patch>/replace +Date: Jun 2024 +KernelVersion: 6.11.0 +Contact: [email protected] +Description: + An attribute which indicates whether the patch supports + atomic-replace. + What: /sys/kernel/livepatch/<patch>/<object> Date: Nov 2014 KernelVersion: 3.19.0
kernel/livepatch/core.c +12 -0
@@ -346,6 +346,7 @@ int klp_apply_section_relocs(struct module *pmod, Elf_Shdr *sechdrs,* /sys/kernel/livepatch/<patch>/enabled * /sys/kernel/livepatch/<patch>/transition * /sys/kernel/livepatch/<patch>/force +* /sys/kernel/livepatch/<patch>/replace * /sys/kernel/livepatch/<patch>/<object> * /sys/kernel/livepatch/<patch>/<object>/patched * /sys/kernel/livepatch/<patch>/<object>/<function,sympos>
@@ -443,13 +444,24 @@ static ssize_t force_store(struct kobject *kobj, struct kobj_attribute *attr,return count; } +static ssize_t replace_show (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +struct klp_patch *patch; + + patch = container_of(kobj, struct klp_patch, kobj); +return sysfs_emit (buf,"%d\n" , patch->replace); +} +static struct kobj_attribute enabled_kobj_attr =__ATTR_RW (enabled);static struct kobj_attribute transition_kobj_attr =__ATTR_RO (transition);static struct kobj_attribute force_kobj_attr =__ATTR_WO (force); +static struct kobj_attribute replace_kobj_attr =__ATTR_RO (replace);static struct attribute *klp_patch_attrs[] = { &enabled_kobj_attr.attr, &transition_kobj_attr.attr, &force_kobj_attr.attr, + &replace_kobj_attr.attr,NULL };ATTRIBUTE_GROUPS (klp_patch);
Signature · 1 line
2.39.1
PATCH v3 2/3 selftests/livepatch: Add selftests for "replace" sysfs attribute
In reply to Yafang ShaoAdd selftests for both atomic replace and non atomic replace livepatches. The result is as follows,
TEST: sysfs test ... ok
TEST: sysfs test object/patched ... ok
TEST: sysfs test replace enabled ... ok
TEST: sysfs test replace disabled ... ok
--- .../testing/selftests/livepatch/test-sysfs.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+)
tools/testing/selftests/livepatch/test-sysfs.sh +48 -0
@@ -18,6 +18,7 @@ check_sysfs_rights "$MOD_LIVEPATCH" "" "drwxr-xr-x" check_sysfs_rights "$MOD_LIVEPATCH" "enabled" "-rw-r--r--" check_sysfs_value "$MOD_LIVEPATCH" "enabled" "1" check_sysfs_rights "$MOD_LIVEPATCH" "force" "--w-------" +check_sysfs_rights "$MOD_LIVEPATCH" "replace" "-r--r--r--" check_sysfs_rights "$MOD_LIVEPATCH" "transition" "-r--r--r--" check_sysfs_value "$MOD_LIVEPATCH" "transition" "0" check_sysfs_rights "$MOD_LIVEPATCH" "vmlinux/patched" "-r--r--r--"
@@ -83,4 +84,51 @@ test_klp_callbacks_demo: post_unpatch_callback: vmlinux livepatch: 'test_klp_callbacks_demo': unpatching complete % rmmod test_klp_callbacks_demo" +start_test "sysfs test replace enabled" + +MOD_LIVEPATCH=test_klp_atomic_replace +load_lp $MOD_LIVEPATCH replace=1 + +check_sysfs_rights "$MOD_LIVEPATCH" "replace" "-r--r--r--" +check_sysfs_value "$MOD_LIVEPATCH" "replace" "1" + +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "% insmod test_modules/$MOD_LIVEPATCH.ko replace=1 +livepatch: enabling patch '$MOD_LIVEPATCH' +livepatch: '$MOD_LIVEPATCH': initializing patching transition +livepatch: '$MOD_LIVEPATCH': starting patching transition +livepatch: '$MOD_LIVEPATCH': completing patching transition +livepatch: '$MOD_LIVEPATCH': patching complete +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled +livepatch: '$MOD_LIVEPATCH': initializing unpatching transition +livepatch: '$MOD_LIVEPATCH': starting unpatching transition +livepatch: '$MOD_LIVEPATCH': completing unpatching transition +livepatch: '$MOD_LIVEPATCH': unpatching complete +% rmmod $MOD_LIVEPATCH" + +start_test "sysfs test replace disabled" + +load_lp $MOD_LIVEPATCH replace=0 + +check_sysfs_rights "$MOD_LIVEPATCH" "replace" "-r--r--r--" +check_sysfs_value "$MOD_LIVEPATCH" "replace" "0" + +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "% insmod test_modules/$MOD_LIVEPATCH.ko replace=0 +livepatch: enabling patch '$MOD_LIVEPATCH' +livepatch: '$MOD_LIVEPATCH': initializing patching transition +livepatch: '$MOD_LIVEPATCH': starting patching transition +livepatch: '$MOD_LIVEPATCH': completing patching transition +livepatch: '$MOD_LIVEPATCH': patching complete +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled +livepatch: '$MOD_LIVEPATCH': initializing unpatching transition +livepatch: '$MOD_LIVEPATCH': starting unpatching transition +livepatch: '$MOD_LIVEPATCH': completing unpatching transition +livepatch: '$MOD_LIVEPATCH': unpatching complete +% rmmod $MOD_LIVEPATCH" + exit 0
Signature · 1 line
2.39.1
PATCH v3 3/3 livepatch: Replace snprintf() with sysfs_emit()
In reply to Yafang ShaoLet's use sysfs_emit() instead of snprintf().
--- kernel/livepatch/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/livepatch/core.c +2 -3
@@ -402,7 +402,7 @@ static ssize_t enabled_show(struct kobject *kobj,struct klp_patch *patch; patch = container_of(kobj, struct klp_patch, kobj); -return snprintf (buf,PAGE_SIZE -1 ,"%d\n" , patch->enabled); +return sysfs_emit (buf,"%d\n" , patch->enabled); } static ssize_t transition_show(struct kobject *kobj,
@@ -411,8 +411,7 @@ static ssize_t transition_show(struct kobject *kobj,struct klp_patch *patch; patch = container_of(kobj, struct klp_patch, kobj); -return snprintf (buf,PAGE_SIZE -1 ,"%d\n" , - patch == klp_transition_patch); +return sysfs_emit (buf,"%d\n" , patch == klp_transition_patch); } static ssize_t force_store(struct kobject *kobj, struct kobj_attribute *attr,
Signature · 1 line
2.39.1
Quoted 27 lines · Yafang Shao
There are situations when it might make sense to combine livepatches with and without the atomic replace on the same system. For example, the livepatch without the atomic replace might provide a hotfix or extra tuning.
Managing livepatches on such systems might be challenging. And the information which of the installed livepatches do not use the atomic replace would be useful. Therefore, "replace" sysfs attribute is added to show whether a livepatch supports atomic replace or not.
A minor cleanup is also included in this patchset.
v2->v3:
- Improve the commit log (Petr)
v1->v2: https://lore.kernel.org/live-patching/[email protected]/
- Refine the subject (Miroslav)
- Usesysfs_emit()instead and replace othersnprintf()as well (Miroslav)
- Add selftests (Marcos)v1: https://lore.kernel.org/live-patching/[email protected]/
Yafang Shao (3):
livepatch: Add "replace" sysfs attribute selftests/livepatch: Add selftests for "replace" sysfs attribute
livepatch: Replacesnprintf()withsysfs_emit()
Quoted 4 lines
.../ABI/testing/sysfs-kernel-livepatch | 8 ++++ kernel/livepatch/core.c | 17 +++++-- .../testing/selftests/livepatch/test-sysfs.sh | 48 +++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-)
M
Petr Mladek
maintainerQuoted 27 lines · Yafang Shao
There are situations when it might make sense to combine livepatches with and without the atomic replace on the same system. For example, the livepatch without the atomic replace might provide a hotfix or extra tuning.
Managing livepatches on such systems might be challenging. And the information which of the installed livepatches do not use the atomic replace would be useful. Therefore, "replace" sysfs attribute is added to show whether a livepatch supports atomic replace or not.
A minor cleanup is also included in this patchset.
v2->v3:
- Improve the commit log (Petr)
v1->v2: https://lore.kernel.org/live-patching/[email protected]/
- Refine the subject (Miroslav)
- Usesysfs_emit()instead and replace othersnprintf()as well (Miroslav)
- Add selftests (Marcos)v1: https://lore.kernel.org/live-patching/[email protected]/
Yafang Shao (3):
livepatch: Add "replace" sysfs attribute selftests/livepatch: Add selftests for "replace" sysfs attribute
livepatch: Replacesnprintf()withsysfs_emit()
Quoted 4 lines
.../ABI/testing/sysfs-kernel-livepatch | 8 ++++ kernel/livepatch/core.c | 17 +++++-- .../testing/selftests/livepatch/test-sysfs.sh | 48 +++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-)
JFYI, the patchset has been committed into livepatchining.git, branch for-6.11/sysfs-patch-replace.
Best Regards,
Petr