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

Merge tag 'for-linus-5.16b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:

 - a series to speed up the boot of Xen PV guests

 - some cleanups in Xen related code

 - replacement of license texts with the appropriate SPDX headers and
   fixing of wrong SPDX headers in Xen header files

 - a small series making paravirtualized interrupt masking much simpler
   and at the same time removing complaints of objtool

 - a fix for Xen ballooning hogging workqueues for too long

 - enablement of the Xen pciback driver for Arm

 - some further small fixes/enhancements

* tag 'for-linus-5.16b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (22 commits)
  xen/balloon: fix unused-variable warning
  xen/balloon: rename alloc/free_xenballooned_pages
  xen/balloon: add late_initcall_sync() for initial ballooning done
  x86/xen: remove 32-bit awareness from startup_xen
  xen: remove highmem remnants
  xen: allow pv-only hypercalls only with CONFIG_XEN_PV
  x86/xen: remove 32-bit pv leftovers
  xen-pciback: allow compiling on other archs than x86
  x86/xen: switch initial pvops IRQ functions to dummy ones
  x86/xen: remove xen_have_vcpu_info_placement flag
  x86/pvh: add prototype for xen_pvh_init()
  xen: Fix implicit type conversion
  xen: fix wrong SPDX headers of Xen related headers
  xen/pvcalls-back: Remove redundant 'flush_workqueue()' calls
  x86/xen: Remove redundant irq_enter/exit() invocations
  xen-pciback: Fix return in pm_ctrl_init()
  xen/x86: restrict PV Dom0 identity mapping
  xen/x86: there's no highmem anymore in PV mode
  xen/x86: adjust handling of the L3 user vsyscall special page table
  xen/x86: adjust xen_set_fixmap()
  ...
parents 4287af35 501586ea

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -6379,6 +6379,13 @@ 
			improve timer resolution at the expense of processing

			more timer interrupts.



	xen.balloon_boot_timeout= [XEN]

			The time (in seconds) to wait before giving up to boot

			in case initial ballooning fails to free enough memory.

			Applies only when running as HVM or PVH guest and

			started with less memory configured than allowed at

			max. Default is 180.



	xen.event_eoi_delay=	[XEN]

			How long to delay EOI handling in case of event

			storms (jiffies). Default is 10.

arch/arm/xen/enlighten.c

+0 −1
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op); 
EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op_raw);

EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);

EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist);

arch/arm/xen/hypercall.S

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ HYPERCALL2(hvm_op); 
HYPERCALL2(memory_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);

HYPERCALL1(platform_op_raw);

HYPERCALL2(multicall);

HYPERCALL2(vm_assist);

arch/arm64/xen/hypercall.S

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ HYPERCALL2(hvm_op); 
HYPERCALL2(memory_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);

HYPERCALL1(platform_op_raw);

HYPERCALL2(multicall);

HYPERCALL2(vm_assist);

arch/x86/include/asm/paravirt_types.h

+2 −0
Original line number Diff line number Diff line
@@ -577,7 +577,9 @@ void paravirt_leave_lazy_mmu(void); 
void paravirt_flush_lazy_mmu(void);



void _paravirt_nop(void);

void paravirt_BUG(void);

u64 _paravirt_ident_64(u64);

unsigned long paravirt_ret0(void);



#define paravirt_nop	((void *)_paravirt_nop)