Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f682a792 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 paravirt updates from Ingo Molnar:
 "Two main changes:

   - Remove no longer used parts of the paravirt infrastructure and put
     large quantities of paravirt ops under a new config option
     PARAVIRT_XXL=y, which is selected by XEN_PV only. (Joergen Gross)

   - Enable PV spinlocks on Hyperv (Yi Sun)"

* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hyperv: Enable PV qspinlock for Hyper-V
  x86/hyperv: Add GUEST_IDLE_MSR support
  x86/paravirt: Clean up native_patch()
  x86/paravirt: Prevent redefinition of SAVE_FLAGS macro
  x86/xen: Make xen_reservation_lock static
  x86/paravirt: Remove unneeded mmu related paravirt ops bits
  x86/paravirt: Move the Xen-only pv_mmu_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move the pv_irq_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move the Xen-only pv_cpu_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move items in pv_info under PARAVIRT_XXL umbrella
  x86/paravirt: Introduce new config option PARAVIRT_XXL
  x86/paravirt: Remove unused paravirt bits
  x86/paravirt: Use a single ops structure
  x86/paravirt: Remove clobbers from struct paravirt_patch_site
  x86/paravirt: Remove clobbers parameter from paravirt patch functions
  x86/paravirt: Make paravirt_patch_call() and paravirt_patch_jmp() static
  x86/xen: Add SPDX identifier in arch/x86/xen files
  x86/xen: Link platform-pci-unplug.o only if CONFIG_XEN_PVHVM
  x86/xen: Move pv specific parts of arch/x86/xen/mmu.c to mmu_pv.c
  x86/xen: Move pv irq related functions under CONFIG_XEN_PV umbrella
parents 99792e0c 3a025de6

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,11 @@ 
	hvc_iucv_allow=	[S390]	Comma-separated list of z/VM user IDs.

				If specified, z/VM IUCV HVC accepts connections

				from listed z/VM user IDs only.



	hv_nopvspin	[X86,HYPER_V] Disables the paravirt spinlock optimizations

				      which allow the hypervisor to 'idle' the

				      guest on lock contention.



	keep_bootcon	[KNL]

			Do not unregister boot console at start. This is only

			useful for debugging when something happens in the window

arch/arm/include/asm/paravirt.h

+7 −2
Original line number Diff line number Diff line
@@ -10,11 +10,16 @@ extern struct static_key paravirt_steal_rq_enabled; 
struct pv_time_ops {

	unsigned long long (*steal_clock)(int cpu);

};

extern struct pv_time_ops pv_time_ops;



struct paravirt_patch_template {

	struct pv_time_ops time;

};



extern struct paravirt_patch_template pv_ops;



static inline u64 paravirt_steal_clock(int cpu)

{

	return pv_time_ops.steal_clock(cpu);

	return pv_ops.time.steal_clock(cpu);

}

#endif

arch/arm/kernel/paravirt.c

+2 −2
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
struct static_key paravirt_steal_enabled;

struct static_key paravirt_steal_rq_enabled;



struct pv_time_ops pv_time_ops;

EXPORT_SYMBOL_GPL(pv_time_ops);
 
struct paravirt_patch_template pv_ops;

EXPORT_SYMBOL_GPL(pv_ops);

arch/arm/xen/enlighten.c

+0 −34
Original line number Diff line number Diff line
@@ -62,29 +62,6 @@ static __read_mostly unsigned int xen_events_irq; 
uint32_t xen_start_flags;

EXPORT_SYMBOL(xen_start_flags);



int xen_remap_domain_gfn_array(struct vm_area_struct *vma,

			       unsigned long addr,

			       xen_pfn_t *gfn, int nr,

			       int *err_ptr, pgprot_t prot,

			       unsigned domid,

			       struct page **pages)

{

	return xen_xlate_remap_gfn_array(vma, addr, gfn, nr, err_ptr,

					 prot, domid, pages);

}

EXPORT_SYMBOL_GPL(xen_remap_domain_gfn_array);



/* Not used by XENFEAT_auto_translated guests. */

int xen_remap_domain_gfn_range(struct vm_area_struct *vma,

                              unsigned long addr,

                              xen_pfn_t gfn, int nr,

                              pgprot_t prot, unsigned domid,

                              struct page **pages)

{

	return -ENOSYS;

}

EXPORT_SYMBOL_GPL(xen_remap_domain_gfn_range);



int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,

			       int nr, struct page **pages)

{
@@ -92,17 +69,6 @@ int xen_unmap_domain_gfn_range(struct vm_area_struct *vma, 
}

EXPORT_SYMBOL_GPL(xen_unmap_domain_gfn_range);



/* Not used by XENFEAT_auto_translated guests. */

int xen_remap_domain_mfn_array(struct vm_area_struct *vma,

			       unsigned long addr,

			       xen_pfn_t *mfn, int nr,

			       int *err_ptr, pgprot_t prot,

			       unsigned int domid, struct page **pages)

{

	return -ENOSYS;

}

EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_array);



static void xen_read_wallclock(struct timespec64 *ts)

{

	u32 version;

arch/arm64/include/asm/paravirt.h

+7 −2
Original line number Diff line number Diff line
@@ -10,11 +10,16 @@ extern struct static_key paravirt_steal_rq_enabled; 
struct pv_time_ops {

	unsigned long long (*steal_clock)(int cpu);

};

extern struct pv_time_ops pv_time_ops;



struct paravirt_patch_template {

	struct pv_time_ops time;

};



extern struct paravirt_patch_template pv_ops;



static inline u64 paravirt_steal_clock(int cpu)

{

	return pv_time_ops.steal_clock(cpu);

	return pv_ops.time.steal_clock(cpu);

}

#endif