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

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

Pull xen updates from Juergen Gross:

 - two small cleanup patches

 - avoid error messages when initializing MCA banks in a Xen dom0

 - a small series for converting the Xen gntdev driver to use
   pin_user_pages*() instead of get_user_pages*()

 - intermediate fix for running as a Xen guest on Arm with KPTI enabled
   (the final solution will need new Xen functionality)

* tag 'for-linus-5.10b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: Fix typo in xen_pagetable_p2m_free()
  x86/xen: disable Firmware First mode for correctable memory errors
  xen/arm: do not setup the runstate info page if kpti is enabled
  xen: remove redundant initialization of variable ret
  xen/gntdev.c: Convert get_user_pages*() to pin_user_pages*()
  xen/gntdev.c: Mark pages as dirty
parents 4907a43d 32118f97

arch/arm/include/asm/xen/page.h

+5 −0
Original line number Diff line number Diff line 
#include <xen/arm/page.h>



static inline bool xen_kernel_unmapped_at_usr(void)

{

	return false;

}

arch/arm/xen/enlighten.c

+4 −2
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int xen_starting_cpu(unsigned int cpu) 
	BUG_ON(err);

	per_cpu(xen_vcpu, cpu) = vcpup;



	if (!xen_kernel_unmapped_at_usr())

		xen_setup_runstate_info(cpu);



after_register_vcpu_info:
@@ -387,6 +388,7 @@ static int __init xen_guest_init(void) 
		return -EINVAL;

	}



	if (!xen_kernel_unmapped_at_usr())

		xen_time_setup_guest();



	if (xen_initial_domain())

arch/arm64/include/asm/xen/page.h

+6 −0
Original line number Diff line number Diff line 
#include <xen/arm/page.h>

#include <asm/mmu.h>



static inline bool xen_kernel_unmapped_at_usr(void)

{

	return arm64_kernel_unmapped_at_el0();

}

arch/x86/xen/enlighten_pv.c

+9 −0
Original line number Diff line number Diff line
@@ -1370,6 +1370,15 @@ asmlinkage __visible void __init xen_start_kernel(void) 
		x86_init.mpparse.get_smp_config = x86_init_uint_noop;



		xen_boot_params_init_edd();



#ifdef CONFIG_ACPI

		/*

		 * Disable selecting "Firmware First mode" for correctable

		 * memory errors, as this is the duty of the hypervisor to

		 * decide.

		 */

		acpi_disable_cmcff = 1;

#endif

	}



	if (!boot_params.screen_info.orig_video_isVGA)

arch/x86/xen/mmu_pv.c

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ static void __init xen_pagetable_p2m_free(void) 
	 * We could be in __ka space.

	 * We roundup to the PMD, which means that if anybody at this stage is

	 * using the __ka address of xen_start_info or

	 * xen_start_info->shared_info they are in going to crash. Fortunatly

	 * xen_start_info->shared_info they are in going to crash. Fortunately

	 * we have already revectored in xen_setup_kernel_pagetable.

	 */

	size = roundup(size, PMD_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE