From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD42530EF96 for ; Wed, 17 Dec 2025 21:11:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766005863; cv=none; b=U1Wfpa5/ek/mD92bC+Du7GRNWuLrZOHhcQA0/GqAY34ZMNKf4XzUnGiSLBskxKbJC0dzW6oPB3sVM9X8d6GDFAnk3XrM4sbeduzpyiGXL4qd8Si0OOe2rjo0LYIayxu5jK24YIbpBZQiLX4wHD06nv6DuzS6XI5xp4CWbs4OiVU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766005863; c=relaxed/simple; bh=pyq3QMEEMhosO9wS5Nkt6KaN2iW2h5kFt8ikvMQuP8E=; h=Date:To:From:Subject:Message-Id; b=EsaLZ4ynovFx7pQiiJkJRvUG3bQTTcMNQagzEDjAtNtjtw6+rOdSHIrF2/LdMlwG57RCxG1SoWaavPzTiVykY9wfIUVhNWJiWQXjoJB0XfknSSSTg7KftRH0bdgwmdED6H1oFVwAB9DLC53pph32+GET0X2L3Gp3p00AtDU63I8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=iIOQQ6xI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="iIOQQ6xI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30024C4CEF5; Wed, 17 Dec 2025 21:11:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1766005863; bh=pyq3QMEEMhosO9wS5Nkt6KaN2iW2h5kFt8ikvMQuP8E=; h=Date:To:From:Subject:From; b=iIOQQ6xIXGyB84oblpPpie97yRlBsMRQI6wj+v9GIixeEBnzQMe3aBNrswmmtRnpD Mnm+STun4QuWf27tz2hkpitRNQcZxZmoX9V2EnstN14RR3yGHgrNHKsiwrlgixh/az N/nv1R4wydsvjV5AirX+7ss37SFRu4jukCEZ/nPc= Date: Wed, 17 Dec 2025 13:11:02 -0800 To: mm-commits@vger.kernel.org,samitolvanen@google.com,rostedt@goodmis.org,petr.pavlu@suse.com,mhiramat@kernel.org,mcgrof@kernel.org,mark.rutland@arm.com,kees@kernel.org,john.fastabend@gmail.com,daniel@iogearbox.net,da.gomez@samsung.com,atomlin@atomlin.com,ast@kernel.org,pmladek@suse.com,akpm@linux-foundation.org From: Andrew Morton Subject: + kallsyms-cleanup-code-for-appending-the-module-buildid.patch added to mm-nonmm-unstable branch Message-Id: <20251217211103.30024C4CEF5@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: kallsyms: cleanup code for appending the module buildid has been added to the -mm mm-nonmm-unstable branch. Its filename is kallsyms-cleanup-code-for-appending-the-module-buildid.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/kallsyms-cleanup-code-for-appending-the-module-buildid.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Petr Mladek Subject: kallsyms: cleanup code for appending the module buildid Date: Fri, 28 Nov 2025 14:59:17 +0100 Put the code for appending the optional "buildid" into a helper function, It makes __sprint_symbol() better readable. Also print a warning when the "modname" is set and the "buildid" isn't. It might catch a situation when some lookup function in kallsyms_lookup_buildid() does not handle the "buildid". Use pr_*_once() to avoid an infinite recursion when the function is called from printk(). The recursion is rather theoretical but better be on the safe side. Link: https://lkml.kernel.org/r/20251128135920.217303-5-pmladek@suse.com Signed-off-by: Petr Mladek Cc: Aaron Tomlin Cc: Alexei Starovoitov Cc: Daniel Borkman Cc: Daniel Gomez Cc: John Fastabend Cc: Kees Cook Cc: Luis Chamberalin Cc: Marc Rutland Cc: "Masami Hiramatsu (Google)" Cc: Petr Pavlu Cc: Sami Tolvanen Cc: Steven Rostedt (Google) Signed-off-by: Andrew Morton --- kernel/kallsyms.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) --- a/kernel/kallsyms.c~kallsyms-cleanup-code-for-appending-the-module-buildid +++ a/kernel/kallsyms.c @@ -435,6 +435,37 @@ int lookup_symbol_name(unsigned long add return lookup_module_symbol_name(addr, symname); } +#ifdef CONFIG_STACKTRACE_BUILD_ID + +static int append_buildid(char *buffer, const char *modname, + const unsigned char *buildid) +{ + if (!modname) + return 0; + + if (!buildid) { + pr_warn_once("Undefined buildid for the module %s\n", modname); + return 0; + } + + /* build ID should match length of sprintf */ +#ifdef CONFIG_MODULES + static_assert(sizeof(typeof_member(struct module, build_id)) == 20); +#endif + + return sprintf(buffer, " %20phN", buildid); +} + +#else /* CONFIG_STACKTRACE_BUILD_ID */ + +static int append_buildid(char *buffer, const char *modname, + const unsigned char *buildid) +{ + return 0; +} + +#endif /* CONFIG_STACKTRACE_BUILD_ID */ + /* Look up a kernel symbol and return it in a text buffer. */ static int __sprint_symbol(char *buffer, unsigned long address, int symbol_offset, int add_offset, int add_buildid) @@ -457,15 +488,8 @@ static int __sprint_symbol(char *buffer, if (modname) { len += sprintf(buffer + len, " [%s", modname); -#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) - if (add_buildid && buildid) { - /* build ID should match length of sprintf */ -#if IS_ENABLED(CONFIG_MODULES) - static_assert(sizeof(typeof_member(struct module, build_id)) == 20); -#endif - len += sprintf(buffer + len, " %20phN", buildid); - } -#endif + if (add_buildid) + len += append_buildid(buffer + len, modname, buildid); len += sprintf(buffer + len, "]"); } _ Patches currently in -mm which might be from pmladek@suse.com are kallsyms-clean-up-namebuf-initialization-in-kallsyms_lookup_buildid.patch kallsyms-clean-up-modname-and-modbuildid-initialization-in-kallsyms_lookup_buildid.patch module-add-helper-function-for-reading-module_buildid.patch kallsyms-cleanup-code-for-appending-the-module-buildid.patch kallsyms-bpf-rename-__bpf_address_lookup-to-bpf_address_lookup.patch kallsyms-ftrace-set-module-buildid-in-ftrace_mod_address_lookup.patch kallsyms-prevent-module-removal-when-printing-module-name-and-buildid.patch