From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36825348C7D for ; Fri, 16 Oct 2026 05:37:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792129077; cv=none; b=jfyP/RQgJVFJo0hNsdhno1tYN+jdhtw3s92+DotBW03cGz4pxCATah9Gv90WkRBkQXbFy8mDHtQdjTN/8N/ZNT6zPMWvg4A6ZOHRK4VNZ5WlORiAheZB9NbvaIgQZrPttd6Gro394lwoBqQNUggsyBl1t7sCkFr7xuUlqTguh+k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792129077; c=relaxed/simple; bh=qldHla+xkKXYGD+TlFthSSN79cJx6latY+c2OoPYWZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GVMJiU8DqFtaKpS0C+QoAKHvmjkFCo+UwjGBmaWeZsJ3wJfXFTQRoniMIJIB+HDZuP1OzHzcsPZLrAmzGry2sWEJijz3kRS4CQcSG6UQhZWwEPYrsDi+owlbpYNa96IdTxXETb+TWPboesOEGxgbZ6DA2hbiXSHL4KcT3rErU3I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UN4pSWpw; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UN4pSWpw" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2e7e742a2c7so5349005ad.0 for ; Thu, 15 Oct 2026 22:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792129074; x=1792733874; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=hGdpFGgTojPaycac2dT8fGO9v+C7GUE0iWYjPOHShNo=; b=UN4pSWpwxfj4iwf+H0l2zOjXp5wJGGmJOq+1jCbrx4q5TXJjlzv08IkF2KY44g7QFi l4CiM4mzFj4uDyZgvUV6TvZO6NWpFlFNEz1Qu8a6q/3EAPJKuJM81wjOyiIz251O4BUp fS8EM7oWWaAWfTmG48+iufolw0foizRHIfjMi9du83AHFqblA4tQffscqHBj4uHHQr7p SQtaAJxUoBYM8cFiI+89j93obeQt9ouZU8SbpHFy6NeyF2shPUeCcxhnj1YOf8HltYkn UW3QiKGUbJnTs+ORtQX+Ow/9uTCHuE6hYQ/gYwszyoHIejA7/44GQP+YsCj9LAncKPgD 224w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792129074; x=1792733874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=hGdpFGgTojPaycac2dT8fGO9v+C7GUE0iWYjPOHShNo=; b=CXIbB9wXh81SYy52e2Dh9o8XDqx8FkVJdBBLCfSP9iftYaEWZXKMRCHKGxplOTqnDD Pi1qgY/wVhTZ1oCrk2JlNiTxJKUdkBx2NyDvmRMZIZru27MyG/VL2TO32Uv15tzgCOHa S7zYjaGLOuL6ASFMFvST6MM/CS/VVYN3xH9o+Y8nsoK5UWsAzJO8ry0P4k4HeHbp0WTx 1XegkHvG+ByWtmTxTYL4I0Nt1ezxuS2r6cs414WgO7BQfFWlJ7j4QVx9qsg9sY4SPoMt 9QfIMPb3ERPiVDy31bg99hx+dEmfrL5bUHEqaAAVjAW4PmImYRK0jJrbjAgQGbslZM5v AXaA== X-Gm-Message-State: AFq9FYK9GgClu4V7xTx7dXM+Wfya3wXw1me6rHBSauMHWtKjaWsa9TPJ rr6Ok3O4HO+rXb6Z+PZ16jQR3ktGTMv+BzP/i1qvWfcWYI6vLkPrwAfFflB9y5h2g5g= X-Gm-Gg: AYBFou29gOhGVljDr8xoKrU7+jXO80c0La/QWCEgqThf8Ppii7fCKfsVHudY21OpqdE bwZwtfQcGTJAZdkHpNqlOwCrvjbvh3lrY+PwWSvc9v3PvJSvDH3aK2XewlnyJvtXhQqbJHaE9GO h5gi+wAL63BbMxxyERMEJkpyaM3OIf3Ip7FEQ4gmuMFDOfICQQ+WTUNiaXIjPeNidXbMfusfmr4 CzIjVJrIEHhBwp/ttspR+wOHrYyEmPHm1G6cJmoFpokqVLhaH7DDT4A27jhiEBFYZzcdYwdAVLj B8EWfE6s7i7OPNbIIDpuFy8ec/d4npLYNMTzJWuDmOH/HMk0Ppwib2/9VrnnoQei5gBTow8DfaG n/D4IdEi5gcxlw2L6B7XNQOcOP2wECrwIp20pTY+q/BePjEKrNgtIsv8cXavzFfYSOTKShI8i50 tC7OP5B6dyBAfmQHS6f5zOQWHKqynPihgId94PowJOEvwLYyuC71l2izAXBxzUoVyIMjOxt50lm Q+POO0x2rqHPCs7tQuDwcifd1pitV/RkV2WfIjlAYxFBgFS6ypmy+cgM2/NNzJiooy+ X-Received: by 2002:a17:902:d482:b0:2e8:dd9c:99e0 with SMTP id d9443c01a7336-2e977592de7mr16737745ad.40.1792129074264; Thu, 15 Oct 2026 22:37:54 -0700 (PDT) Received: from localhost.localdomain ([240e:46c:5700:24f:f979:e84b:46de:615c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2e97e804d2dsm4724115ad.17.2026.10.15.22.37.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Oct 2026 22:37:53 -0700 (PDT) From: Yafang Shao To: jpoimboe@kernel.org, jikos@kernel.org, mbenes@suse.cz, pmladek@suse.com, joe.lawrence@redhat.com, song@kernel.org Cc: live-patching@vger.kernel.org, Yafang Shao Subject: [PATCH v12 5/9] livepatch: Implement provides and obsoletes for scoped atomic replace Date: Fri, 16 Oct 2026 13:37:04 +0800 Message-ID: <20261016053708.47089-6-laoar.shao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20261016053708.47089-1-laoar.shao@gmail.com> References: <20261016053708.47089-1-laoar.shao@gmail.com> Precedence: bulk X-Mailing-List: live-patching@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The current bool replace flag is too coarse: it is either all or nothing. A livepatch with .replace=true replaces ALL existing livepatches, which is safe but inflexible. There is no way to have multiple independent livepatch sets coexist on the same system. Replace it with a more flexible model using two new fields in struct klp_patch: - provides: an unsigned int id identifying the changes made by the related livepatch. Where the changes are a set of modified objects, functions, and used callbacks, shadow variable ids, and state ids. - obsoletes: an optional array of unsigned int ids specifying additional provides ids to be replaced. This allows a new patch to explicitly obsolete patches from different scopes. A new livepatch atomically replaces any existing livepatch that meets either of the following conditions: 1. It has the same provides id as the new patch, 2. Its provides id is listed in the new patch's obsoletes list. A new livepatch that does not replace an existing one can coexist with it. In this case, the two livepatches must not modify the same function, or use the state with the same id. Any attempt to load an incompatible livepatch will be rejected by the kernel. klp-build gains -p/--provides and -r/--obsoletes options. The two parameters are not validated in klp-build, since the compiler and the kernel handle invalid values. Enable the CONFIG_KLP_HAS_PROVIDES compile-time marker now that the provides/obsoletes interface is implemented. Suggested-by: Song Liu Suggested-by: Joe Lawrence Suggested-by: Petr Mladek Co-developed-by: Petr Mladek Signed-off-by: Petr Mladek Signed-off-by: Yafang Shao Acked-by: Song Liu Acked-by: Miroslav Benes --- .../ABI/removed/sysfs-kernel-livepatch | 7 + .../ABI/testing/sysfs-kernel-livepatch | 22 ++- .../livepatch/cumulative-patches.rst | 127 ++++++++++++++---- Documentation/livepatch/livepatch.rst | 29 ++-- include/linux/livepatch.h | 8 +- kernel/livepatch/Kconfig | 2 +- kernel/livepatch/core.c | 80 ++++++++--- kernel/livepatch/core.h | 1 + kernel/livepatch/state.c | 57 ++++++-- kernel/livepatch/transition.c | 15 ++- scripts/livepatch/init.c | 19 ++- scripts/livepatch/klp-build | 23 ++-- 12 files changed, 301 insertions(+), 89 deletions(-) create mode 100644 Documentation/ABI/removed/sysfs-kernel-livepatch diff --git a/Documentation/ABI/removed/sysfs-kernel-livepatch b/Documentation/ABI/removed/sysfs-kernel-livepatch new file mode 100644 index 000000000000..87d57ba27326 --- /dev/null +++ b/Documentation/ABI/removed/sysfs-kernel-livepatch @@ -0,0 +1,7 @@ +What: /sys/kernel/livepatch//replace +Date: Jun 2024 +KernelVersion: 6.11.0 +Contact: live-patching@vger.kernel.org +Description: + An attribute which indicates whether the patch supports + atomic-replace. diff --git a/Documentation/ABI/testing/sysfs-kernel-livepatch b/Documentation/ABI/testing/sysfs-kernel-livepatch index 3c3f36b32b57..e4874205c319 100644 --- a/Documentation/ABI/testing/sysfs-kernel-livepatch +++ b/Documentation/ABI/testing/sysfs-kernel-livepatch @@ -47,13 +47,25 @@ Description: disabled when the feature is used. See Documentation/livepatch/livepatch.rst for more information. -What: /sys/kernel/livepatch//replace -Date: Jun 2024 -KernelVersion: 6.11.0 +What: /sys/kernel/livepatch//provides +Date: Jun 2026 +KernelVersion: 7.4.0 Contact: live-patching@vger.kernel.org Description: - An attribute which indicates whether the patch supports - atomic-replace. + An attribute to show the provides id of this livepatch. + Livepatches with the same provides id replace each other. + +What: /sys/kernel/livepatch//obsoletes +Date: Jun 2026 +KernelVersion: 7.4.0 +Contact: live-patching@vger.kernel.org +Description: + An attribute to show the obsoletes ids of this livepatch. + The obsoletes ids are a comma-separated list of provides + ids that this patch obsoletes. When this livepatch is + loaded, any existing livepatch whose provides id matches + either this patch's provides id or any id in the obsoletes + list will be atomically replaced. What: /sys/kernel/livepatch//stack_order Date: Jan 2025 diff --git a/Documentation/livepatch/cumulative-patches.rst b/Documentation/livepatch/cumulative-patches.rst index 1931f318976a..5ce04424e09d 100644 --- a/Documentation/livepatch/cumulative-patches.rst +++ b/Documentation/livepatch/cumulative-patches.rst @@ -2,33 +2,71 @@ Atomic Replace & Cumulative Patches =================================== -There might be dependencies between livepatches. If multiple patches need -to do different changes to the same function(s) then we need to define -an order in which the patches will be installed. And function implementations -from any newer livepatch must be done on top of the older ones. - -This might become a maintenance nightmare. Especially when more patches -modified the same function in different ways. - -An elegant solution comes with the feature called "Atomic Replace". It allows -creation of so called "Cumulative Patches". They include all wanted changes -from all older livepatches and completely replace them in one transition. - -Usage ------ - -The atomic replace can be enabled by setting "replace" flag in struct klp_patch, -for example:: - - static struct klp_patch patch = { - .mod = THIS_MODULE, - .objs = objs, - .replace = true, - }; - -All processes are then migrated to use the code only from the new patch. -Once the transition is finished, all older patches are automatically -disabled. +Livepatches are used to fix kernel bugs. New fixes need to be added over time. +The fixes might be independent, but they might also depend on each other. This +brings a challenge of how to keep the livepatched system safe and consistent. + +Part of the solution is the "Atomic Replace" feature, which allows the kernel to +atomically replace an existing livepatch with another one. These newer +livepatches are designed as "Cumulative Patches". They include all wanted +changes from all older livepatches and completely replace them in one +transition. + +The second part of the solution are ``provides`` and ``obsoletes`` fields in +``struct klp_patch``, which allow the installation of multiple livepatches in +parallel. A livepatch will atomically replace any already installed livepatch +whose ``provides`` id matches either the new patch's ``provides`` id or any id +in the new patch's ``obsoletes`` list. This might be used to fix independent +problems separately, for example, the livepatches might be prepared by separate +teams focusing on particular functionality or a subsystem. + +It should be emphasized that the preferred and most secure way is to always use +the default ``provides = 0``. As long as all livepatches use the same default +id, any livepatch replaces any other livepatch, preventing any unexpected +interactions between incompatible livepatches. + +Installing more livepatches in parallel is dangerous, especially +when they are provided by different teams or vendors. The built-in +checks for possible conflicts do not prevent potential +incompatibilities and breakages. For example, two livepatches might +modify different functions but still affect each other via shared +data structures or global variables. + +Provides and Obsoletes +----------------------- + +The ``provides`` field in ``struct klp_patch`` is an unsigned integer that +identifies the livepatch. By default, it is 0. + +The ``obsoletes`` field is an optional array of unsigned integers that +specifies additional ``provides`` ids to be replaced when this patch is +loaded. + +For example:: + + static struct klp_patch patch = { + .mod = THIS_MODULE, + .objs = objs, + .provides = 0, + }; + +Any ``provides`` value might be associated with a set of livepatched symbols, +callbacks, shadow variables, and state IDs. By definition, there can only ever +be one active livepatch for a given ``provides`` id. + +On the contrary, a new livepatch that does not replace an existing one can +coexist with it. In this case, the two livepatches must not modify the same +function, or use the state with the same ID. Any attempt to load an incompatible +livepatch will be rejected by the kernel. + +Atomic Replace +-------------- + +A livepatch with a given ``provides`` id is replaced by another livepatch +with the same ``provides`` id, or whose ``obsoletes`` list includes that id. +All processes are migrated to use the code only from the new patch. Once +the transition is finished, the older patch is disabled. Patches with a +different ``provides`` id are not affected and remain active. Ftrace handlers are transparently removed from functions that are no longer modified by the new cumulative patch. @@ -64,7 +102,11 @@ Limitations: - Once the operation finishes, there is no straightforward way to reverse it and restore the replaced patches atomically. - A good practice is to set .replace flag in any released livepatch. + A good practice is to use only one (default) ``provides`` id. It + makes sure that there always will be only one enabled livepatch + on the system. The consistency model will ensure a safe update + between two versions. It prevents potential problems with installing + two livepatches doing incompatible functional changes. Then re-adding an older livepatch is equivalent to downgrading to that patch. This is safe as long as the livepatches do _not_ do extra modifications in (un)patching callbacks or in the module_init() @@ -74,6 +116,35 @@ Limitations: only when the transition was not forced. + - The rollback is even more complicated when the new livepatch + obsoleted more livepatches. For example, livepatch A (provides 1) + and livepatch B (provides 2) are independent. Livepatch C + (provides 3, obsoletes 1 and 2) replaces both A and B. A proper + rollback from C would require loading A and B synchronously. + It would need special support in the module loader and + the livepatch core code. This is not supported. + + Instead, the rollback has to be done in more steps, for example:: + + echo 0 > /sys/kernel/livepatch/livepatch_C/enabled + modprobe livepatch_A + modprobe livepatch_B + + Note that the replaced livepatches stay loaded but disabled. + They have to be removed before they can be loaded again. + The example above assumes that they were removed in + the meantime. + + Also, the older livepatches can be loaded only when they do + not conflict with the still enabled ones, see the conflict + rules above. The newer livepatch is expected to include the + fixes from the obsoleted livepatches. As a result, the + rollback usually has to start by disabling the newer + livepatch. The rollback is not atomic. The affected + functions run the original code until all the older + livepatches get loaded again. + + - Only the (un)patching callbacks from the _new_ cumulative livepatch are executed. Any callbacks from the replaced patches are ignored. diff --git a/Documentation/livepatch/livepatch.rst b/Documentation/livepatch/livepatch.rst index acb90164929e..2567e09c74fd 100644 --- a/Documentation/livepatch/livepatch.rst +++ b/Documentation/livepatch/livepatch.rst @@ -347,15 +347,26 @@ to '0'. 5.3. Replacing -------------- -All enabled patches might get replaced by a cumulative patch that -has the .replace flag set. - -Once the new patch is enabled and the 'transition' finishes then -all the functions (struct klp_func) associated with the replaced -patches are removed from the corresponding struct klp_ops. Also -the ftrace handler is unregistered and the struct klp_ops is -freed when the related function is not modified by the new patch -and func_stack list becomes empty. +There can be only one active livepatch for a given ``provides`` id. +A new livepatch atomically replaces any existing livepatch whose +``provides`` id matches either the new patch's ``provides`` id or +any id in the new patch's ``obsoletes`` list. + +A new livepatch that does not replace an existing one can coexist with it. +In this case, the two livepatches must not modify the same function, or use +the state with the same id. Any attempt to load an incompatible livepatch +will be rejected by the kernel. + +Installing more livepatches in parallel is dangerous, especially +when they are provided by different teams or vendors. The built-in +checks for possible conflicts do not prevent potential +incompatibilities and breakages. + +Once the transition is complete, all functions (``struct klp_func``) +associated with the matching replaced patches are removed from the +corresponding ``struct klp_ops``. If a function is no longer modified by +the new patch and its ``func_stack`` list becomes empty, the ftrace +handler is unregistered and the ``struct klp_ops`` is freed. See Documentation/livepatch/cumulative-patches.rst for more details. diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h index 5f74f79c22b4..1e3a09e29a65 100644 --- a/include/linux/livepatch.h +++ b/include/linux/livepatch.h @@ -127,7 +127,9 @@ struct klp_state { * @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 + * @provides: only one active livepatch per id + * @obsoletes: replace given livepatch id(s) + * @nr_obsoletes: number of entries in the @obsoletes array * @list: list node for global list of actively used patches * @kobj: kobject for sysfs resources * @obj_list: dynamic list of the object entries @@ -141,7 +143,9 @@ struct klp_patch { struct module *mod; struct klp_object *objs; struct klp_state *states; - bool replace; + unsigned int provides; + unsigned int *obsoletes; + unsigned int nr_obsoletes; /* internal */ struct list_head list; diff --git a/kernel/livepatch/Kconfig b/kernel/livepatch/Kconfig index d1eb971abb1a..d92603658f7e 100644 --- a/kernel/livepatch/Kconfig +++ b/kernel/livepatch/Kconfig @@ -32,7 +32,7 @@ config KLP_BUILD Enable klp-build support config KLP_HAS_PROVIDES - def_bool n + def_bool y help Compile-time marker for the livepatch provides/obsoletes support. It is always set when the kernel is built with the scoped atomic diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index c0879b5d9dc0..91e6ea53b337 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -350,7 +350,8 @@ int klp_apply_section_relocs(struct module *pmod, Elf_Shdr *sechdrs, * /sys/kernel/livepatch//enabled * /sys/kernel/livepatch//transition * /sys/kernel/livepatch//force - * /sys/kernel/livepatch//replace + * /sys/kernel/livepatch//provides + * /sys/kernel/livepatch//obsoletes * /sys/kernel/livepatch//stack_order * /sys/kernel/livepatch// * /sys/kernel/livepatch///patched @@ -448,13 +449,32 @@ static ssize_t force_store(struct kobject *kobj, struct kobj_attribute *attr, return count; } -static ssize_t replace_show(struct kobject *kobj, +static ssize_t provides_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); + return sysfs_emit(buf, "%u\n", patch->provides); +} + +static ssize_t obsoletes_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct klp_patch *patch; + unsigned int i; + int len = 0; + + patch = container_of(kobj, struct klp_patch, kobj); + if (!patch->obsoletes || !patch->nr_obsoletes) + return sysfs_emit(buf, "\n"); + + for (i = 0; i < patch->nr_obsoletes; i++) + len += sysfs_emit_at(buf, len, "%s%u", i == 0 ? "" : ",", + patch->obsoletes[i]); + + len += sysfs_emit_at(buf, len, "\n"); + return len; } static ssize_t stack_order_show(struct kobject *kobj, @@ -481,13 +501,15 @@ static ssize_t stack_order_show(struct kobject *kobj, 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 kobj_attribute provides_kobj_attr = __ATTR_RO(provides); +static struct kobj_attribute obsoletes_kobj_attr = __ATTR_RO(obsoletes); static struct kobj_attribute stack_order_kobj_attr = __ATTR_RO(stack_order); static struct attribute *klp_patch_attrs[] = { &enabled_kobj_attr.attr, &transition_kobj_attr.attr, &force_kobj_attr.attr, - &replace_kobj_attr.attr, + &provides_kobj_attr.attr, + &obsoletes_kobj_attr.attr, &stack_order_kobj_attr.attr, NULL }; @@ -520,6 +542,27 @@ static void klp_init_func_early(struct klp_object *obj, static void klp_init_object_early(struct klp_patch *patch, struct klp_object *obj); +/* + * Check if @new_patch will replace @old_patch: + * 1. Same provides ID + * 2. Old provides ID is in new patch's obsoletes list + */ +bool klp_patch_replaces(struct klp_patch *new_patch, struct klp_patch *old_patch) +{ + unsigned int i; + + if (old_patch->provides == new_patch->provides) + return true; + + if (new_patch->obsoletes) { + for (i = 0; i < new_patch->nr_obsoletes; i++) { + if (new_patch->obsoletes[i] == old_patch->provides) + return true; + } + } + return false; +} + static struct klp_object *klp_alloc_object_dynamic(const char *name, struct klp_patch *patch) { @@ -608,9 +651,10 @@ static int klp_add_object_nops(struct klp_patch *patch, * Add 'nop' functions which simply return to the caller to run the * original function. * - * They are added only when the atomic replace mode is used and only for - * functions which are currently livepatched but are no longer included - * in the new livepatch. + * They are added only when the new livepatch replaces an older one, + * see klp_patch_replaces(), and only for functions which are + * currently livepatched but are no longer included in the new + * livepatch. */ static int klp_add_nops(struct klp_patch *patch) { @@ -618,6 +662,9 @@ static int klp_add_nops(struct klp_patch *patch) struct klp_object *old_obj; klp_for_each_patch(old_patch) { + if (!klp_patch_replaces(patch, old_patch)) + continue; + klp_for_each_object(old_patch, old_obj) { int err; @@ -799,6 +846,8 @@ void klp_free_replaced_patches_async(struct klp_patch *new_patch) klp_for_each_patch_safe(old_patch, tmp_patch) { if (old_patch == new_patch) return; + if (!klp_patch_replaces(new_patch, old_patch)) + continue; klp_free_patch_async(old_patch); } } @@ -995,11 +1044,9 @@ static int klp_init_patch(struct klp_patch *patch) if (ret) return ret; - if (patch->replace) { - ret = klp_add_nops(patch); - if (ret) - return ret; - } + ret = klp_add_nops(patch); + if (ret) + return ret; klp_for_each_object(patch, obj) { ret = klp_init_object(patch, obj); @@ -1193,11 +1240,12 @@ int klp_enable_patch(struct klp_patch *patch) EXPORT_SYMBOL_GPL(klp_enable_patch); /* - * This function unpatches objects from the replaced livepatches. + * This function unpatches objects from the livepatches that are replaced + * by the new one, see klp_patch_replaces(). * * We could be pretty aggressive here. It is called in the situation where * these structures are no longer accessed from the ftrace handler. - * All functions are redirected by the klp_transition_patch. They + * All their 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. * @@ -1214,6 +1262,8 @@ void klp_unpatch_replaced_patches(struct klp_patch *new_patch) klp_for_each_patch(old_patch) { if (old_patch == new_patch) return; + if (!klp_patch_replaces(new_patch, old_patch)) + continue; old_patch->enabled = false; klp_unpatch_objects(old_patch); diff --git a/kernel/livepatch/core.h b/kernel/livepatch/core.h index 361a0917a03f..b03cfc58b660 100644 --- a/kernel/livepatch/core.h +++ b/kernel/livepatch/core.h @@ -18,6 +18,7 @@ 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); struct klp_func *klp_find_func(struct klp_object *obj, struct klp_func *func); +bool klp_patch_replaces(struct klp_patch *new_patch, struct klp_patch *old_patch); static inline bool klp_is_object_loaded(struct klp_object *obj) { diff --git a/kernel/livepatch/state.c b/kernel/livepatch/state.c index 2565d039ade0..c64a934b664d 100644 --- a/kernel/livepatch/state.c +++ b/kernel/livepatch/state.c @@ -85,24 +85,62 @@ EXPORT_SYMBOL_GPL(klp_get_prev_state); /* Check if the patch is able to deal with the existing system state. */ static bool klp_is_state_compatible(struct klp_patch *patch, + struct klp_patch *old_patch, struct klp_state *old_state) { struct klp_state *state; state = klp_get_state(patch, old_state->id); + if (klp_patch_replaces(patch, old_patch)) { + /* + * If the new livepatch will replace the old one, it must + * handle all already modified states (cumulative patch). + */ + if (!state) + return false; + return state->version >= old_state->version; - /* A cumulative livepatch must handle all already modified states. */ - if (!state) - return !patch->replace; + } - return state->version >= old_state->version; + /* + * Two livepatches with a different "provides" must _not_ use + * the same "state->id". + */ + return !state; } /* - * 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. + * Refuse loading a livepatch which would want to modify a function + * which is already livepatched by a patch that will not be replaced. + * A patch is replaced if it has the same provides id or if its + * provides id is in the new patch's obsoletes list. */ +static bool klp_has_function_conflict(struct klp_patch *patch, + struct klp_patch *old_patch) +{ + struct klp_object *obj, *old_obj; + struct klp_func *func; + + if (klp_patch_replaces(patch, old_patch)) + return false; + + klp_for_each_object(patch, obj) { + klp_for_each_object(old_patch, old_obj) { + if (!!obj->name != !!old_obj->name) + continue; + if (obj->name && strcmp(obj->name, old_obj->name)) + continue; + + klp_for_each_func(obj, func) { + if (klp_find_func(old_obj, func)) + return true; + } + } + } + return false; +} + +/* Check that the new livepatch will not break the existing system states. */ bool klp_is_patch_compatible(struct klp_patch *patch) { struct klp_patch *old_patch; @@ -110,9 +148,12 @@ bool klp_is_patch_compatible(struct klp_patch *patch) klp_for_each_patch(old_patch) { klp_for_each_state(old_patch, old_state) { - if (!klp_is_state_compatible(patch, old_state)) + if (!klp_is_state_compatible(patch, old_patch, old_state)) return false; } + + if (klp_has_function_conflict(patch, old_patch)) + return false; } return true; diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c index 2351a19ac2a9..ef70ff582da1 100644 --- a/kernel/livepatch/transition.c +++ b/kernel/livepatch/transition.c @@ -89,7 +89,7 @@ static void klp_complete_transition(void) klp_transition_patch->mod->name, klp_target_state == KLP_TRANSITION_PATCHED ? "patching" : "unpatching"); - if (klp_transition_patch->replace && klp_target_state == KLP_TRANSITION_PATCHED) { + if (klp_target_state == KLP_TRANSITION_PATCHED) { klp_unpatch_replaced_patches(klp_transition_patch); klp_discard_nops(klp_transition_patch); } @@ -496,10 +496,10 @@ void klp_try_complete_transition(void) * klp_complete_transition() but it is called also * from klp_cancel_transition(). */ - if (!patch->enabled) - klp_free_patch_async(patch); - else if (patch->replace) + if (patch->enabled) klp_free_replaced_patches_async(patch); + else + klp_free_patch_async(patch); } /* @@ -720,11 +720,12 @@ void klp_force_transition(void) klp_update_patch_state(idle_task(cpu)); /* Set forced flag for patches being removed. */ - if (klp_target_state == KLP_TRANSITION_UNPATCHED) + if (klp_target_state == KLP_TRANSITION_UNPATCHED) { klp_transition_patch->forced = true; - else if (klp_transition_patch->replace) { + } else { klp_for_each_patch(patch) { - if (patch != klp_transition_patch) + if (patch != klp_transition_patch && + klp_patch_replaces(klp_transition_patch, patch)) patch->forced = true; } } diff --git a/scripts/livepatch/init.c b/scripts/livepatch/init.c index f14d8c8fb35f..1eb124191cf2 100644 --- a/scripts/livepatch/init.c +++ b/scripts/livepatch/init.c @@ -8,6 +8,11 @@ #include #include #include +#include + +#ifdef KLP_OBSOLETES +static unsigned int klp_obsoletes[] = { KLP_OBSOLETES }; +#endif static struct klp_patch *patch; @@ -50,8 +55,6 @@ static int __init livepatch_mod_init(void) funcs = kzalloc(sizeof(struct klp_func) * (nr_funcs + 1), GFP_KERNEL); if (!funcs) { ret = -ENOMEM; - for (int j = 0; j < i; j++) - kfree(objs[i].funcs); goto err_free_objs; } @@ -72,15 +75,19 @@ static int __init livepatch_mod_init(void) /* TODO patch->states */ -#ifdef KLP_NO_REPLACE - patch->replace = false; -#else - patch->replace = true; +#ifdef KLP_PROVIDES + patch->provides = KLP_PROVIDES; +#endif +#ifdef KLP_OBSOLETES + patch->obsoletes = klp_obsoletes; + patch->nr_obsoletes = ARRAY_SIZE(klp_obsoletes); #endif return klp_enable_patch(patch); err_free_objs: + for (int i = 0; i < nr_objs; i++) + kfree(objs[i].funcs); kfree(objs); err_free_patch: kfree(patch); diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build index c4a7acf8edc3..95472224680a 100755 --- a/scripts/livepatch/klp-build +++ b/scripts/livepatch/klp-build @@ -21,7 +21,8 @@ shopt -s lastpipe unset DEBUG_CLONE DIFF_CHECKSUM SKIP_CLEANUP VERBOSE XTRACE -REPLACE=1 +PROVIDES=0 +OBSOLETES="" SHORT_CIRCUIT=0 JOBS="$(getconf _NPROCESSORS_ONLN)" shopt -o xtrace | grep -q 'on' && XTRACE=1 @@ -132,7 +133,8 @@ Options: -f, --show-first-changed Show address of first changed instruction -j, --jobs= Build jobs to run simultaneously [default: $JOBS] -o, --output= Output file [default: livepatch-.ko] - --no-replace Disable livepatch atomic replace + -p, --provides= Set the provides id for this livepatch + -r, --obsoletes= Set the obsoletes ids array (e.g., "0,1,2") -v, --verbose Pass V=1 to kernel/module builds Advanced Options: @@ -159,8 +161,8 @@ process_args() { local args local patch - short="hfj:o:vdS:T" - long="help,show-first-changed,jobs:,output:,no-replace,verbose,debug,short-circuit:,keep-tmp" + short="hfj:o:p:r:vdS:T" + long="help,show-first-changed,jobs:,output:,provides:,obsoletes:,verbose,debug,short-circuit:,keep-tmp" args=$(getopt --options "$short" --longoptions "$long" -- "$@") || { echo; usage; exit @@ -189,9 +191,13 @@ process_args() { NAME="$(module_name_string "$NAME")" shift 2 ;; - --no-replace) - REPLACE=0 - shift + -p | --provides) + PROVIDES="$2" + shift 2 + ;; + -r | --obsoletes) + OBSOLETES="$2" + shift 2 ;; -v | --verbose) VERBOSE=1 @@ -847,7 +853,8 @@ build_patch_module() { cflags=("-ffunction-sections") cflags+=("-fdata-sections") - [[ $REPLACE -eq 0 ]] && cflags+=("-DKLP_NO_REPLACE") + cflags+=("-DKLP_PROVIDES=$PROVIDES") + [[ -n "$OBSOLETES" ]] && cflags+=("-DKLP_OBSOLETES=$OBSOLETES") cmd=("make") if [[ -v VERBOSE ]]; then -- 2.52.0