From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752992AbbJaDo6 (ORCPT ); Fri, 30 Oct 2015 23:44:58 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:45782 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751625AbbJaDo4 (ORCPT ); Fri, 30 Oct 2015 23:44:56 -0400 From: Chris J Arges To: live-patching@vger.kernel.org Cc: Chris J Arges , Josh Poimboeuf , Seth Jennings , Jiri Kosina , Vojtech Pavlik , linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] livepatch: old_name@old_addr scheme in livepatch sysfs directory Date: Fri, 30 Oct 2015 22:44:08 -0500 Message-Id: <1446263060-22175-1-git-send-email-chris.j.arges@canonical.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following directory structure will allow for cases when the same function name exists in a single object. /sys/kernel/livepatch/// An example of this issue is documented here: https://github.com/dynup/kpatch/issues/493 Signed-off-by: Chris J Arges --- 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/// +What: /sys/kernel/livepatch/// Date: Nov 2014 KernelVersion: 3.19.0 Contact: live-patching@vger.kernel.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