Andrew Lukoshko
0eab958d1f
Add the RHEL 211.21.1..211.22.1 backports (1288-1351) from centos-stream-10 and upstream stable, on top of 211.20.1. Bump pkgrelease and specrelease to 211.22.1. (The redhat/ automotive rebuild-changelog tooling change is omitted: it patches redhat/scripts not present in this build base and does not affect the kernel.)
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From 3436470d40a0906b91d65287931fc22524334dba Mon Sep 17 00:00:00 2001
|
|
From: Jerome Marchand <jmarchan@redhat.com>
|
|
Date: Tue, 2 Jun 2026 15:56:34 +0200
|
|
Subject: [PATCH] scripts/sorttable: Fix endianness handling in build-time
|
|
mcount sort
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-180193
|
|
|
|
commit 023f124a64174c47e18340ded7e2a39b96eb9523
|
|
Author: Vasily Gorbik <gor@linux.ibm.com>
|
|
Date: Wed Apr 2 03:15:35 2025 +0200
|
|
|
|
scripts/sorttable: Fix endianness handling in build-time mcount sort
|
|
|
|
Kernel cross-compilation with BUILDTIME_MCOUNT_SORT produces zeroed
|
|
mcount values if the build-host endianness does not match the ELF
|
|
file endianness.
|
|
|
|
The mcount values array is converted from ELF file
|
|
endianness to build-host endianness during initialization in
|
|
fill_relocs()/fill_addrs(). Avoid extra conversion of these values during
|
|
weak-function zeroing; otherwise, they do not match nm-parsed addresses
|
|
and all mcount values are zeroed out.
|
|
|
|
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
|
Cc: Catalin Marinas <catalin.marinas@arm.com>
|
|
Cc: Nathan Chancellor <nathan@kernel.org>
|
|
Cc: Heiko Carstens <hca@linux.ibm.com>
|
|
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
|
|
Link: https://lore.kernel.org/patch.git-dca31444b0f1.your-ad-here.call-01743554658-ext-8692@work.hours
|
|
Fixes: ef378c3b8233 ("scripts/sorttable: Zero out weak functions in mcount_loc table")
|
|
Reported-by: Ilya Leoshkevich <iii@linux.ibm.com>
|
|
Reported-by: Ihor Solodrai <ihor.solodrai@linux.dev>
|
|
Closes: https://lore.kernel.org/all/your-ad-here.call-01743522822-ext-4975@work.hours/
|
|
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
|
|
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
|
|
|
|
Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
|
|
|
|
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
|
|
index 7b4b3714b1af..deed676bfe38 100644
|
|
--- a/scripts/sorttable.c
|
|
+++ b/scripts/sorttable.c
|
|
@@ -857,7 +857,7 @@ static void *sort_mcount_loc(void *arg)
|
|
for (void *ptr = vals; ptr < vals + size; ptr += long_size) {
|
|
uint64_t key;
|
|
|
|
- key = long_size == 4 ? r((uint32_t *)ptr) : r8((uint64_t *)ptr);
|
|
+ key = long_size == 4 ? *(uint32_t *)ptr : *(uint64_t *)ptr;
|
|
if (!find_func(key)) {
|
|
if (long_size == 4)
|
|
*(uint32_t *)ptr = 0;
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|