Commit 31130a16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from Juergen Gross:

 - add dma-buf functionality to Xen grant table handling

 - fix for booting the kernel as Xen PVH dom0

 - fix for booting the kernel as a Xen PV guest with
   CONFIG_DEBUG_VIRTUAL enabled

 - other minor performance and style fixes

* tag 'for-linus-4.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: fix balloon initialization for PVH Dom0
  xen: don't use privcmd_call() from xen_mc_flush()
  xen/pv: Call get_cpu_address_sizes to set x86_virt/phys_bits
  xen/biomerge: Use true and false for boolean values
  xen/gntdev: don't dereference a null gntdev_dmabuf on allocation failure
  xen/spinlock: Don't use pvqspinlock if only 1 vCPU
  xen/gntdev: Implement dma-buf import functionality
  xen/gntdev: Implement dma-buf export functionality
  xen/gntdev: Add initial support for dma-buf UAPI
  xen/gntdev: Make private routines/structures accessible
  xen/gntdev: Allow mappings for DMA buffers
  xen/grant-table: Allow allocating buffers suitable for DMA
  xen/balloon: Share common memory reservation routines
  xen/grant-table: Make set/clear page private code shared
parents 1202f4fd 3596924a

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

+19 −6
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ extern struct { char _entry[32]; } hypercall_page[]; 
})



static inline long

privcmd_call(unsigned call,

xen_single_call(unsigned int call,

		unsigned long a1, unsigned long a2,

		unsigned long a3, unsigned long a4,

		unsigned long a5)
@@ -217,16 +217,29 @@ privcmd_call(unsigned call, 
	__HYPERCALL_DECLS;

	__HYPERCALL_5ARG(a1, a2, a3, a4, a5);



	stac();

	asm volatile(CALL_NOSPEC

		     : __HYPERCALL_5PARAM

		     : [thunk_target] "a" (&hypercall_page[call])

		     : __HYPERCALL_CLOBBER5);

	clac();



	return (long)__res;

}



static inline long

privcmd_call(unsigned int call,

	     unsigned long a1, unsigned long a2,

	     unsigned long a3, unsigned long a4,

	     unsigned long a5)

{

	long res;



	stac();

	res = xen_single_call(call, a1, a2, a3, a4, a5);

	clac();



	return res;

}



static inline int

HYPERVISOR_set_trap_table(struct trap_info *table)

{

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 
	apply_forced_caps(c);

}



static void get_cpu_address_sizes(struct cpuinfo_x86 *c)

void get_cpu_address_sizes(struct cpuinfo_x86 *c)

{

	u32 eax, ebx, ecx, edx;

arch/x86/kernel/cpu/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[], 
			    *const __x86_cpu_dev_end[];



extern void get_cpu_cap(struct cpuinfo_x86 *c);

extern void get_cpu_address_sizes(struct cpuinfo_x86 *c);

extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);

extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);

extern u32 get_scattered_cpuid_leaf(unsigned int level,

arch/x86/xen/enlighten_pv.c

+3 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,9 @@ asmlinkage __visible void __init xen_start_kernel(void) 
	get_cpu_cap(&boot_cpu_data);

	x86_configure_nx();



	/* Determine virtual and physical address sizes */

	get_cpu_address_sizes(&boot_cpu_data);



	/* Let's presume PV guests always boot on vCPU with id 0. */

	per_cpu(xen_vcpu_id, 0) = 0;

arch/x86/xen/multicalls.c

+3 −3
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ void xen_mc_flush(void) 
		   and just do the call directly. */

		mc = &b->entries[0];



		mc->result = privcmd_call(mc->op,

					  mc->args[0], mc->args[1], mc->args[2], 

					  mc->args[3], mc->args[4]);

		mc->result = xen_single_call(mc->op, mc->args[0], mc->args[1],

					     mc->args[2], mc->args[3],

					     mc->args[4]);

		ret = mc->result < 0;

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE