Commit f88af722 authored Sep 24, 2020 by Stefano Stabellini Committed by Boris Ostrovsky Oct 04, 2020

xen/arm: do not setup the runstate info page if kpti is enabled



The VCPUOP_register_runstate_memory_area hypercall takes a virtual
address of a buffer as a parameter. The semantics of the hypercall are
such that the virtual address should always be valid.

When KPTI is enabled and we are running userspace code, the virtual
address is not valid, thus, Linux is violating the semantics of
VCPUOP_register_runstate_memory_area.

Do not call VCPUOP_register_runstate_memory_area when KPTI is enabled.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
CC: Bertrand Marquis <Bertrand.Marquis@arm.com>
CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
Link: https://lore.kernel.org/r/20200924234955.15455-1-sstabellini@kernel.org


Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

parent bba91dd6

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();
		}

Admin message