From: "tip-bot2 for Shile Zhang" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Shile Zhang <shile.zhang@linux.alibaba.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kbuild@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: core/objtool] x86/unwind/orc: Remove boot-time ORC unwind tables sorting
Date: Fri, 13 Dec 2019 10:03:37 -0000 [thread overview]
Message-ID: <157623141704.30329.9522840249744393883.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191204004633.88660-8-shile.zhang@linux.alibaba.com>
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: f14bf6a350dfd6613dbf91be5b423bc7eab690da
Gitweb: https://git.kernel.org/tip/f14bf6a350dfd6613dbf91be5b423bc7eab690da
Author: Shile Zhang <shile.zhang@linux.alibaba.com>
AuthorDate: Wed, 04 Dec 2019 08:46:33 +08:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
x86/unwind/orc: Remove boot-time ORC unwind tables sorting
Now that the orc_unwind and orc_unwind_ip tables are sorted at build time,
remove the boot time sorting pass.
No change in functionality.
[ mingo: Rewrote the changelog and code comments. ]
Signed-off-by: Shile Zhang <shile.zhang@linux.alibaba.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kbuild@vger.kernel.org
Link: https://lkml.kernel.org/r/20191204004633.88660-8-shile.zhang@linux.alibaba.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/unwind_orc.c | 8 +++++---
scripts/link-vmlinux.sh | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c
index 332ae65..abdf891 100644
--- a/arch/x86/kernel/unwind_orc.c
+++ b/arch/x86/kernel/unwind_orc.c
@@ -273,9 +273,11 @@ void __init unwind_init(void)
return;
}
- /* Sort the .orc_unwind and .orc_unwind_ip tables: */
- sort(__start_orc_unwind_ip, num_entries, sizeof(int), orc_sort_cmp,
- orc_sort_swap);
+ /*
+ * Note, the orc_unwind and orc_unwind_ip tables were already
+ * sorted at build time via the 'sorttable' tool.
+ * It's ready for binary search straight away, no need to sort it.
+ */
/* Initialize the fast lookup table: */
lookup_num_blocks = orc_lookup_end - orc_lookup;
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index a81aa76..c287ad9 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -306,7 +306,10 @@ vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
info SORTTAB vmlinux
- sorttable vmlinux
+ if ! sorttable vmlinux; then
+ echo >&2 Failed to sort kernel tables
+ exit 1
+ fi
fi
info SYSMAP System.map
next prev parent reply other threads:[~2019-12-13 10:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 0:46 [RFC PATCH v6 0/7] Speed booting by sorting ORC unwind tables at build time Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 1/7] scripts/sortextable: Rewrite error/success handling Shile Zhang
2019-12-13 10:03 ` [tip: core/objtool] " tip-bot2 for Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 2/7] scripts/sortextable: kernel coding style formating Shile Zhang
2019-12-13 10:03 ` [tip: core/objtool] scripts/sortextable: Clean up the code to meet the kernel coding style better tip-bot2 for Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 3/7] scripts/sortextable: Remove dead code Shile Zhang
2019-12-13 10:03 ` [tip: core/objtool] " tip-bot2 for Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 4/7] scripts/sortextable: refactor do_func() function Shile Zhang
2019-12-13 10:03 ` [tip: core/objtool] scripts/sortextable: Refactor the " tip-bot2 for Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 5/7] scripts/sorttable: rename sortextable to sorttable Shile Zhang
2019-12-13 10:03 ` [tip: core/objtool] scripts/sorttable: Rename 'sortextable' to 'sorttable' tip-bot2 for Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 6/7] scripts/sorttable: Add ORC unwind tables sort concurrently Shile Zhang
2019-12-13 10:03 ` [tip: core/objtool] scripts/sorttable: Implement build-time ORC unwind table sorting tip-bot2 for Shile Zhang
2019-12-04 0:46 ` [RFC PATCH v6 7/7] x86/unwind/orc: remove run-time ORC unwind tables sort Shile Zhang
2019-12-13 10:03 ` tip-bot2 for Shile Zhang [this message]
2019-12-13 6:03 ` [RFC PATCH v6 0/7] Speed booting by sorting ORC unwind tables at build time Shile Zhang
2019-12-13 10:02 ` Ingo Molnar
2019-12-16 3:07 ` Shile Zhang
2020-01-07 7:36 ` [tip: core/objtool] x86/unwind/orc: Fix !CONFIG_MODULES build warning tip-bot2 for Shile Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157623141704.30329.9522840249744393883.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jpoimboe@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=shile.zhang@linux.alibaba.com \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).