From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org,
x86@kernel.org, virtualization@lists.linux-foundation.org
Cc: akataria@vmware.com, rusty@rustcorp.com.au,
boris.ostrovsky@oracle.com, hpa@zytor.com, tglx@linutronix.de,
mingo@redhat.com, peterz@infradead.org,
Juergen Gross <jgross@suse.com>
Subject: [PATCH v2 09/11] x86/paravirt: move the Xen-only pv_irq_ops under the PARAVIRT_XXL umbrella
Date: Mon, 13 Aug 2018 09:37:37 +0200 [thread overview]
Message-ID: <20180813073739.26108-10-jgross@suse.com> (raw)
In-Reply-To: <20180813073739.26108-1-jgross@suse.com>
Some of the paravirt ops defined in pv_irq_ops are for Xen PV guests
only. Define them only if CONFIG_PARAVIRT_XXL is set.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/include/asm/irqflags.h | 38 ++++++++++++++++++-----------------
arch/x86/include/asm/paravirt.h | 2 --
arch/x86/include/asm/paravirt_types.h | 2 ++
arch/x86/kernel/paravirt.c | 2 ++
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 03bb451e4e6b..205e43e55144 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -88,24 +88,6 @@ static inline notrace void arch_local_irq_enable(void)
}
/*
- * Used in the idle loop; sti takes one instruction cycle
- * to complete:
- */
-static inline __cpuidle void arch_safe_halt(void)
-{
- native_safe_halt();
-}
-
-/*
- * Used when interrupts are already enabled or to
- * shutdown the processor:
- */
-static inline __cpuidle void halt(void)
-{
- native_halt();
-}
-
-/*
* For spinlocks, etc:
*/
static inline notrace unsigned long arch_local_irq_save(void)
@@ -154,6 +136,26 @@ static inline notrace unsigned long arch_local_irq_save(void)
#define INTERRUPT_RETURN iret
#endif
+#else
+
+/*
+ * Used in the idle loop; sti takes one instruction cycle
+ * to complete:
+ */
+static inline __cpuidle void arch_safe_halt(void)
+{
+ native_safe_halt();
+}
+
+/*
+ * Used when interrupts are already enabled or to
+ * shutdown the processor:
+ */
+static inline __cpuidle void halt(void)
+{
+ native_halt();
+}
+
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_PARAVIRT_XXL */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 7ce17f361503..334bc2e7cd78 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -91,7 +91,6 @@ static inline void write_cr8(unsigned long x)
PVOP_VCALL1(cpu.write_cr8, x);
}
#endif
-#endif
static inline void arch_safe_halt(void)
{
@@ -103,7 +102,6 @@ static inline void halt(void)
PVOP_VCALL0(irq.halt);
}
-#ifdef CONFIG_PARAVIRT_XXL
static inline void wbinvd(void)
{
PVOP_VCALL0(cpu.wbinvd);
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index e652ec27d945..ae53ee36d8fb 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -197,8 +197,10 @@ struct pv_irq_ops {
struct paravirt_callee_save irq_disable;
struct paravirt_callee_save irq_enable;
+#ifdef CONFIG_PARAVIRT_XXL
void (*safe_halt)(void);
void (*halt)(void);
+#endif
} __no_randomize_layout;
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index e4899f3252f1..4dd12cc15daa 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -379,8 +379,10 @@ struct paravirt_patch_template pv_ops = {
.irq.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
.irq.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
.irq.irq_enable = __PV_IS_CALLEE_SAVE(native_irq_enable),
+#ifdef CONFIG_PARAVIRT_XXL
.irq.safe_halt = native_safe_halt,
.irq.halt = native_halt,
+#endif
/* Mmu ops. */
.mmu.read_cr2 = native_read_cr2,
--
2.13.7
next prev parent reply other threads:[~2018-08-13 7:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 7:37 [PATCH v2 00/11] x86/paravirt: several cleanups Juergen Gross
2018-08-13 7:37 ` [PATCH v2 01/11] x86/paravirt: make paravirt_patch_call() and paravirt_patch_jmp() static Juergen Gross
2018-08-24 14:00 ` Thomas Gleixner
2018-08-13 7:37 ` [PATCH v2 02/11] x86/paravirt: remove clobbers parameter from paravirt patch functions Juergen Gross
2018-08-24 14:01 ` Thomas Gleixner
2018-08-13 7:37 ` [PATCH v2 03/11] x86/paravirt: remove clobbers from struct paravirt_patch_site Juergen Gross
2018-08-24 14:03 ` Thomas Gleixner
2018-08-13 7:37 ` [PATCH v2 04/11] x86/paravirt: use a single ops structure Juergen Gross
2018-08-13 7:37 ` [PATCH v2 05/11] x86/paravirt: remove unused paravirt bits Juergen Gross
2018-08-13 7:37 ` [PATCH v2 06/11] x86/paravirt: introduce new config option PARAVIRT_XXL Juergen Gross
2018-08-13 7:37 ` [PATCH v2 07/11] x86/paravirt: move items in pv_info under PARAVIRT_XXL umbrella Juergen Gross
2018-08-13 7:37 ` [PATCH v2 08/11] x86/paravirt: move the Xen-only pv_cpu_ops under the " Juergen Gross
2018-08-13 7:37 ` Juergen Gross [this message]
2018-08-24 14:10 ` [PATCH v2 09/11] x86/paravirt: move the Xen-only pv_irq_ops " Peter Zijlstra
2018-08-24 14:13 ` Juergen Gross
2018-08-13 7:37 ` [PATCH v2 10/11] x86/paravirt: move the Xen-only pv_mmu_ops " Juergen Gross
2018-08-24 14:12 ` Peter Zijlstra
2018-08-24 14:15 ` Juergen Gross
2018-08-13 7:37 ` [PATCH v2 11/11] x86/paravirt: remove unneeded mmu related paravirt ops bits Juergen Gross
2018-08-24 13:52 ` [PATCH v2 00/11] x86/paravirt: several cleanups Juergen Gross
2018-08-24 14:13 ` Peter Zijlstra
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=20180813073739.26108-10-jgross@suse.com \
--to=jgross@suse.com \
--cc=akataria@vmware.com \
--cc=boris.ostrovsky@oracle.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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).