Commit fdc0269e authored by Juergen Gross's avatar Juergen Gross Committed by Thomas Gleixner
Browse files

x86/paravirt: Move the Xen-only pv_mmu_ops under the PARAVIRT_XXL umbrella 



Most of the paravirt ops defined in pv_mmu_ops are for Xen PV guests
only. Define them only if CONFIG_PARAVIRT_XXL is set.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: xen-devel@lists.xenproject.org
Cc: virtualization@lists.linux-foundation.org
Cc: akataria@vmware.com
Cc: rusty@rustcorp.com.au
Cc: boris.ostrovsky@oracle.com
Cc: hpa@zytor.com
Link: https://lkml.kernel.org/r/20180828074026.820-15-jgross@suse.com
parent 6da63eb2

arch/x86/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte); 
void native_set_fixmap(enum fixed_addresses idx,

		       phys_addr_t phys, pgprot_t flags);



#ifndef CONFIG_PARAVIRT

#ifndef CONFIG_PARAVIRT_XXL

static inline void __set_fixmap(enum fixed_addresses idx,

				phys_addr_t phys, pgprot_t flags)

{

arch/x86/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


extern atomic64_t last_mm_ctx_id;



#ifndef CONFIG_PARAVIRT

#ifndef CONFIG_PARAVIRT_XXL

static inline void paravirt_activate_mm(struct mm_struct *prev,

					struct mm_struct *next)

{

}

#endif	/* !CONFIG_PARAVIRT */

#endif	/* !CONFIG_PARAVIRT_XXL */



#ifdef CONFIG_PERF_EVENTS

arch/x86/include/asm/paravirt.h

+63 −62
Original line number Diff line number Diff line
@@ -17,6 +17,62 @@ 
#include <linux/cpumask.h>

#include <asm/frame.h>



static inline unsigned long long paravirt_sched_clock(void)

{

	return PVOP_CALL0(unsigned long long, time.sched_clock);

}



struct static_key;

extern struct static_key paravirt_steal_enabled;

extern struct static_key paravirt_steal_rq_enabled;



static inline u64 paravirt_steal_clock(int cpu)

{

	return PVOP_CALL1(u64, time.steal_clock, cpu);

}



/* The paravirtualized I/O functions */

static inline void slow_down_io(void)

{

	pv_ops.cpu.io_delay();

#ifdef REALLY_SLOW_IO

	pv_ops.cpu.io_delay();

	pv_ops.cpu.io_delay();

	pv_ops.cpu.io_delay();

#endif

}



static inline void __flush_tlb(void)

{

	PVOP_VCALL0(mmu.flush_tlb_user);

}



static inline void __flush_tlb_global(void)

{

	PVOP_VCALL0(mmu.flush_tlb_kernel);

}



static inline void __flush_tlb_one_user(unsigned long addr)

{

	PVOP_VCALL1(mmu.flush_tlb_one_user, addr);

}



static inline void flush_tlb_others(const struct cpumask *cpumask,

				    const struct flush_tlb_info *info)

{

	PVOP_VCALL2(mmu.flush_tlb_others, cpumask, info);

}



static inline void paravirt_tlb_remove_table(struct mmu_gather *tlb, void *table)

{

	PVOP_VCALL2(mmu.tlb_remove_table, tlb, table);

}



static inline void paravirt_arch_exit_mmap(struct mm_struct *mm)

{

	PVOP_VCALL1(mmu.exit_mmap, mm);

}



#ifdef CONFIG_PARAVIRT_XXL

static inline void load_sp0(unsigned long sp0)

{
@@ -52,7 +108,6 @@ static inline void write_cr0(unsigned long x) 
{

	PVOP_VCALL1(cpu.write_cr0, x);

}

#endif



static inline unsigned long read_cr2(void)

{
@@ -74,7 +129,6 @@ static inline void write_cr3(unsigned long x) 
	PVOP_VCALL1(mmu.write_cr3, x);

}



#ifdef CONFIG_PARAVIRT_XXL

static inline void __write_cr4(unsigned long x)

{

	PVOP_VCALL1(cpu.write_cr4, x);
@@ -172,23 +226,7 @@ static inline int rdmsrl_safe(unsigned msr, unsigned long long *p) 
	*p = paravirt_read_msr_safe(msr, &err);

	return err;

}

#endif



static inline unsigned long long paravirt_sched_clock(void)

{

	return PVOP_CALL0(unsigned long long, time.sched_clock);

}



struct static_key;

extern struct static_key paravirt_steal_enabled;

extern struct static_key paravirt_steal_rq_enabled;



static inline u64 paravirt_steal_clock(int cpu)

{

	return PVOP_CALL1(u64, time.steal_clock, cpu);

}



#ifdef CONFIG_PARAVIRT_XXL

static inline unsigned long long paravirt_read_pmc(int counter)

{

	return PVOP_CALL1(u64, cpu.read_pmc, counter);
@@ -267,18 +305,6 @@ static inline void set_iopl_mask(unsigned mask) 
{

	PVOP_VCALL1(cpu.set_iopl_mask, mask);

}

#endif



/* The paravirtualized I/O functions */

static inline void slow_down_io(void)

{

	pv_ops.cpu.io_delay();

#ifdef REALLY_SLOW_IO

	pv_ops.cpu.io_delay();

	pv_ops.cpu.io_delay();

	pv_ops.cpu.io_delay();

#endif

}



static inline void paravirt_activate_mm(struct mm_struct *prev,

					struct mm_struct *next)
@@ -292,35 +318,6 @@ static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm, 
	PVOP_VCALL2(mmu.dup_mmap, oldmm, mm);

}



static inline void paravirt_arch_exit_mmap(struct mm_struct *mm)

{

	PVOP_VCALL1(mmu.exit_mmap, mm);

}



static inline void __flush_tlb(void)

{

	PVOP_VCALL0(mmu.flush_tlb_user);

}

static inline void __flush_tlb_global(void)

{

	PVOP_VCALL0(mmu.flush_tlb_kernel);

}

static inline void __flush_tlb_one_user(unsigned long addr)

{

	PVOP_VCALL1(mmu.flush_tlb_one_user, addr);

}



static inline void flush_tlb_others(const struct cpumask *cpumask,

				    const struct flush_tlb_info *info)

{

	PVOP_VCALL2(mmu.flush_tlb_others, cpumask, info);

}



static inline void paravirt_tlb_remove_table(struct mmu_gather *tlb, void *table)

{

	PVOP_VCALL2(mmu.tlb_remove_table, tlb, table);

}



static inline int paravirt_pgd_alloc(struct mm_struct *mm)

{

	return PVOP_CALL1(int, mmu.pgd_alloc, mm);
@@ -623,7 +620,6 @@ static inline void pmd_clear(pmd_t *pmdp) 
}

#endif	/* CONFIG_X86_PAE */



#ifdef CONFIG_PARAVIRT_XXL

#define  __HAVE_ARCH_START_CONTEXT_SWITCH

static inline void arch_start_context_switch(struct task_struct *prev)

{
@@ -634,7 +630,6 @@ static inline void arch_end_context_switch(struct task_struct *next) 
{

	PVOP_VCALL1(cpu.end_context_switch, next);

}

#endif



#define  __HAVE_ARCH_ENTER_LAZY_MMU_MODE

static inline void arch_enter_lazy_mmu_mode(void)
@@ -657,6 +652,7 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, 
{

	pv_ops.mmu.set_fixmap(idx, phys, flags);

}

#endif



#if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
@@ -948,15 +944,20 @@ extern void default_banner(void); 
#endif /* __ASSEMBLY__ */

#else  /* CONFIG_PARAVIRT */

# define default_banner x86_init_noop

#endif /* !CONFIG_PARAVIRT */



#ifndef __ASSEMBLY__

#ifndef CONFIG_PARAVIRT_XXL

static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm,

					  struct mm_struct *mm)

{

}

#endif



#ifndef CONFIG_PARAVIRT

static inline void paravirt_arch_exit_mmap(struct mm_struct *mm)

{

}

#endif

#endif /* __ASSEMBLY__ */

#endif /* !CONFIG_PARAVIRT */

#endif /* _ASM_X86_PARAVIRT_H */

arch/x86/include/asm/paravirt_types.h

+17 −16
Original line number Diff line number Diff line
@@ -91,13 +91,14 @@ struct pv_init_ops { 
			  unsigned long addr, unsigned len);

} __no_randomize_layout;





#ifdef CONFIG_PARAVIRT_XXL

struct pv_lazy_ops {

	/* Set deferred update mode, used for batching operations. */

	void (*enter)(void);

	void (*leave)(void);

	void (*flush)(void);

} __no_randomize_layout;

#endif



struct pv_time_ops {

	unsigned long long (*sched_clock)(void);
@@ -205,31 +206,30 @@ struct pv_irq_ops { 
} __no_randomize_layout;



struct pv_mmu_ops {

	/* TLB operations */

	void (*flush_tlb_user)(void);

	void (*flush_tlb_kernel)(void);

	void (*flush_tlb_one_user)(unsigned long addr);

	void (*flush_tlb_others)(const struct cpumask *cpus,

				 const struct flush_tlb_info *info);



	void (*tlb_remove_table)(struct mmu_gather *tlb, void *table);



	/* Hook for intercepting the destruction of an mm_struct. */

	void (*exit_mmap)(struct mm_struct *mm);



#ifdef CONFIG_PARAVIRT_XXL

	unsigned long (*read_cr2)(void);

	void (*write_cr2)(unsigned long);



	unsigned long (*read_cr3)(void);

	void (*write_cr3)(unsigned long);



	/*

	 * Hooks for intercepting the creation/use/destruction of an

	 * mm_struct.

	 */

	/* Hooks for intercepting the creation/use of an mm_struct. */

	void (*activate_mm)(struct mm_struct *prev,

			    struct mm_struct *next);

	void (*dup_mmap)(struct mm_struct *oldmm,

			 struct mm_struct *mm);

	void (*exit_mmap)(struct mm_struct *mm);





	/* TLB operations */

	void (*flush_tlb_user)(void);

	void (*flush_tlb_kernel)(void);

	void (*flush_tlb_one_user)(unsigned long addr);

	void (*flush_tlb_others)(const struct cpumask *cpus,

				 const struct flush_tlb_info *info);



	void (*tlb_remove_table)(struct mmu_gather *tlb, void *table);



	/* Hooks for allocating and freeing a pagetable top-level */

	int  (*pgd_alloc)(struct mm_struct *mm);
@@ -304,6 +304,7 @@ struct pv_mmu_ops { 
	   an mfn.  We can tell which is which from the index. */

	void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,

			   phys_addr_t phys, pgprot_t flags);

#endif

} __no_randomize_layout;



struct arch_spinlock;

arch/x86/include/asm/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


static inline int  __paravirt_pgd_alloc(struct mm_struct *mm) { return 0; }



#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT_XXL

#include <asm/paravirt.h>

#else

#define paravirt_pgd_alloc(mm)	__paravirt_pgd_alloc(mm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE