From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "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: Make set_debugreg() noinstr
Date: Wed, 15 Sep 2021 15:49:21 -0000 [thread overview]
Message-ID: <163172096181.25758.8930025934141730355.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210624095148.687755639@infradead.org>
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 9da62cacc7ed17e2186f82273762fe850078c8c3
Gitweb: https://git.kernel.org/tip/9da62cacc7ed17e2186f82273762fe850078c8c3
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Thu, 24 Jun 2021 11:41:16 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 15 Sep 2021 15:51:49 +02:00
x86/xen: Make set_debugreg() noinstr
vmlinux.o: warning: objtool: pv_ops[2]: xen_set_debugreg
vmlinux.o: warning: objtool: pv_ops[2]: native_set_debugreg
vmlinux.o: warning: objtool: exc_debug()+0x3b: call to pv_ops[2]() leaves .noinstr.text section
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20210624095148.687755639@infradead.org
---
arch/x86/include/asm/paravirt.h | 2 +-
arch/x86/include/asm/xen/hypercall.h | 2 +-
arch/x86/kernel/paravirt.c | 9 ++++++---
arch/x86/xen/enlighten_pv.c | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index f48465c..34da790 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -118,7 +118,7 @@ static __always_inline unsigned long paravirt_get_debugreg(int reg)
return PVOP_CALL1(unsigned long, cpu.get_debugreg, reg);
}
#define get_debugreg(var, reg) var = paravirt_get_debugreg(reg)
-static inline void set_debugreg(unsigned long val, int reg)
+static __always_inline void set_debugreg(unsigned long val, int reg)
{
PVOP_VCALL2(cpu.set_debugreg, reg, val);
}
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index af92202..990b8aa 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -308,7 +308,7 @@ HYPERVISOR_platform_op(struct xen_platform_op *op)
return _hypercall1(int, platform_op, op);
}
-static inline int
+static __always_inline int
HYPERVISOR_set_debugreg(int reg, unsigned long value)
{
return _hypercall2(int, set_debugreg, reg, value);
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 9188ae1..4d98791 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -253,6 +253,11 @@ static noinstr unsigned long pv_native_get_debugreg(int regno)
return native_get_debugreg(regno);
}
+static noinstr void pv_native_set_debugreg(int regno, unsigned long val)
+{
+ native_set_debugreg(regno, val);
+}
+
struct paravirt_patch_template pv_ops = {
/* Cpu ops. */
.cpu.io_delay = native_io_delay,
@@ -260,7 +265,7 @@ struct paravirt_patch_template pv_ops = {
#ifdef CONFIG_PARAVIRT_XXL
.cpu.cpuid = native_cpuid,
.cpu.get_debugreg = pv_native_get_debugreg,
- .cpu.set_debugreg = native_set_debugreg,
+ .cpu.set_debugreg = pv_native_set_debugreg,
.cpu.read_cr0 = native_read_cr0,
.cpu.write_cr0 = native_write_cr0,
.cpu.write_cr4 = native_write_cr4,
@@ -386,8 +391,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_set_debugreg);
NOKPROBE_SYMBOL(native_load_idt);
void (*paravirt_iret)(void) = native_iret;
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 273e1fa..2b1a8ba 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -311,7 +311,7 @@ static void __init xen_init_capabilities(void)
}
}
-static void xen_set_debugreg(int reg, unsigned long val)
+static noinstr void xen_set_debugreg(int reg, unsigned long val)
{
HYPERVISOR_set_debugreg(reg, val);
}
next prev parent reply other threads:[~2021-09-15 15:49 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: objtool/core] x86/xen: Move hypercall_page to top of the file tip-bot2 for Josh Poimboeuf
2021-09-15 15:49 ` [tip: objtool/core] x86/xen: Mark cpu_bringup_and_idle() as dead_end_function 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-bot2 for Peter Zijlstra [this message]
2021-09-17 12:58 ` [tip: objtool/core] " 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=163172096181.25758.8930025934141730355.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jgross@suse.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).