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

Commit 051089a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from Juergen Gross:
 "Xen features and fixes for v4.15-rc1

  Apart from several small fixes it contains the following features:

   - a series by Joao Martins to add vdso support of the pv clock
     interface

   - a series by Juergen Gross to add support for Xen pv guests to be
     able to run on 5 level paging hosts

   - a series by Stefano Stabellini adding the Xen pvcalls frontend
     driver using a paravirtualized socket interface"

* tag 'for-linus-4.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (34 commits)
  xen/pvcalls: fix potential endless loop in pvcalls-front.c
  xen/pvcalls: Add MODULE_LICENSE()
  MAINTAINERS: xen, kvm: track pvclock-abi.h changes
  x86/xen/time: setup vcpu 0 time info page
  x86/xen/time: set pvclock flags on xen_time_init()
  x86/pvclock: add setter for pvclock_pvti_cpu0_va
  ptp_kvm: probe for kvm guest availability
  xen/privcmd: remove unused variable pageidx
  xen: select grant interface version
  xen: update arch/x86/include/asm/xen/cpuid.h
  xen: add grant interface version dependent constants to gnttab_ops
  xen: limit grant v2 interface to the v1 functionality
  xen: re-introduce support for grant v2 interface
  xen: support priv-mapping in an HVM tools domain
  xen/pvcalls: remove redundant check for irq >= 0
  xen/pvcalls: fix unsigned less than zero error check
  xen/time: Return -ENODEV from xen_get_wallclock()
  xen/pvcalls-front: mark expected switch fall-through
  xen: xenbus_probe_frontend: mark expected switch fall-throughs
  xen/time: do not decrease steal time after live migration on xen
  ...
parents 974aa563 646d944c

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7650,6 +7650,7 @@ S: Supported 
F:	arch/x86/kvm/

F:	arch/x86/include/uapi/asm/kvm*

F:	arch/x86/include/asm/kvm*

F:	arch/x86/include/asm/pvclock-abi.h

F:	arch/x86/kernel/kvm.c

F:	arch/x86/kernel/kvmclock.c
@@ -14838,6 +14839,7 @@ F: arch/x86/xen/ 
F:	drivers/*/xen-*front.c

F:	drivers/xen/

F:	arch/x86/include/asm/xen/

F:	arch/x86/include/asm/pvclock-abi.h

F:	include/xen/

F:	include/uapi/xen/

F:	Documentation/ABI/stable/sysfs-hypervisor-xen

arch/arm/xen/grant-table.c

+8 −1
Original line number Diff line number Diff line
@@ -45,7 +45,14 @@ void arch_gnttab_unmap(void *shared, unsigned long nr_gframes) 
	return;

}



int arch_gnttab_init(unsigned long nr_shared)

int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,

			   unsigned long max_nr_gframes,

			   grant_status_t **__shared)

{

	return -ENOSYS;

}



int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)

{

	return 0;

}

arch/x86/entry/vdso/vma.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int vvar_fault(const struct vm_special_mapping *sm, 
				    __pa_symbol(&__vvar_page) >> PAGE_SHIFT);

	} else if (sym_offset == image->sym_pvclock_page) {

		struct pvclock_vsyscall_time_info *pvti =

			pvclock_pvti_cpu0_va();

			pvclock_get_pvti_cpu0_va();

		if (pvti && vclock_was_used(VCLOCK_PVCLOCK)) {

			ret = vm_insert_pfn_prot(

				vma,

arch/x86/include/asm/pvclock.h

+10 −9
Original line number Diff line number Diff line
@@ -5,15 +5,6 @@ 
#include <linux/clocksource.h>

#include <asm/pvclock-abi.h>



#ifdef CONFIG_KVM_GUEST

extern struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void);

#else

static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)

{

	return NULL;

}

#endif



/* some helper functions for xen and kvm pv clock sources */

u64 pvclock_clocksource_read(struct pvclock_vcpu_time_info *src);

u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src);
@@ -102,4 +93,14 @@ struct pvclock_vsyscall_time_info { 


#define PVTI_SIZE sizeof(struct pvclock_vsyscall_time_info)



#ifdef CONFIG_PARAVIRT_CLOCK

void pvclock_set_pvti_cpu0_va(struct pvclock_vsyscall_time_info *pvti);

struct pvclock_vsyscall_time_info *pvclock_get_pvti_cpu0_va(void);

#else

static inline struct pvclock_vsyscall_time_info *pvclock_get_pvti_cpu0_va(void)

{

	return NULL;

}

#endif



#endif /* _ASM_X86_PVCLOCK_H */

arch/x86/include/asm/xen/cpuid.h

+32 −10
Original line number Diff line number Diff line
@@ -73,22 +73,44 @@ 
#define _XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD 0

#define XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD  (1u<<0)



/*

 * Leaf 4 (0x40000x03)

 * Sub-leaf 0: EAX: bit 0: emulated tsc

 *                  bit 1: host tsc is known to be reliable

 *                  bit 2: RDTSCP instruction available

 *             EBX: tsc_mode: 0=default (emulate if necessary), 1=emulate,

 *                            2=no emulation, 3=no emulation + TSC_AUX support

 *             ECX: guest tsc frequency in kHz

 *             EDX: guest tsc incarnation (migration count)

 * Sub-leaf 1: EAX: tsc offset low part

 *             EBX: tsc offset high part

 *             ECX: multiplicator for tsc->ns conversion

 *             EDX: shift amount for tsc->ns conversion

 * Sub-leaf 2: EAX: host tsc frequency in kHz

 */



/*

 * Leaf 5 (0x40000x04)

 * HVM-specific features

 * EAX: Features

 * EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT flag)

 * Sub-leaf 0: EAX: Features

 * Sub-leaf 0: EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT flag)

 */



/* Virtualized APIC registers */

#define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0)

/* Virtualized x2APIC accesses */

#define XEN_HVM_CPUID_X2APIC_VIRT      (1u << 1)

#define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */

#define XEN_HVM_CPUID_X2APIC_VIRT      (1u << 1) /* Virtualized x2APIC accesses */

/* Memory mapped from other domains has valid IOMMU entries */

#define XEN_HVM_CPUID_IOMMU_MAPPINGS   (1u << 2)

/* vcpu id is present in EBX */

#define XEN_HVM_CPUID_VCPU_ID_PRESENT  (1u << 3)

#define XEN_HVM_CPUID_VCPU_ID_PRESENT  (1u << 3) /* vcpu id is present in EBX */



/*

 * Leaf 6 (0x40000x05)

 * PV-specific parameters

 * Sub-leaf 0: EAX: max available sub-leaf

 * Sub-leaf 0: EBX: bits 0-7: max machine address width

 */



/* Max. address width in bits taking memory hotplug into account. */

#define XEN_CPUID_MACHINE_ADDRESS_WIDTH_MASK (0xffu << 0)



#define XEN_CPUID_MAX_NUM_LEAVES 4

#define XEN_CPUID_MAX_NUM_LEAVES 5



#endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */