From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@redhat.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Juergen Gross <jgross@suse.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: objtool/core] x86/xen: Move hypercall_page to top of the file
Date: Wed, 15 Sep 2021 15:49:35 -0000 [thread overview]
Message-ID: <163172097511.25758.14115197643418967000.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210820193107.omvshmsqbpxufzkc@treble>
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: b7b205c3a0bc2b51f83cb793178ccbc12addf275
Gitweb: https://git.kernel.org/tip/b7b205c3a0bc2b51f83cb793178ccbc12addf275
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Fri, 20 Aug 2021 12:31:07 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 15 Sep 2021 15:51:44 +02:00
x86/xen: Move hypercall_page to top of the file
Because hypercall_page is page-aligned, the assembler inexplicably adds
an unreachable jump from after the end of the previous code to the
beginning of hypercall_page.
That confuses objtool, understandably. It also creates significant text
fragmentation. As a result, much of the object file is wasted text
(nops).
Move hypercall_page to the beginning of the file to both prevent the
text fragmentation and avoid the dead jump instruction.
$ size /tmp/head_64.before.o /tmp/head_64.after.o
text data bss dec hex filename
10924 307252 4096 322272 4eae0 /tmp/head_64.before.o
6823 307252 4096 318171 4dadb /tmp/head_64.after.o
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lkml.kernel.org/r/20210820193107.omvshmsqbpxufzkc@treble
---
arch/x86/xen/xen-head.S | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index cb6538a..488944d 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -20,6 +20,23 @@
#include <xen/interface/xen-mca.h>
#include <asm/xen/interface.h>
+.pushsection .text
+ .balign PAGE_SIZE
+SYM_CODE_START(hypercall_page)
+ .rept (PAGE_SIZE / 32)
+ UNWIND_HINT_FUNC
+ .skip 31, 0x90
+ ret
+ .endr
+
+#define HYPERCALL(n) \
+ .equ xen_hypercall_##n, hypercall_page + __HYPERVISOR_##n * 32; \
+ .type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32
+#include <asm/xen-hypercalls.h>
+#undef HYPERCALL
+SYM_CODE_END(hypercall_page)
+.popsection
+
#ifdef CONFIG_XEN_PV
__INIT
SYM_CODE_START(startup_xen)
@@ -64,23 +81,6 @@ SYM_CODE_END(asm_cpu_bringup_and_idle)
#endif
#endif
-.pushsection .text
- .balign PAGE_SIZE
-SYM_CODE_START(hypercall_page)
- .rept (PAGE_SIZE / 32)
- UNWIND_HINT_FUNC
- .skip 31, 0x90
- ret
- .endr
-
-#define HYPERCALL(n) \
- .equ xen_hypercall_##n, hypercall_page + __HYPERVISOR_##n * 32; \
- .type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32
-#include <asm/xen-hypercalls.h>
-#undef HYPERCALL
-SYM_CODE_END(hypercall_page)
-.popsection
-
ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux")
ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6")
ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0")
next prev parent reply other threads:[~2021-09-15 15:50 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 9:40 [PATCH v2 00/24] objtool/x86: noinstr vs PARAVIRT Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 01/24] x86/xen: Mark cpu_bringup_and_idle() as dead_end_function Peter Zijlstra
2021-06-24 10:49 ` Juergen Gross
2021-06-30 11:47 ` Miroslav Benes
2021-08-20 19:22 ` Josh Poimboeuf
2021-08-20 19:31 ` Josh Poimboeuf
2021-08-23 8:40 ` Juergen Gross
2021-08-30 5:55 ` Juergen Gross
2021-08-30 7:48 ` Peter Zijlstra
2021-08-30 7:56 ` Juergen Gross
2021-09-15 15:49 ` tip-bot2 for Josh Poimboeuf [this message]
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 02/24] objtool: Introduce CFI hash Peter Zijlstra
2021-06-30 12:45 ` Miroslav Benes
2021-07-01 8:35 ` Peter Zijlstra
2021-07-01 8:53 ` Miroslav Benes
2021-08-20 22:27 ` Josh Poimboeuf
2021-08-25 10:13 ` Peter Zijlstra
2021-08-25 12:49 ` Peter Zijlstra
2021-08-25 10:15 ` Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 03/24] objtool: Handle __sanitize_cov*() tail calls Peter Zijlstra
2021-06-25 11:05 ` Marco Elver
2021-06-28 9:07 ` Peter Zijlstra
2021-06-25 13:38 ` Steven Rostedt
2021-06-26 8:18 ` Peter Zijlstra
2021-06-29 1:07 ` Steven Rostedt
2021-08-20 23:17 ` Josh Poimboeuf
2021-08-25 10:19 ` Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 04/24] x86/kvm: Always inline sev_*guest() Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 05/24] x86/kvm: Always inline vmload() / vmsave() Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 06/24] x86: Always inline context_tracking_guest_enter() Peter Zijlstra
2021-08-20 23:22 ` Josh Poimboeuf
2021-08-20 23:34 ` Josh Poimboeuf
2021-08-25 12:16 ` Peter Zijlstra
[not found] ` <YSZxtBHNJzoUbqdE@ravnborg.org>
2021-08-26 4:10 ` Josh Poimboeuf
2021-08-25 13:38 ` Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 07/24] x86/kvm: Always inline to_svm() Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 08/24] x86/kvm: Always inline evmcs_write64() Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 09/24] x86: Always inline ip_within_syscall_gap() Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 10/24] x86/sev: Fix noinstr for vc_ghcb_invalidate() Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 11/24] locking/lockdep: Avoid RCU-induced noinstr fail Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 12/24] x86/paravirt: Mark arch_local_irq_*() __always_inline Peter Zijlstra
2021-06-24 10:51 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 13/24] x86/paravirt: Use PVOP_* for paravirt calls Peter Zijlstra
2021-06-24 10:52 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 14/24] x86/xen: Make read_cr2() noinstr Peter Zijlstra
2021-06-24 10:55 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 15/24] x86/xen: Make write_cr2() noinstr Peter Zijlstra
2021-06-24 10:56 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 16/24] x86/xen: Make get_debugreg() noinstr Peter Zijlstra
2021-06-24 10:57 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 17/24] x86/xen: Make set_debugreg() noinstr Peter Zijlstra
2021-06-24 10:59 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 18/24] x86/xen: Make save_fl() noinstr Peter Zijlstra
2021-06-24 11:07 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 19/24] x86/xen: Make hypercall_page noinstr Peter Zijlstra
2021-06-24 11:08 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 20/24] x86/xen: Make irq_enable() noinstr Peter Zijlstra
2021-06-24 11:09 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 21/24] x86/xen: Make irq_disable() noinstr Peter Zijlstra
2021-06-24 11:10 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 22/24] x86/xen: Mark xen_force_evtchn_callback() noinstr Peter Zijlstra
2021-06-24 11:11 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 23/24] x86/xen: Rework the xen_{cpu,irq,mmu}_ops[] arrays Peter Zijlstra
2021-06-24 12:12 ` Juergen Gross
2021-09-15 15:49 ` [tip: objtool/core] x86/xen: Rework the xen_{cpu,irq,mmu}_opsarrays tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 9:41 ` [PATCH v2 24/24] objtool: Support pv_opsindirect calls for noinstr Peter Zijlstra
2021-09-15 15:49 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-09-17 12:58 ` tip-bot2 for Peter Zijlstra
2021-06-24 13:05 ` [PATCH v2 00/24] objtool/x86: noinstr vs PARAVIRT Steven Rostedt
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=163172097511.25758.14115197643418967000.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jgross@suse.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/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).