[PATCH] livepatch: old_name@old_addr scheme in livepatch sysfs directory
From: Chris J Arges <hidden>
Date: 2015-10-31 03:44:58
Also in:
lkml
Subsystem:
live patching, the rest · Maintainers:
Josh Poimboeuf, Jiri Kosina, Miroslav Benes, Petr Mladek, Linus Torvalds
The following directory structure will allow for cases when the same function name exists in a single object. /sys/kernel/livepatch/<patch>/<object>/<function@address> An example of this issue is documented here: https://github.com/dynup/kpatch/issues/493 Signed-off-by: Chris J Arges <redacted> --- Documentation/ABI/testing/sysfs-kernel-livepatch | 4 ++-- kernel/livepatch/core.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-kernel-livepatch b/Documentation/ABI/testing/sysfs-kernel-livepatch
index 5bf42a8..afa0470 100644
--- a/Documentation/ABI/testing/sysfs-kernel-livepatch
+++ b/Documentation/ABI/testing/sysfs-kernel-livepatch@@ -33,12 +33,12 @@ Description: The object directory contains subdirectories for each function that is patched within the object. -What: /sys/kernel/livepatch/<patch>/<object>/<function> +What: /sys/kernel/livepatch/<patch>/<object>/<function@address> Date: Nov 2014 KernelVersion: 3.19.0 Contact: live-patching-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Description: - The function directory contains attributes regarding the + The function@address directory contains attributes regarding the properties and state of the patched function. There are currently no such attributes.
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 6e53441..347cb3e 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c@@ -733,7 +733,8 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func) func->state = KLP_DISABLED; return kobject_init_and_add(&func->kobj, &klp_ktype_func, - &obj->kobj, "%s", func->old_name); + &obj->kobj, "%s@%p", func->old_name, + (void *)func->old_addr); } /* parts of the initialization that is done only when the object is loaded */
--
1.9.1