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

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

Merge tag 'for-linus-4.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from David Vrabel:
 "Xen features and fixes for 4.5-rc0:

   - Stolen ticks and PV wallclock support for arm/arm64

   - Add grant copy ioctl to gntdev device"

* tag 'for-linus-4.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/gntdev: add ioctl for grant copy
  x86/xen: don't reset vcpu_info on a cancelled suspend
  xen/gntdev: constify mmu_notifier_ops structures
  xen/grant-table: constify gnttab_ops structure
  xen/time: use READ_ONCE
  xen/x86: convert remaining timespec to timespec64 in xen_pvclock_gtod_notify
  xen/x86: support XENPF_settime64
  xen/arm: set the system time in Xen via the XENPF_settime64 hypercall
  xen/arm: introduce xen_read_wallclock
  arm: extend pvclock_wall_clock with sec_hi
  xen: introduce XENPF_settime64
  xen/arm: introduce HYPERVISOR_platform_op on arm and arm64
  xen: rename dom0_op to platform_op
  xen/arm: account for stolen ticks
  arm64: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops
  arm: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops
  missing include asm/paravirt.h in cputime.c
  xen: move xen_setup_runstate_info and get_runstate_snapshot to drivers/xen/time.c
parents 75777c18 a4cdb556

arch/arm/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -1824,6 +1824,25 @@ config SWIOTLB 
config IOMMU_HELPER

	def_bool SWIOTLB



config PARAVIRT

	bool "Enable paravirtualization code"

	help

	  This changes the kernel so it can modify itself when it is run

	  under a hypervisor, potentially improving performance significantly

	  over full virtualization.



config PARAVIRT_TIME_ACCOUNTING

	bool "Paravirtual steal time accounting"

	select PARAVIRT

	default n

	help

	  Select this option to enable fine granularity task steal time

	  accounting. Time spent executing other tasks in parallel with

	  the current vCPU is discounted from the vCPU power. To account for

	  that, there can be a small performance impact.



	  If in doubt, say N here.



config XEN_DOM0

	def_bool y

	depends on XEN
@@ -1837,6 +1856,7 @@ config XEN 
	select ARCH_DMA_ADDR_T_64BIT

	select ARM_PSCI

	select SWIOTLB_XEN

	select PARAVIRT

	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

arch/arm/include/asm/paravirt.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_PARAVIRT_H

#define _ASM_ARM_PARAVIRT_H



#ifdef CONFIG_PARAVIRT

struct static_key;

extern struct static_key paravirt_steal_enabled;

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;



static inline u64 paravirt_steal_clock(int cpu)

{

	return pv_time_ops.steal_clock(cpu);

}

#endif



#endif

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

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <xen/interface/xen.h>

#include <xen/interface/sched.h>

#include <xen/interface/platform.h>



long privcmd_call(unsigned call, unsigned long a1,

		unsigned long a2, unsigned long a3,
@@ -49,6 +50,12 @@ int HYPERVISOR_memory_op(unsigned int cmd, void *arg); 
int HYPERVISOR_physdev_op(int cmd, void *arg);

int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);

int HYPERVISOR_tmem_op(void *arg);

int HYPERVISOR_platform_op_raw(void *arg);

static inline int HYPERVISOR_platform_op(struct xen_platform_op *op)

{

	op->interface_version = XENPF_INTERFACE_VERSION;

	return HYPERVISOR_platform_op_raw(op);

}

int HYPERVISOR_multicall(struct multicall_entry *calls, uint32_t nr);



static inline int

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

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
		(hnd).p = val;				\

	} while (0)



#define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op



#ifndef __ASSEMBLY__

/* Explicitly size integers that represent pfns in the interface with

 * Xen so that we can have one ABI that works for 32 and 64 bit guests.
@@ -76,6 +78,7 @@ struct pvclock_wall_clock { 
	u32   version;

	u32   sec;

	u32   nsec;

	u32   sec_hi;

} __attribute__((__packed__));

#endif

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ obj-$(CONFIG_EFI) += efi.o 
ifneq ($(CONFIG_ARCH_EBSA110),y)

  obj-y		+= io.o

endif

obj-$(CONFIG_PARAVIRT)	+= paravirt.o



head-y			:= head$(MMUEXT).o

obj-$(CONFIG_DEBUG_LL)	+= debug.o