Commit ee1f9d19 authored by Juergen Gross's avatar Juergen Gross Committed by Boris Ostrovsky
Browse files

xen: allow pv-only hypercalls only with CONFIG_XEN_PV 



Put the definitions of the hypercalls usable only by pv guests inside
CONFIG_XEN_PV sections.

On Arm two dummy functions related to pv hypercalls can be removed.

While at it remove the no longer supported tmem hypercall definition.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20211028081221.2475-3-jgross@suse.com


Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent d99bb72a

arch/arm/xen/enlighten.c

+0 −1
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op); 
EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op_raw);

EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);

EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist);

arch/arm/xen/hypercall.S

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ HYPERCALL2(hvm_op); 
HYPERCALL2(memory_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);

HYPERCALL1(platform_op_raw);

HYPERCALL2(multicall);

HYPERCALL2(vm_assist);

arch/arm64/xen/hypercall.S

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ HYPERCALL2(hvm_op); 
HYPERCALL2(memory_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);

HYPERCALL1(platform_op_raw);

HYPERCALL2(multicall);

HYPERCALL2(vm_assist);

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

+102 −109
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ privcmd_call(unsigned int call, 
	return res;

}



#ifdef CONFIG_XEN_PV

static inline int

HYPERVISOR_set_trap_table(struct trap_info *table)

{
@@ -280,6 +281,107 @@ HYPERVISOR_callback_op(int cmd, void *arg) 
	return _hypercall2(int, callback_op, cmd, arg);

}



static inline int

HYPERVISOR_set_debugreg(int reg, unsigned long value)

{

	return _hypercall2(int, set_debugreg, reg, value);

}



static inline unsigned long

HYPERVISOR_get_debugreg(int reg)

{

	return _hypercall1(unsigned long, get_debugreg, reg);

}



static inline int

HYPERVISOR_update_descriptor(u64 ma, u64 desc)

{

	return _hypercall2(int, update_descriptor, ma, desc);

}



static inline int

HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val,

			     unsigned long flags)

{

	return _hypercall3(int, update_va_mapping, va, new_val.pte, flags);

}



static inline int

HYPERVISOR_set_segment_base(int reg, unsigned long value)

{

	return _hypercall2(int, set_segment_base, reg, value);

}



static inline void

MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)

{

	mcl->op = __HYPERVISOR_fpu_taskswitch;

	mcl->args[0] = set;



	trace_xen_mc_entry(mcl, 1);

}



static inline void

MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,

			pte_t new_val, unsigned long flags)

{

	mcl->op = __HYPERVISOR_update_va_mapping;

	mcl->args[0] = va;

	mcl->args[1] = new_val.pte;

	mcl->args[2] = flags;



	trace_xen_mc_entry(mcl, 3);

}



static inline void

MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr,

			struct desc_struct desc)

{

	mcl->op = __HYPERVISOR_update_descriptor;

	mcl->args[0] = maddr;

	mcl->args[1] = *(unsigned long *)&desc;



	trace_xen_mc_entry(mcl, 2);

}



static inline void

MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req,

		 int count, int *success_count, domid_t domid)

{

	mcl->op = __HYPERVISOR_mmu_update;

	mcl->args[0] = (unsigned long)req;

	mcl->args[1] = count;

	mcl->args[2] = (unsigned long)success_count;

	mcl->args[3] = domid;



	trace_xen_mc_entry(mcl, 4);

}



static inline void

MULTI_mmuext_op(struct multicall_entry *mcl, struct mmuext_op *op, int count,

		int *success_count, domid_t domid)

{

	mcl->op = __HYPERVISOR_mmuext_op;

	mcl->args[0] = (unsigned long)op;

	mcl->args[1] = count;

	mcl->args[2] = (unsigned long)success_count;

	mcl->args[3] = domid;



	trace_xen_mc_entry(mcl, 4);

}



static inline void

MULTI_stack_switch(struct multicall_entry *mcl,

		   unsigned long ss, unsigned long esp)

{

	mcl->op = __HYPERVISOR_stack_switch;

	mcl->args[0] = ss;

	mcl->args[1] = esp;



	trace_xen_mc_entry(mcl, 2);

}

#endif



static inline int

HYPERVISOR_sched_op(int cmd, void *arg)

{
@@ -308,24 +410,6 @@ HYPERVISOR_platform_op(struct xen_platform_op *op) 
	return _hypercall1(int, platform_op, op);

}



static __always_inline int

HYPERVISOR_set_debugreg(int reg, unsigned long value)

{

	return _hypercall2(int, set_debugreg, reg, value);

}



static __always_inline unsigned long

HYPERVISOR_get_debugreg(int reg)

{

	return _hypercall1(unsigned long, get_debugreg, reg);

}



static inline int

HYPERVISOR_update_descriptor(u64 ma, u64 desc)

{

	return _hypercall2(int, update_descriptor, ma, desc);

}



static inline long

HYPERVISOR_memory_op(unsigned int cmd, void *arg)

{
@@ -338,13 +422,6 @@ HYPERVISOR_multicall(void *call_list, uint32_t nr_calls) 
	return _hypercall2(int, multicall, call_list, nr_calls);

}



static inline int

HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val,

			     unsigned long flags)

{

	return _hypercall3(int, update_va_mapping, va, new_val.pte, flags);

}



static inline int

HYPERVISOR_event_channel_op(int cmd, void *arg)

{
@@ -387,14 +464,6 @@ HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args) 
	return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);

}



#ifdef CONFIG_X86_64

static inline int

HYPERVISOR_set_segment_base(int reg, unsigned long value)

{

	return _hypercall2(int, set_segment_base, reg, value);

}

#endif



static inline int

HYPERVISOR_suspend(unsigned long start_info_mfn)

{
@@ -415,13 +484,6 @@ HYPERVISOR_hvm_op(int op, void *arg) 
       return _hypercall2(unsigned long, hvm_op, op, arg);

}



static inline int

HYPERVISOR_tmem_op(

	struct tmem_op *op)

{

	return _hypercall1(int, tmem_op, op);

}



static inline int

HYPERVISOR_xenpmu_op(unsigned int op, void *arg)

{
@@ -439,73 +501,4 @@ HYPERVISOR_dm_op( 
	return ret;

}



static inline void

MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)

{

	mcl->op = __HYPERVISOR_fpu_taskswitch;

	mcl->args[0] = set;



	trace_xen_mc_entry(mcl, 1);

}



static inline void

MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,

			pte_t new_val, unsigned long flags)

{

	mcl->op = __HYPERVISOR_update_va_mapping;

	mcl->args[0] = va;

	mcl->args[1] = new_val.pte;

	mcl->args[2] = flags;



	trace_xen_mc_entry(mcl, 3);

}



static inline void

MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr,

			struct desc_struct desc)

{

	mcl->op = __HYPERVISOR_update_descriptor;

	mcl->args[0] = maddr;

	mcl->args[1] = *(unsigned long *)&desc;



	trace_xen_mc_entry(mcl, 2);

}



static inline void

MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req,

		 int count, int *success_count, domid_t domid)

{

	mcl->op = __HYPERVISOR_mmu_update;

	mcl->args[0] = (unsigned long)req;

	mcl->args[1] = count;

	mcl->args[2] = (unsigned long)success_count;

	mcl->args[3] = domid;



	trace_xen_mc_entry(mcl, 4);

}



static inline void

MULTI_mmuext_op(struct multicall_entry *mcl, struct mmuext_op *op, int count,

		int *success_count, domid_t domid)

{

	mcl->op = __HYPERVISOR_mmuext_op;

	mcl->args[0] = (unsigned long)op;

	mcl->args[1] = count;

	mcl->args[2] = (unsigned long)success_count;

	mcl->args[3] = domid;



	trace_xen_mc_entry(mcl, 4);

}



static inline void

MULTI_stack_switch(struct multicall_entry *mcl,

		   unsigned long ss, unsigned long esp)

{

	mcl->op = __HYPERVISOR_stack_switch;

	mcl->args[0] = ss;

	mcl->args[1] = esp;



	trace_xen_mc_entry(mcl, 2);

}



#endif /* _ASM_X86_XEN_HYPERCALL_H */

include/xen/arm/hypercall.h

+0 −15
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ unsigned long HYPERVISOR_hvm_op(int op, void *arg); 
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_vm_assist(unsigned int cmd, unsigned int type);

int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs,

		     struct xen_dm_op_buf *bufs);
@@ -74,18 +73,4 @@ HYPERVISOR_suspend(unsigned long start_info_mfn) 
	return HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);

}



static inline void

MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,

			unsigned int new_val, unsigned long flags)

{

	BUG();

}



static inline void

MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req,

		 int count, int *success_count, domid_t domid)

{

	BUG();

}



#endif /* _ASM_ARM_XEN_HYPERCALL_H */