From nobody Sun Feb 8 13:39:55 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 251C03A8FE6 for ; Wed, 21 Jan 2026 08:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768984161; cv=none; b=tx1wmlPnWyvKbeSn0f4OZuYihEh6asyxXZ5iIUGJK1fntpcAgi20C5Woj3asVGSpuIQwD3jPtIWDSkbPkz4emYqKKPQOCbr4HXqaAfu3z70GF5bWIbrvwpX1/fSnnkbQ2pNz4kBTxM7v8VWRvI54wcqqjCiZWRqlRZVf+Nc2YY4= 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.50 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-f50.google.com with SMTP id 5b1f17b1804b1-47ff94b46afso5228965e9.1 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=f5X5/gBt94jaMes0smsF6ruwArnZDi5PPIcYMy5kLlPXW3mRJSlpkIto4zSOPPBMUd GJUGbmoTQKfLowKwT6VumsL9edcLRGUvj02Jc3cqSQlhPcbU+ER5eHTuN8/Yy7MJ0oIA ay9I8zhbHJnLlPn0L/IrdHk7CAelu8UFQTUWiM2kT1qJ5LFIZ5xB0OKgzcN0YFYN/MnJ paIGPKhS91qytnp/WrZs50yPe3LZ2UqmMPKmytjMwF/77l7F5XIaUQS4pD1YL5FnFLKj GDqD0YfA6nNc7tISJ5QNXFsgJSosfEPWawdS4A6/ovX9PZ98oOiXoQY9JY6Q2t3ObYt7 gtmA== X-Forwarded-Encrypted: i=1; AJvYcCUNI9iGgKnoi4QIIJDHWhylgXXeUbExwzgR8XIue/hdIpYl73fOvXGHwuctsmIhgZ/ZVHXC5wF6icN92aY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0ttKKLvH2CuvQDn4ScXIWhXe348pKHgXec/5Cro4GhMmV6Hi6 vAFMw/7kVa4XoTwn9IBY409MKGgFk5xXpASgxo34FuVeh5DHnPTKZD9U+I0XYaoxt0g= X-Gm-Gg: AZuq6aJWsMHmJQamXX3FPEVbEiPperPAKtEoZ9E8hi76fitu0A31WFV6qogFBDq2ptI 77OiTUJe06Xx+AidKfeym0ELSgUwmK8XC44UuEG+mTiacGzQ0pCMpNO09f2AQmT+/4iawJYy53u rwyQTD5EF/CxNXSQxc5Kp0e0yBWtWuX8f65bv2+/Nt/ZlVmVOWvbfBmVO4FfC8DRQsduT/1Cz4+ uHstKasy67F8Xx4x5i7jSQ/Q9q29F/4IESfi4mcwUE+qFgRHkVtX48yWDw6PKX5Eq5J5xcCmoHz esNvCYaV9NqOznWIKvVoo72iuB01JprlzL9+VK0aooP2NEgrEkeFkhRbEEBkjO5KXjTlIS8q5so fjzdlWiEywo96p56nnfkQIjbcaxYgQFqUaiyDwmOEALqhaScVb5fF7JMziIyFYlp37qZDuzLcxV an9fLqYKlhqAKo0pZEauIiOdD30dx4s30CsOG6AsMpYg== 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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); =20 +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); =20 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); } =20 +void *klp_locate_section_objs(const struct module *mod, const char *name, + size_t object_size, unsigned int *nr_objs) +{ + struct klp_modinfo *info =3D mod->klp_info; + + for (int i =3D 1; i < info->hdr.e_shnum; i++) { + Elf_Shdr *shdr =3D &info->sechdrs[i]; + + if (strcmp(info->secstrings + shdr->sh_name, name)) + continue; + + *nr_objs =3D shdr->sh_size / object_size; + return (void *)shdr->sh_addr; + } + + *nr_objs =3D 0; + return NULL; +} +EXPORT_SYMBOL_GPL(klp_locate_section_objs); + static int __init klp_init(void) { klp_root_kobj =3D 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 =20 -extern struct klp_object_ext __start_klp_objects[]; -extern struct klp_object_ext __stop_klp_objects[]; - static struct klp_patch *patch; =20 static int __init livepatch_mod_init(void) { + struct klp_object_ext *obj_exts; struct klp_object *objs; unsigned int nr_objs; int ret; =20 - nr_objs =3D __stop_klp_objects - __start_klp_objects; - + obj_exts =3D klp_locate_section_objs(THIS_MODULE, "__klp_objects", + sizeof(*obj_exts), &nr_objs); if (!nr_objs) { pr_err("nothing to patch!\n"); ret =3D -EINVAL; @@ -41,7 +39,7 @@ static int __init livepatch_mod_init(void) } =20 for (int i =3D 0; i < nr_objs; i++) { - struct klp_object_ext *obj_ext =3D __start_klp_objects + i; + struct klp_object_ext *obj_ext =3D obj_exts + i; struct klp_func_ext *funcs_ext =3D obj_ext->funcs; unsigned int nr_funcs =3D obj_ext->nr_funcs; struct klp_func *funcs =3D objs[i].funcs; @@ -90,12 +88,10 @@ static int __init livepatch_mod_init(void) =20 static void __exit livepatch_mod_exit(void) { - unsigned int nr_objs; - - nr_objs =3D __stop_klp_objects - __start_klp_objects; + struct klp_object *obj; =20 - for (int i =3D 0; i < nr_objs; i++) - kfree(patch->objs[i].funcs); + klp_for_each_object_static(patch, obj) + kfree(obj->funcs); =20 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) } =20 __klp_funcs 0: ALIGN(8) { KEEP(*(__klp_funcs)) } - - __klp_objects 0: ALIGN(8) { - __start_klp_objects =3D .; - KEEP(*(__klp_objects)) - __stop_klp_objects =3D .; - } + __klp_objects 0: ALIGN(8) { KEEP(*(__klp_objects)) } =20 #ifdef CONFIG_ARCH_USES_CFI_TRAPS __kcfi_traps : { KEEP(*(.kcfi_traps)) } --=20 2.52.0 From nobody Sun Feb 8 13:39:55 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 976BE3ACF0A for ; Wed, 21 Jan 2026 08:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768984163; cv=none; b=tEzVztkGVl4b9VJGzpx9qfrFQKRkWvdJiY8SWKYuITV07gZFKv6HsJuKd21xWN0su7Mg2xTAgwOthVYqvhalYNGQQm4ysxlXZZz+zrr3F3+GFR9jyTjn2o5OsYGUtcaIU/3DU21RaRiYn2Egted4UTPnG4RTtKlLvsmmCX6bbyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768984163; c=relaxed/simple; bh=tf2r0DbF4We3sVnIZiZOAFzXpYYSfLGiXXDWTAoLYpI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D7OIj+hoQh4Fg1Q2s2qepswDUtJvSmPIbehHBCrPsxFeADiG1k8IUEAvjD/PmJYK1bwgSTm/52HcZjlzGUrp9nXNYMrKNDY72zSECyEBD9QMhvjK/dpfcHrhgrtD2cEOws67xkbq+9C3Hi56Ab+8zVJuVqey1HmP/oZw+GghnBY= 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=Ny8Qiv1y; arc=none smtp.client-ip=209.85.128.51 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="Ny8Qiv1y" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-47edd6111b4so58269125e9.1 for ; Wed, 21 Jan 2026 00:29:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1768984159; x=1769588959; 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=7vxOZHcSBD1fpQdkK38syRA+6nyfkbQXy3R8wbjNKlg=; b=Ny8Qiv1ydkinzp/mRVJAD8Q3d0d1kXAI6CLUeB+zGmWZ8tFO5hMe0XNvijab+4cIb8 MbhuEoEY059NqrhH/bIAauh8YY/bcGSu1ywqy1Dq2dyRqYqO6s5NGEE5KDKKbS9g/vwc hMGVL/DX4U8SQJqnHpwTYL+BmTqjw0Jd7ZIjMya4tXaJiy0xqEzfBgvBcIY3j/BhhLut W3wT2gTRFaetQ6LiAgFaHWZcv2dfB++XK9SVOZAOqU+MF3mAOULuwbaxFzy3I3HcUeDP uq7EizhB+n6e/yHIZQrNOETn2t1QsDo1FCbOghkPU9hASSe7kjIQ39rWQhGU1/HbbXOE ZXDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768984159; x=1769588959; 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=7vxOZHcSBD1fpQdkK38syRA+6nyfkbQXy3R8wbjNKlg=; b=vtWbIsEMYCDzxVM/h01kH17Fk/q11JjjjpsM3xUEmzinJoGbP7S0ttEs7ZqsETYa1f r4MY8Jf8qbUxjjsa+Vfhdh0pkeMe4GycVd6MtMvDuAIAJabHNyTC+QlZESecD55aDy0H DwMurne0rwDcqrBWE6AGcE7b3w1oevyAJWLOnyf2CWc6h3d/BHe2D7Spo5SgJqcImYyu +E5r25dI6ZRnVWVxUJSiXR8g87EfQahmrFo4o/KyNvMJcrC+ScI9r/79Wt+IwufbB2Tc Rbn9d2BdjvgbV1kupRQSTWuxmiCcU9azcsa/0lf5ug+7BXJe07r0jmrfRb/wZoRcKYZi 2pyg== X-Forwarded-Encrypted: i=1; AJvYcCXbzaSMRZFAA+VFM1xwoPJwdbW4txxZRRNi350M5u/xaX8YDUsoZcODL2c0qDiXQiREwQzVBPgRczYGQP8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8jny/Il1zM4jGB3LvlGovCFnx7mECKAZWGre4h6MPV0K/elaI GuTjuSyWZuDP98e+kbUtQ7o5P7+tNhRd7WBcizYn06x14NqY0gpnj4bKSYl8ahO3BJg= X-Gm-Gg: AZuq6aIRpUymglD5xzQeMPB23MgAKf3j0d0vxl3nHU4CNoPcvcNabkNG70Fl5qp1jKb zQPFiSGF3DWKJCk2CtAviNR2KDyC+N/TOP0HT/x8qwguTO5uXKBPdP7w9ORZPKmdBljSo/nlUBW QyigSWitJQMILe3BBJyB5A8dF6JncE15ONr2ciVkEQ0twH7328a1xP3QUUV1h8HvOLqVUAS/Gv2 ZOGBVbi0MklsYAmEmYe3tabmpR5eIbb7OQBF1PWtNX91iKohfMfklZlpF1vO3Dc05EJrRHAS/Zi ppwrlbDlAqmpw1TqP/MEbFj2L3bh7WoGLjOMDzDPFlLPMYkSESUTRXaU5UhSQ+lQ8ouAyRy/L6s SjRMkW3rYmV8alQ4T/eCvXHmPJQ/FlR1JfofZWkIyGg6J3//YJ4gzwpcv9ekA8Ht0kKVlZQbm48 foGTiNERQrBXqK7M5J5DmI6XRWJUf44d0= X-Received: by 2002:a05:600c:6990:b0:47e:c562:a41f with SMTP id 5b1f17b1804b1-4801e334361mr221506345e9.18.1768984158802; Wed, 21 Jan 2026 00:29:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 00:29:18 -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 2/2] livepatch: Free klp_{object,func}_ext data after initialization Date: Wed, 21 Jan 2026 09:28:17 +0100 Message-ID: <20260121082842.3050453-3-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The klp_object_ext and klp_func_ext data, which are stored in the __klp_objects and __klp_funcs sections, respectively, are not needed after they are used to create the actual klp_object and klp_func instances. This operation is implemented by the init function in scripts/livepatch/init.c. Prefix the two sections with ".init" so they are freed after the module is initializated. Signed-off-by: Petr Pavlu Acked-by: Joe Lawrence --- scripts/livepatch/init.c | 2 +- scripts/module.lds.S | 4 ++-- tools/objtool/check.c | 2 +- tools/objtool/include/objtool/klp.h | 10 +++++----- tools/objtool/klp-diff.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/livepatch/init.c b/scripts/livepatch/init.c index a02252e1de03..3e658db5dfe8 100644 --- a/scripts/livepatch/init.c +++ b/scripts/livepatch/init.c @@ -18,7 +18,7 @@ static int __init livepatch_mod_init(void) unsigned int nr_objs; int ret; =20 - obj_exts =3D klp_locate_section_objs(THIS_MODULE, "__klp_objects", + obj_exts =3D klp_locate_section_objs(THIS_MODULE, ".init.klp_objects", sizeof(*obj_exts), &nr_objs); if (!nr_objs) { pr_err("nothing to patch!\n"); diff --git a/scripts/module.lds.S b/scripts/module.lds.S index 383d19beffb4..054ef99e8288 100644 --- a/scripts/module.lds.S +++ b/scripts/module.lds.S @@ -34,8 +34,8 @@ SECTIONS { =20 __patchable_function_entries : { *(__patchable_function_entries) } =20 - __klp_funcs 0: ALIGN(8) { KEEP(*(__klp_funcs)) } - __klp_objects 0: ALIGN(8) { KEEP(*(__klp_objects)) } + .init.klp_funcs 0 : ALIGN(8) { KEEP(*(.init.klp_funcs)) } + .init.klp_objects 0 : ALIGN(8) { KEEP(*(.init.klp_objects)) } =20 #ifdef CONFIG_ARCH_USES_CFI_TRAPS __kcfi_traps : { KEEP(*(.kcfi_traps)) } diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 3f7999317f4d..933868ee3beb 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4761,7 +4761,7 @@ static int validate_ibt(struct objtool_file *file) !strcmp(sec->name, "__bug_table") || !strcmp(sec->name, "__ex_table") || !strcmp(sec->name, "__jump_table") || - !strcmp(sec->name, "__klp_funcs") || + !strcmp(sec->name, ".init.klp_funcs") || !strcmp(sec->name, "__mcount_loc") || !strcmp(sec->name, ".llvm.call-graph-profile") || !strcmp(sec->name, ".llvm_bb_addr_map") || diff --git a/tools/objtool/include/objtool/klp.h b/tools/objtool/include/ob= jtool/klp.h index ad830a7ce55b..e32e5e8bc631 100644 --- a/tools/objtool/include/objtool/klp.h +++ b/tools/objtool/include/objtool/klp.h @@ -6,12 +6,12 @@ #define SHN_LIVEPATCH 0xff20 =20 /* - * __klp_objects and __klp_funcs are created by klp diff and used by the p= atch - * module init code to build the klp_patch, klp_object and klp_func structs - * needed by the livepatch API. + * .init.klp_objects and .init.klp_funcs are created by klp diff and used = by the + * patch module init code to build the klp_patch, klp_object and klp_func + * structs needed by the livepatch API. */ -#define KLP_OBJECTS_SEC "__klp_objects" -#define KLP_FUNCS_SEC "__klp_funcs" +#define KLP_OBJECTS_SEC ".init.klp_objects" +#define KLP_FUNCS_SEC ".init.klp_funcs" =20 /* * __klp_relocs is an intermediate section which are created by klp diff a= nd diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index 4d1f9e9977eb..fd64d5e3c3b6 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -1439,7 +1439,7 @@ static int clone_special_sections(struct elfs *e) } =20 /* - * Create __klp_objects and __klp_funcs sections which are intermediate + * Create .init.klp_objects and .init.klp_funcs sections which are interme= diate * sections provided as input to the patch module's init code for building= the * klp_patch, klp_object and klp_func structs for the livepatch API. */ --=20 2.52.0