From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: objtool/urgent] x86: Always inline task_size_max()
Date: Tue, 22 Jun 2021 12:03:37 -0000 [thread overview]
Message-ID: <162436341797.395.13837570842333490587.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210621120120.682468274@infradead.org>
The following commit has been merged into the objtool/urgent branch of tip:
Commit-ID: 1f008d46f1243899d27fd034ab5c41985bd16cee
Gitweb: https://git.kernel.org/tip/1f008d46f1243899d27fd034ab5c41985bd16cee
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 21 Jun 2021 13:12:37 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 22 Jun 2021 13:56:43 +02:00
x86: Always inline task_size_max()
Fix:
vmlinux.o: warning: objtool: handle_bug()+0x10: call to task_size_max() leaves .noinstr.text section
When #UD isn't a BUG, we shouldn't violate noinstr (we'll still
probably die, but that's another story).
Fixes: 025768a966a3 ("x86/cpu: Use alternative to generate the TASK_SIZE_MAX constant")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210621120120.682468274@infradead.org
---
arch/x86/include/asm/page_64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index ca840fe..4bde0dc 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -75,7 +75,7 @@ void copy_page(void *to, void *from);
*
* With page table isolation enabled, we map the LDT in ... [stay tuned]
*/
-static inline unsigned long task_size_max(void)
+static __always_inline unsigned long task_size_max(void)
{
unsigned long ret;
next prev parent reply other threads:[~2021-06-22 12:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 11:12 [RFC][PATCH 00/18] objtool/x86: noinstr vs PARAVIRT Peter Zijlstra
2021-06-21 11:12 ` [PATCH 01/18] x86/entry: Fix noinstr fail in __do_fast_syscall_32() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 02/18] x86/xen: Fix noinstr fail in xen_pv_evtchn_do_upcall() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 03/18] x86/xen: Fix noinstr fail in exc_xen_unknown_trap() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 04/18] x86: Always inline task_size_max() Peter Zijlstra
2021-06-22 12:03 ` tip-bot2 for Peter Zijlstra [this message]
2021-06-21 11:12 ` [PATCH 05/18] locking/lockdep: Improve noinstr vs errors Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 06/18] x86/paravirt: Mark arch_local_irq_*() __always_inline Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 07/18] x86/paravirt: Use PVOP_* for paravirt calls Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 08/18] x86/xen: Make read_cr2() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 09/18] x86/xen: Make write_cr2() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 10/18] x86/xen: Make get_debugreg() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 11/18] x86/xen: Make set_debugreg() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 12/18] x86/xen: Make save_fl() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 13/18] x86/xen: Make hypercall_page noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 14/18] x86/xen: Make irq_enable() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 15/18] x86/xen: Make irq_disable() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 16/18] x86/xen: Mark xen_force_evtchn_callback() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 17/18] x86/xen: Rework the xen_{cpu,irq,mmu}_ops[] arrays Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 18/18] objtool: Support pv_opsindirect calls for noinstr Peter Zijlstra
2021-06-21 13:17 ` [RFC][PATCH 00/18] objtool/x86: noinstr vs PARAVIRT Ingo Molnar
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=162436341797.395.13837570842333490587.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@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).