From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 2244C346FA4 for ; Wed, 21 Jan 2026 08:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768984161; cv=none; b=mH/4FyovY6ikg0MMF70AVmgKIjvFAJten8rKZv/P0gLpvvbkerBzYn87oBdbAawXBgpVMTmxsAnCWa9ukebHywH/NLxMSZ5zM8jTufewHencPLblqmpQASEr8VrSLxF/A3Z4Hg3pYyHDXehhl3HY/M9oVjYDK4H/Min6j8fMMx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768984161; c=relaxed/simple; bh=dd/WKZVS93Pv/daREo/YFKKQFMVLmCyrRG74D11PrBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cNjUs27ujxFhSXDOUboTP71ylURTxTGJBtTDFfKgkUReibTXWceF/sAuvWOxD35ut4reE20TCCDTOjvMvl/tmbG7slCIFa4bQGJIrMUOPsE9ARAWycsd9efEwKA/D08JZ1xgJnw+/eKHDZg0TlDGPIwciEA/I0HgrTsrHMgILYQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=TXp0kn4v; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="TXp0kn4v" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-47ee937ecf2so5227125e9.0 for ; Wed, 21 Jan 2026 00:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1768984157; x=1769588957; 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; bh=rW3/x5WQoTtIgiq7ocBHZ7S4nlaqCE+GJd2t8Whluqo=; b=TXp0kn4vcV/hhanSKMBnkKUKjyfEF0oAbIzRKtyK1bFOtlKSjVEkXyR1Vm3Qy7V0OF EJFHRBv/tFsqAc4DP90pbxcLnty00UInPu67yYGL/ynEHyS0M+ii+IDwqgBtQdXjztxW KdKBTsx3NT6MoO6PrA/gZoJkHAfewWjyGMdgXdLhWx+3jy3nQ7ZUTXFxkpwvt+IDSbC1 bBIuju+X0u1wTT+WxTvSJBY52mzvQEHIbwYykpYlKNzn0AcYW0QO7Ad/ZoJmB3retevJ 7IZ28ziyCyDDo0d7fswhlQpgqUBdci8suOmPog7Ep7bRtrGNLVNeWxkKLafJlfeDU/11 a19Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768984157; x=1769588957; 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; bh=rW3/x5WQoTtIgiq7ocBHZ7S4nlaqCE+GJd2t8Whluqo=; b=frqEDUFaqpkMOk64XGio4H5dVZWTP//S7i0T7cMMe9W6hrSn6q2Vx8O6tjMemIcb3d GETWFxiw452bmSYX3p35K5pcn1Pm7nGCF4Xdc1RZcDwTItdCTtt6DIkGospHVP6A3XxV VFg2rqY6cjxUZBoaPEMAUukbvOA7hahdXZdapKLgNf5WtQHy9PyM9l7ifdJhMtP+FN15 AobJn00vfIEvOfznOGeKhhWZLoHewWyalvCoaS9+qUO+JqnyHJC4ZETBnMoRifaLqQZ4 TEnfgnks4eupD1dejoYIrNbLcvLTyGf1XBIybNGc/ZAPBkHcvgkRzVlTYD18pQcZCisT WBRg== X-Forwarded-Encrypted: i=1; AJvYcCUozMOBiKJZxzU1qzaQ6jVNlUdimznh4cSrsS2KPJz279Miik/y84P2hbtS0WwHla6JILxFX8nG2RhLeLvp@vger.kernel.org X-Gm-Message-State: AOJu0YxO2mdyaGIL/WXq40j8MvvPeNbDFG6Jb+v6vJFdw0OuwFFmC10m 5D7jNF5563/jIDpWF1IySXop5P62MgSlBVpA5Rr1ka1SFTTdvYEPTnfwqpBjVjKO16g= X-Gm-Gg: AZuq6aIHS5+pm1DuvxgPTxg+lZwNjcO+Ej0vxzPnq07WXhUwbYieOLxhMN+GyENcdn+ QFX1HbPZuhr0rFYJWdIitk2QPS6HwGVnpKkotXh1Zz4VWxJkmUnTIskipvgxBU+a7kQqkiG+dRS sK6vy4ziTk/Jo42lzgTKt01T21ssWc6LMqC3NUCxgCB5D3rYeikoGG/WfC99a5Cwo7+72P/ECJz EACRJnMHIQO9GFYlq3QU+qvzPbpYU1+q+eLJKseLTAD0pxR+iqh32Sgjmqqk9+PW9yOOltXtISl D6mAPp2UqDtJpR+Co3AYZz8xADrd5wYeWmhD03JwpZPe3Ygdr0y+DEIcnKHX13qQJaVMLgilHAU +cq4APcY6d8R+5tZSuk5+oav6263Tb750k9xVHppaI3YjN9Yu6VCsAqKlHA+5Ja3YdVjNzoFt7U kj48+Vq3C1OgvpbVdFDMi35NTxYCj4X8LrfMzjwh25lQ== X-Received: by 2002:a05:600c:524f:b0:46f:a2ba:581f with SMTP id 5b1f17b1804b1-4801e685697mr200477065e9.16.1768984157202; Wed, 21 Jan 2026 00:29:17 -0800 (PST) Received: from zovi.suse.cz (109-81-1-107.rct.o2.cz. [109.81.1.107]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47f4b2755absm441635355e9.15.2026.01.21.00.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 00:29:16 -0800 (PST) From: Petr Pavlu To: Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence Cc: Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Peter Zijlstra , live-patching@vger.kernel.org, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] livepatch: Fix having __klp_objects relics in non-livepatch modules Date: Wed, 21 Jan 2026 09:28:16 +0100 Message-ID: <20260121082842.3050453-2-petr.pavlu@suse.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260121082842.3050453-1-petr.pavlu@suse.com> References: <20260121082842.3050453-1-petr.pavlu@suse.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The linker script scripts/module.lds.S specifies that all input __klp_objects sections should be consolidated into an output section of the same name, and start/stop symbols should be created to enable scripts/livepatch/init.c to locate this data. This start/stop pattern is not ideal for modules because the symbols are created even if no __klp_objects input sections are present. Consequently, a dummy __klp_objects section also appears in the resulting module. This unnecessarily pollutes non-livepatch modules. Instead, since modules are relocatable files, the usual method for locating consolidated data in a module is to read its section table. This approach avoids the aforementioned problem. The klp_modinfo already stores a copy of the entire section table with the final addresses. Introduce a helper function that scripts/livepatch/init.c can call to obtain the location of the __klp_objects section from this data. Signed-off-by: Petr Pavlu Acked-by: Joe Lawrence --- include/linux/livepatch.h | 3 +++ kernel/livepatch/core.c | 20 ++++++++++++++++++++ scripts/livepatch/init.c | 18 +++++++----------- scripts/module.lds.S | 7 +------ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h index 772919e8096a..0a663e5911f4 100644 --- a/include/linux/livepatch.h +++ b/include/linux/livepatch.h @@ -175,6 +175,9 @@ int klp_enable_patch(struct klp_patch *); int klp_module_coming(struct module *mod); void klp_module_going(struct module *mod); +void *klp_locate_section_objs(const struct module *mod, const char *name, + size_t object_size, unsigned int *nr_objs); + void klp_copy_process(struct task_struct *child); void klp_update_patch_state(struct task_struct *task); diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 9917756dae46..85925abfca0f 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -1356,6 +1356,26 @@ void klp_module_going(struct module *mod) mutex_unlock(&klp_mutex); } +void *klp_locate_section_objs(const struct module *mod, const char *name, + size_t object_size, unsigned int *nr_objs) +{ + struct klp_modinfo *info = mod->klp_info; + + for (int i = 1; i < info->hdr.e_shnum; i++) { + Elf_Shdr *shdr = &info->sechdrs[i]; + + if (strcmp(info->secstrings + shdr->sh_name, name)) + continue; + + *nr_objs = shdr->sh_size / object_size; + return (void *)shdr->sh_addr; + } + + *nr_objs = 0; + return NULL; +} +EXPORT_SYMBOL_GPL(klp_locate_section_objs); + static int __init klp_init(void) { klp_root_kobj = kobject_create_and_add("livepatch", kernel_kobj); diff --git a/scripts/livepatch/init.c b/scripts/livepatch/init.c index 2274d8f5a482..a02252e1de03 100644 --- a/scripts/livepatch/init.c +++ b/scripts/livepatch/init.c @@ -9,19 +9,17 @@ #include #include -extern struct klp_object_ext __start_klp_objects[]; -extern struct klp_object_ext __stop_klp_objects[]; - static struct klp_patch *patch; static int __init livepatch_mod_init(void) { + struct klp_object_ext *obj_exts; struct klp_object *objs; unsigned int nr_objs; int ret; - nr_objs = __stop_klp_objects - __start_klp_objects; - + obj_exts = klp_locate_section_objs(THIS_MODULE, "__klp_objects", + sizeof(*obj_exts), &nr_objs); if (!nr_objs) { pr_err("nothing to patch!\n"); ret = -EINVAL; @@ -41,7 +39,7 @@ static int __init livepatch_mod_init(void) } for (int i = 0; i < nr_objs; i++) { - struct klp_object_ext *obj_ext = __start_klp_objects + i; + struct klp_object_ext *obj_ext = obj_exts + i; struct klp_func_ext *funcs_ext = obj_ext->funcs; unsigned int nr_funcs = obj_ext->nr_funcs; struct klp_func *funcs = objs[i].funcs; @@ -90,12 +88,10 @@ static int __init livepatch_mod_init(void) static void __exit livepatch_mod_exit(void) { - unsigned int nr_objs; - - nr_objs = __stop_klp_objects - __start_klp_objects; + struct klp_object *obj; - for (int i = 0; i < nr_objs; i++) - kfree(patch->objs[i].funcs); + klp_for_each_object_static(patch, obj) + kfree(obj->funcs); kfree(patch->objs); kfree(patch); diff --git a/scripts/module.lds.S b/scripts/module.lds.S index 3037d5e5527c..383d19beffb4 100644 --- a/scripts/module.lds.S +++ b/scripts/module.lds.S @@ -35,12 +35,7 @@ SECTIONS { __patchable_function_entries : { *(__patchable_function_entries) } __klp_funcs 0: ALIGN(8) { KEEP(*(__klp_funcs)) } - - __klp_objects 0: ALIGN(8) { - __start_klp_objects = .; - KEEP(*(__klp_objects)) - __stop_klp_objects = .; - } + __klp_objects 0: ALIGN(8) { KEEP(*(__klp_objects)) } #ifdef CONFIG_ARCH_USES_CFI_TRAPS __kcfi_traps : { KEEP(*(.kcfi_traps)) } -- 2.52.0