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.)
133 lines
3.7 KiB
Diff
133 lines
3.7 KiB
Diff
From 3f3c4e53bd362a76e3a097c1dac3c8975cb99926 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Marchand <jmarchan@redhat.com>
|
|
Date: Mon, 1 Jun 2026 15:22:13 +0200
|
|
Subject: [PATCH] scripts/sorttable: Make compare_extable() into two functions
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-180193
|
|
|
|
commit 7ffc0d0819f438779ed592e2e2e3576f43ce14f0
|
|
Author: Steven Rostedt <rostedt@goodmis.org>
|
|
Date: Sun Jan 5 11:22:16 2025 -0500
|
|
|
|
scripts/sorttable: Make compare_extable() into two functions
|
|
|
|
Instead of having the compare_extable() part of the sorttable.h header
|
|
where it get's defined twice, since it is a very simple function, just
|
|
define it twice in sorttable.c, and then it can use the proper read
|
|
functions for the word size and endianess and the Elf_Addr macro can be
|
|
removed from sorttable.h.
|
|
|
|
Also add a micro optimization. Instead of:
|
|
|
|
if (a < b)
|
|
return -1;
|
|
if (a > b)
|
|
return 1;
|
|
return 0;
|
|
|
|
That can be shorten to:
|
|
|
|
if (a < b)
|
|
return -1;
|
|
return a > b;
|
|
|
|
Cc: bpf <bpf@vger.kernel.org>
|
|
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
Cc: Andrew Morton <akpm@linux-foundation.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Masahiro Yamada <masahiroy@kernel.org>
|
|
Cc: Nathan Chancellor <nathan@kernel.org>
|
|
Cc: Nicolas Schier <nicolas@fjasle.eu>
|
|
Cc: Zheng Yejian <zhengyejian1@huawei.com>
|
|
Cc: Martin Kelly <martin.kelly@crowdstrike.com>
|
|
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
|
|
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
|
Link: https://lore.kernel.org/20250105162344.945299671@goodmis.org
|
|
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 4dcdbf7a5e26..3e2c17e91485 100644
|
|
--- a/scripts/sorttable.c
|
|
+++ b/scripts/sorttable.c
|
|
@@ -173,6 +173,26 @@ static inline unsigned int get_secindex(unsigned int shndx,
|
|
return r(&symtab_shndx_start[sym_offs]);
|
|
}
|
|
|
|
+static int compare_extable_32(const void *a, const void *b)
|
|
+{
|
|
+ Elf32_Addr av = r(a);
|
|
+ Elf32_Addr bv = r(b);
|
|
+
|
|
+ if (av < bv)
|
|
+ return -1;
|
|
+ return av > bv;
|
|
+}
|
|
+
|
|
+static int compare_extable_64(const void *a, const void *b)
|
|
+{
|
|
+ Elf64_Addr av = r8(a);
|
|
+ Elf64_Addr bv = r8(b);
|
|
+
|
|
+ if (av < bv)
|
|
+ return -1;
|
|
+ return av > bv;
|
|
+}
|
|
+
|
|
/* 32 bit and 64 bit are very similar */
|
|
#include "sorttable.h"
|
|
#define SORTTABLE_64
|
|
diff --git a/scripts/sorttable.h b/scripts/sorttable.h
|
|
index 58f7ab5f5644..36655ff16b39 100644
|
|
--- a/scripts/sorttable.h
|
|
+++ b/scripts/sorttable.h
|
|
@@ -23,7 +23,6 @@
|
|
#undef sort_mcount_loc
|
|
#undef elf_mcount_loc
|
|
#undef do_sort
|
|
-#undef Elf_Addr
|
|
#undef Elf_Ehdr
|
|
#undef Elf_Shdr
|
|
#undef Elf_Sym
|
|
@@ -38,7 +37,6 @@
|
|
# define sort_mcount_loc sort_mcount_loc_64
|
|
# define elf_mcount_loc elf_mcount_loc_64
|
|
# define do_sort do_sort_64
|
|
-# define Elf_Addr Elf64_Addr
|
|
# define Elf_Ehdr Elf64_Ehdr
|
|
# define Elf_Shdr Elf64_Shdr
|
|
# define Elf_Sym Elf64_Sym
|
|
@@ -52,7 +50,6 @@
|
|
# define sort_mcount_loc sort_mcount_loc_32
|
|
# define elf_mcount_loc elf_mcount_loc_32
|
|
# define do_sort do_sort_32
|
|
-# define Elf_Addr Elf32_Addr
|
|
# define Elf_Ehdr Elf32_Ehdr
|
|
# define Elf_Shdr Elf32_Shdr
|
|
# define Elf_Sym Elf32_Sym
|
|
@@ -160,17 +157,6 @@ static void *sort_orctable(void *arg)
|
|
}
|
|
#endif
|
|
|
|
-static int compare_extable(const void *a, const void *b)
|
|
-{
|
|
- Elf_Addr av = _r(a);
|
|
- Elf_Addr bv = _r(b);
|
|
-
|
|
- if (av < bv)
|
|
- return -1;
|
|
- if (av > bv)
|
|
- return 1;
|
|
- return 0;
|
|
-}
|
|
#ifdef MCOUNT_SORT_ENABLED
|
|
pthread_t mcount_sort_thread;
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|