Move the pv_info related definitions and the declarations of the global
paravirt function primitives into a new header file paravirt-base.h.
This enables to use that header instead of paravirt_types.h in
ptrace.h.
Additionally it is in preparation of reducing include hell with
paravirt enabled.
Signed-off-by: Juergen Gross <jgr...@suse.com>
---
V2:
- new patch
---
arch/x86/include/asm/paravirt-base.h | 29 +++++++++++++++++++++++++++
arch/x86/include/asm/paravirt.h | 4 +++-
arch/x86/include/asm/paravirt_types.h | 23 +--------------------
arch/x86/include/asm/ptrace.h | 2 +-
4 files changed, 34 insertions(+), 24 deletions(-)
create mode 100644 arch/x86/include/asm/paravirt-base.h
diff --git a/arch/x86/include/asm/paravirt-base.h
b/arch/x86/include/asm/paravirt-base.h
new file mode 100644
index 000000000000..3827ea20de18
--- /dev/null
+++ b/arch/x86/include/asm/paravirt-base.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _ASM_X86_PARAVIRT_BASE_H
+#define _ASM_X86_PARAVIRT_BASE_H
+
+/*
+ * Wrapper type for pointers to code which uses the non-standard
+ * calling convention. See PV_CALL_SAVE_REGS_THUNK below.
+ */
+struct paravirt_callee_save {
+ void *func;
+};
+
+struct pv_info {
+#ifdef CONFIG_PARAVIRT_XXL
+ u16 extra_user_64bit_cs; /* __USER_CS if none */
+#endif
+ const char *name;
+};
+
+void default_banner(void);
+extern struct pv_info pv_info;
+unsigned long paravirt_ret0(void);
+#ifdef CONFIG_PARAVIRT_XXL
+u64 _paravirt_ident_64(u64);
+#endif
+#define paravirt_nop ((void *)nop_func)
+
+#endif /* _ASM_X86_PARAVIRT_BASE_H */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index b69e75a5c872..62399f5d037d 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -4,6 +4,9 @@
/* Various instructions on x86 need to be replaced for
* para-virtualization: those hooks are defined here. */
+#ifndef __ASSEMBLER__
+#include <asm/paravirt-base.h>
+#endif
#include <asm/paravirt_types.h>
#ifdef CONFIG_PARAVIRT
@@ -601,7 +604,6 @@ static __always_inline unsigned long
arch_local_irq_save(void)
#undef PVOP_VCALL4
#undef PVOP_CALL4
-extern void default_banner(void);
void native_pv_lock_init(void) __init;
#else /* __ASSEMBLER__ */
diff --git a/arch/x86/include/asm/paravirt_types.h
b/arch/x86/include/asm/paravirt_types.h
index 7acff40cc159..148d157e2a4a 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -7,6 +7,7 @@
#ifndef __ASSEMBLER__
#include <linux/types.h>
+#include <asm/paravirt-base.h>
#include <asm/desc_defs.h>
#include <asm/pgtable_types.h>
#include <asm/nospec-branch.h>
@@ -18,23 +19,6 @@ struct cpumask;
struct flush_tlb_info;
struct vm_area_struct;
-/*
- * Wrapper type for pointers to code which uses the non-standard
- * calling convention. See PV_CALL_SAVE_REGS_THUNK below.
- */
-struct paravirt_callee_save {
- void *func;
-};
-
-/* general info */
-struct pv_info {
-#ifdef CONFIG_PARAVIRT_XXL
- u16 extra_user_64bit_cs; /* __USER_CS if none */
-#endif
-
- const char *name;
-};
-
#ifdef CONFIG_PARAVIRT_XXL
struct pv_lazy_ops {
/* Set deferred update mode, used for batching operations. */
@@ -226,7 +210,6 @@ struct paravirt_patch_template {
struct pv_lock_ops lock;
} __no_randomize_layout;
-extern struct pv_info pv_info;
extern struct paravirt_patch_template pv_ops;
#define paravirt_ptr(op) [paravirt_opptr] "m" (pv_ops.op)
@@ -497,17 +480,13 @@ extern struct paravirt_patch_template pv_ops;
__PVOP_VCALL(op, PVOP_CALL_ARG1(arg1), PVOP_CALL_ARG2(arg2), \
PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4))
-unsigned long paravirt_ret0(void);
#ifdef CONFIG_PARAVIRT_XXL
-u64 _paravirt_ident_64(u64);
unsigned long pv_native_save_fl(void);
void pv_native_irq_disable(void);
void pv_native_irq_enable(void);
unsigned long pv_native_read_cr2(void);
#endif
-#define paravirt_nop ((void *)nop_func)
-
#endif /* __ASSEMBLER__ */
#define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 50f75467f73d..fe2dab7d74e3 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -172,7 +172,7 @@ struct pt_regs {
#endif /* !__i386__ */
#ifdef CONFIG_PARAVIRT
-#include <asm/paravirt_types.h>
+#include <asm/paravirt-base.h>
#endif
#include <asm/proto.h>
--
2.51.0
