From: Peter Zijlstra <peterz@infradead.org>
To: jpoimboe@redhat.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
joro@8bytes.org, boris.ostrovsky@oracle.com, jgross@suse.com,
x86@kernel.org, mbenes@suse.com
Subject: [RFC][PATCH 10/18] x86/xen: Make get_debugreg() noinstr
Date: Mon, 21 Jun 2021 13:12:43 +0200 [thread overview]
Message-ID: <20210621120121.210720354@infradead.org> (raw)
In-Reply-To: 20210621111233.344964031@infradead.org
vmlinux.o: warning: objtool: pv_ops[1]: xen_get_debugreg
vmlinux.o: warning: objtool: pv_ops[1]: native_get_debugreg
vmlinux.o: warning: objtool: exc_debug()+0x25: call to pv_ops[1]() leaves .noinstr.text section
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/include/asm/paravirt.h | 2 +-
arch/x86/include/asm/xen/hypercall.h | 2 +-
arch/x86/kernel/paravirt.c | 8 ++++++--
arch/x86/xen/enlighten_pv.c | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -113,7 +113,7 @@ static inline void __cpuid(unsigned int
/*
* These special macros can be used to get or set a debugging register
*/
-static inline unsigned long paravirt_get_debugreg(int reg)
+static __always_inline unsigned long paravirt_get_debugreg(int reg)
{
return PVOP_CALL1(unsigned long, cpu.get_debugreg, reg);
}
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -314,7 +314,7 @@ HYPERVISOR_set_debugreg(int reg, unsigne
return _hypercall2(int, set_debugreg, reg, value);
}
-static inline unsigned long
+static __always_inline unsigned long
HYPERVISOR_get_debugreg(int reg)
{
return _hypercall1(unsigned long, get_debugreg, reg);
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -248,13 +248,18 @@ static noinstr void pv_native_write_cr2(
native_write_cr2(val);
}
+static noinstr unsigned long pv_native_get_debugreg(int regno)
+{
+ return native_get_debugreg(regno);
+}
+
struct paravirt_patch_template pv_ops = {
/* Cpu ops. */
.cpu.io_delay = native_io_delay,
#ifdef CONFIG_PARAVIRT_XXL
.cpu.cpuid = native_cpuid,
- .cpu.get_debugreg = native_get_debugreg,
+ .cpu.get_debugreg = pv_native_get_debugreg,
.cpu.set_debugreg = native_set_debugreg,
.cpu.read_cr0 = native_read_cr0,
.cpu.write_cr0 = native_write_cr0,
@@ -382,7 +387,6 @@ struct paravirt_patch_template pv_ops =
#ifdef CONFIG_PARAVIRT_XXL
/* At this point, native_get/set_debugreg has real function entries */
-NOKPROBE_SYMBOL(native_get_debugreg);
NOKPROBE_SYMBOL(native_set_debugreg);
NOKPROBE_SYMBOL(native_load_idt);
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -317,7 +317,7 @@ static void xen_set_debugreg(int reg, un
HYPERVISOR_set_debugreg(reg, val);
}
-static unsigned long xen_get_debugreg(int reg)
+static noinstr unsigned long xen_get_debugreg(int reg)
{
return HYPERVISOR_get_debugreg(reg);
}
next prev parent reply other threads:[~2021-06-21 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: objtool/urgent] " tip-bot2 for Peter Zijlstra
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 ` Peter Zijlstra [this message]
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=20210621120121.210720354@infradead.org \
--to=peterz@infradead.org \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suse.com \
--cc=tglx@linutronix.de \
--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).