x86/xen: cleanup of xen private headers
Subsystems (3)
Juergen Gross
maintainercover x86/xen: cleanup of xen private headers
Cleanup the private header files in arch/x86/xen by merging them into one file and by removing unneeded stuff.
Juergen Gross (2):
x86/xen: make some functions static
x86/xen: eliminate some private header files
arch/x86/xen/apic.c | 2 - arch/x86/xen/debugfs.c | 2 +- arch/x86/xen/debugfs.h | 7 -- arch/x86/xen/enlighten.c | 2 - arch/x86/xen/enlighten_hvm.c | 2 - arch/x86/xen/enlighten_pv.c | 4 - arch/x86/xen/mmu.c | 3 +- arch/x86/xen/mmu.h | 28 ------- arch/x86/xen/mmu_hvm.c | 2 +- arch/x86/xen/mmu_pv.c | 15 ++-- arch/x86/xen/multicalls.c | 3 +- arch/x86/xen/multicalls.h | 69 ---------------- arch/x86/xen/p2m.c | 2 - arch/x86/xen/pmu.c | 1 - arch/x86/xen/pmu.h | 22 ------ arch/x86/xen/setup.c | 1 - arch/x86/xen/smp.c | 1 - arch/x86/xen/smp.h | 51 ------------ arch/x86/xen/smp_hvm.c | 2 - arch/x86/xen/smp_pv.c | 3 - arch/x86/xen/suspend.c | 2 - arch/x86/xen/xen-ops.h | 148 ++++++++++++++++++++++++++++++++++- include/xen/events.h | 2 + 23 files changed, 158 insertions(+), 216 deletions(-) delete mode 100644 arch/x86/xen/debugfs.h delete mode 100644 arch/x86/xen/mmu.h delete mode 100644 arch/x86/xen/multicalls.h delete mode 100644 arch/x86/xen/pmu.h delete mode 100644 arch/x86/xen/smp.h
Signature · 1 line
2.43.0
Juergen Gross
maintainerPATCH 1/2 x86/xen: make some functions static
Some functions and variables in arch/x86/xen are used locally only, make them static.
--- arch/x86/xen/mmu.h | 4 ---- arch/x86/xen/mmu_pv.c | 11 ++++++----- arch/x86/xen/xen-ops.h | 1 - 3 files changed, 6 insertions(+), 10 deletions(-)
arch/x86/xen/mmu.h +0 -4
@@ -17,10 +17,6 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);void set_pte_mfn (unsigned long vaddr,unsigned long pfn,pgprot_t flags); -pte_t xen_ptep_modify_prot_start (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); -void xen_ptep_modify_prot_commit (struct vm_area_struct *vma,unsigned long addr, -pte_t *ptep,pte_t pte); -unsigned long xen_read_cr2_direct (void );extern void xen_init_mmu_ops (void );
arch/x86/xen/mmu_pv.c +6 -5
@@ -128,7 +128,7 @@ static DEFINE_SPINLOCK(xen_reservation_lock);* looking at another vcpu's cr3 value, it should use this variable. */ DEFINE_PER_CPU(unsigned long, xen_cr3); /* cr3 stored as physaddr */ -DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */ +static DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */static phys_addr_t xen_pt_base, xen_pt_size__initdata ;
@@ -305,16 +305,17 @@ static void xen_set_pte(pte_t *ptep, pte_t pteval)__xen_set_pte (ptep, pteval); } -pte_t xen_ptep_modify_prot_start (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static pte_t xen_ptep_modify_prot_start (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {/* Just return the pte as-is. We preserve the bits on commit */ trace_xen_mmu_ptep_modify_prot_start (vma->vm_mm, addr, ptep, *ptep);return *ptep; } -void xen_ptep_modify_prot_commit (struct vm_area_struct *vma,unsigned long addr, -pte_t *ptep,pte_t pte) +static void xen_ptep_modify_prot_commit (struct vm_area_struct *vma, +unsigned long addr, +pte_t *ptep,pte_t pte) {struct mmu_update u;
arch/x86/xen/xen-ops.h +0 -1
@@ -23,7 +23,6 @@ void xen_copy_trap_info(struct trap_info *traps); DECLARE_PER_CPU_ALIGNED(struct vcpu_info, xen_vcpu_info); DECLARE_PER_CPU(unsigned long, xen_cr3); -DECLARE_PER_CPU(unsigned long, xen_current_cr3);extern struct start_info *xen_start_info;extern struct shared_info xen_dummy_shared_info;
Signature · 1 line
2.43.0
Juergen Gross
maintainerPATCH 2/2 x86/xen: eliminate some private header files
In reply to Juergen GrossUnder arch/x86/xen there is one large private header file xen-ops.h containing most of the Xen-private x86 related declarations, and then there are several small headers with a handful of declarations each.
Merge the small headers into xen-ops.h.
While doing that, move the declaration of xen_fifo_events from xen-ops.h into include/xen/events.h where it should have been from the beginning.
--- arch/x86/xen/apic.c | 2 - arch/x86/xen/debugfs.c | 2 +- arch/x86/xen/debugfs.h | 7 -- arch/x86/xen/enlighten.c | 2 - arch/x86/xen/enlighten_hvm.c | 2 - arch/x86/xen/enlighten_pv.c | 4 - arch/x86/xen/mmu.c | 3 +- arch/x86/xen/mmu.h | 24 ------ arch/x86/xen/mmu_hvm.c | 2 +- arch/x86/xen/mmu_pv.c | 4 +- arch/x86/xen/multicalls.c | 3 +- arch/x86/xen/multicalls.h | 69 ---------------- arch/x86/xen/p2m.c | 2 - arch/x86/xen/pmu.c | 1 - arch/x86/xen/pmu.h | 22 ------ arch/x86/xen/setup.c | 1 - arch/x86/xen/smp.c | 1 - arch/x86/xen/smp.h | 51 ------------ arch/x86/xen/smp_hvm.c | 2 - arch/x86/xen/smp_pv.c | 3 - arch/x86/xen/suspend.c | 2 - arch/x86/xen/xen-ops.h | 147 ++++++++++++++++++++++++++++++++++- include/xen/events.h | 2 + 23 files changed, 152 insertions(+), 206 deletions(-) delete mode 100644 arch/x86/xen/debugfs.h delete mode 100644 arch/x86/xen/mmu.h delete mode 100644 arch/x86/xen/multicalls.h delete mode 100644 arch/x86/xen/pmu.h delete mode 100644 arch/x86/xen/smp.h
arch/x86/xen/apic.c +0 -2
@@ -10,8 +10,6 @@#include <xen/xen.h> #include <xen/interface/physdev.h> #include "xen-ops.h" -#include "pmu.h" -#include "smp.h" static unsigned int xen_io_apic_read (unsigned apic,unsigned reg) {
arch/x86/xen/debugfs.c +1 -1
@@ -3,7 +3,7 @@#include <linux/debugfs.h> #include <linux/slab.h> -#include "debugfs.h" +#include "xen-ops.h" static struct dentry *d_xen_debug;
arch/x86/xen/debugfs.h deleted +0 -7
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _XEN_DEBUGFS_H -#define _XEN_DEBUGFS_H - -struct dentry *__init xen_init_debugfs (void ); - -#endif /* _XEN_DEBUGFS_H */
arch/x86/xen/enlighten.c +0 -2
@@ -20,8 +20,6 @@#include <asm/setup.h> #include "xen-ops.h" -#include "smp.h" -#include "pmu.h" EXPORT_SYMBOL_GPL (hypercall_page);
arch/x86/xen/enlighten_hvm.c +0 -2
@@ -28,8 +28,6 @@#include <asm/xen/page.h> #include "xen-ops.h" -#include "mmu.h" -#include "smp.h" static unsigned long shared_info_pfn;
arch/x86/xen/enlighten_pv.c +0 -4
@@ -85,10 +85,6 @@#endif #include "xen-ops.h" -#include "mmu.h" -#include "smp.h" -#include "multicalls.h" -#include "pmu.h" #include "../kernel/cpu/cpu.h" /* get_cpu_cap() */
arch/x86/xen/mmu.c +1 -2
@@ -5,8 +5,7 @@#include <asm/xen/hypercall.h> #include <xen/interface/memory.h> -#include "multicalls.h" -#include "mmu.h" +#include "xen-ops.h" unsigned long arbitrary_virt_to_mfn (void *vaddr) {
arch/x86/xen/mmu.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _XEN_MMU_H - -#include <linux/linkage.h> -#include <asm/page.h> - -enum pt_level { -PT_PGD , -PT_P4D , -PT_PUD , -PT_PMD , -PT_PTE -}; - - -bool __set_phys_to_machine (unsigned long pfn,unsigned long mfn); - -void set_pte_mfn (unsigned long vaddr,unsigned long pfn,pgprot_t flags); - -unsigned long xen_read_cr2_direct (void ); - -extern void xen_init_mmu_ops (void ); -extern void xen_hvm_init_mmu_ops (void ); -#endif /* _XEN_MMU_H */
arch/x86/xen/mmu_hvm.c +1 -1
@@ -5,7 +5,7 @@#include <xen/interface/xen.h> #include <xen/hvm.h> -#include "mmu.h" +#include "xen-ops.h" #ifdef CONFIG_PROC_VMCORE /*
arch/x86/xen/mmu_pv.c +1 -3
@@ -82,9 +82,7 @@#include <xen/hvc-console.h> #include <xen/swiotlb-xen.h> -#include "multicalls.h" -#include "mmu.h" -#include "debugfs.h" +#include "xen-ops.h" /* * Prototypes for functions called via PV_CALLEE_SAVE_REGS_THUNK() in order
arch/x86/xen/multicalls.c +1 -2
@@ -28,8 +28,7 @@#include <asm/xen/hypercall.h> -#include "multicalls.h" -#include "debugfs.h" +#include "xen-ops.h" #define MC_BATCH 32
arch/x86/xen/multicalls.h deleted +0 -69
69 lines not on this page · raw message
arch/x86/xen/p2m.c +0 -2
@@ -81,7 +81,6 @@#include <xen/balloon.h> #include <xen/grant_table.h> -#include "multicalls.h" #include "xen-ops.h" #define P2M_MID_PER_PAGE (PAGE_SIZE / sizeof(unsigned long *))
@@ -795,7 +794,6 @@ int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops, #ifdef CONFIG_XEN_DEBUG_FS #include <linux/debugfs.h> -#include "debugfs.h" static int p2m_dump_show(struct seq_file *m, void *v) { static const char * const type_name[] = {
arch/x86/xen/pmu.c +0 -1
@@ -10,7 +10,6 @@#include <xen/interface/xenpmu.h> #include "xen-ops.h" -#include "pmu.h" /* x86_pmu.handle_irq definition */ #include "../events/perf_event.h"
arch/x86/xen/pmu.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __XEN_PMU_H -#define __XEN_PMU_H - -#include <xen/interface/xenpmu.h> - -extern bool is_xen_pmu; - -irqreturn_t xen_pmu_irq_handler (int irq,void *dev_id); -#ifdef CONFIG_XEN_HAVE_VPMU -void xen_pmu_init (int cpu); -void xen_pmu_finish (int cpu); -#else -static inline void xen_pmu_init (int cpu) {} -static inline void xen_pmu_finish (int cpu) {} -#endif -bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err); -bool pmu_msr_write (unsigned int msr,uint32_t low,uint32_t high,int *err); -int pmu_apic_update (uint32_t reg); -unsigned long long xen_read_pmc (int counter); - -#endif /* __XEN_PMU_H */
arch/x86/xen/setup.c +0 -1
@@ -34,7 +34,6 @@#include <xen/features.h> #include <xen/hvc-console.h> #include "xen-ops.h" -#include "mmu.h" #define GB (x) ((uint64_t)(x) * 1024 * 1024 * 1024)
arch/x86/xen/smp.c +0 -1
@@ -9,7 +9,6 @@#include <xen/hvc-console.h> #include "xen-ops.h" -#include "smp.h" static DEFINE_PER_CPU(struct xen_common_irq, xen_resched_irq) = { .irq = -1 }; static DEFINE_PER_CPU(struct xen_common_irq, xen_callfunc_irq) = { .irq = -1 };
arch/x86/xen/smp.h deleted +0 -51
51 lines not on this page · raw message
arch/x86/xen/smp_hvm.c +0 -2
@@ -5,8 +5,6 @@#include <xen/events.h> #include "xen-ops.h" -#include "smp.h" -static void __init xen_hvm_smp_prepare_boot_cpu (void ) {
arch/x86/xen/smp_pv.c +0 -3
@@ -46,9 +46,6 @@#include <xen/hvc-console.h> #include "xen-ops.h" -#include "mmu.h" -#include "smp.h" -#include "pmu.h" cpumask_var_t xen_cpu_initialized_map;
arch/x86/xen/suspend.c +0 -2
@@ -15,8 +15,6 @@#include <asm/fixmap.h> #include "xen-ops.h" -#include "mmu.h" -#include "pmu.h" static DEFINE_PER_CPU(u64, spec_ctrl);
arch/x86/xen/xen-ops.h +145 -2
165 lines not on this page · raw message
include/xen/events.h +2 -0
@@ -144,4 +144,6 @@ static inline void xen_evtchn_close(evtchn_port_t port) BUG(); } +extern bool xen_fifo_events; +#endif /* _XEN_EVENTS_H */
Signature · 1 line
2.43.0
Quoted 31 lines · Juergen Gross
Cleanup the private header files in
arch/x86/xenby merging them into one file and by removing unneeded stuff.Juergen Gross (2):
x86/xen: make some functions static
x86/xen: eliminate some private header filesarch/x86/xen/apic.c | 2 - arch/x86/xen/debugfs.c | 2 +- arch/x86/xen/debugfs.h | 7 -- arch/x86/xen/enlighten.c | 2 - arch/x86/xen/enlighten_hvm.c | 2 - arch/x86/xen/enlighten_pv.c | 4 - arch/x86/xen/mmu.c | 3 +- arch/x86/xen/mmu.h | 28 ------- arch/x86/xen/mmu_hvm.c | 2 +- arch/x86/xen/mmu_pv.c | 15 ++-- arch/x86/xen/multicalls.c | 3 +- arch/x86/xen/multicalls.h | 69 ---------------- arch/x86/xen/p2m.c | 2 - arch/x86/xen/pmu.c | 1 - arch/x86/xen/pmu.h | 22 ------ arch/x86/xen/setup.c | 1 - arch/x86/xen/smp.c | 1 - arch/x86/xen/smp.h | 51 ------------ arch/x86/xen/smp_hvm.c | 2 - arch/x86/xen/smp_pv.c | 3 - arch/x86/xen/suspend.c | 2 - arch/x86/xen/xen-ops.h | 148 ++++++++++++++++++++++++++++++++++- include/xen/events.h | 2 + 23 files changed, 158 insertions(+), 216 deletions(-)
Quoted 5 lines
delete mode 100644
arch/x86/xen/debugfs.h
delete mode 100644arch/x86/xen/mmu.h
delete mode 100644arch/x86/xen/multicalls.h
delete mode 100644arch/x86/xen/pmu.h
delete mode 100644arch/x86/xen/smp.h