x86/xen: Rename SYS* entry points

Native SYS{CALL,ENTER} entry points are called entry_SYS{CALL,ENTER}_{64,compat}, make sure the Xen versions are named consistently.

Peter Zijlstra committed 4 years ago

Commit b75b7f81 parent 9bb2ec63 files · +16 −16Browse files

Unified · Split

3 files

arch/x86/xen/setup.c +3 −3
arch/x86/xen/xen-asm.S +10 −10
arch/x86/xen/xen-ops.h +3 −3

arch/x86/xen/setup.c+3−3

@@ -918,7 +918,7 @@ void xen_enable_sysenter(void) · 917 unmodified lines
918	if (!boot_cpu_has(sysenter_feature))	918	if (!boot_cpu_has(sysenter_feature))
919	return;	919	return;
920		920
921	ret = register_callback(CALLBACKTYPE_sysenter, xen_sysenter_target);	921	ret = register_callback(CALLBACKTYPE_sysenter, xen_entry_SYSENTER_compat);
922	if(ret != 0)	922	if(ret != 0)
923	setup_clear_cpu_cap(sysenter_feature);	923	setup_clear_cpu_cap(sysenter_feature);
924	}	924	}
@@ -927,7 +927,7 @@ void xen_enable_syscall(void) · 2 unmodified lines
927	{	927	{
928	int ret;	928	int ret;
929		929
930	ret = register_callback(CALLBACKTYPE_syscall, xen_syscall_target);	930	ret = register_callback(CALLBACKTYPE_syscall, xen_entry_SYSCALL_64);
931	if (ret != 0) {	931	if (ret != 0) {
932	printk(KERN_ERR "Failed to set syscall callback: %d\n", ret);	932	printk(KERN_ERR "Failed to set syscall callback: %d\n", ret);
933	/* Pretty fatal; 64-bit userspace has no other	933	/* Pretty fatal; 64-bit userspace has no other
@@ -936,7 +936,7 @@ void xen_enable_syscall(void) · 2 unmodified lines
936		936
937	if (boot_cpu_has(X86_FEATURE_SYSCALL32)) {	937	if (boot_cpu_has(X86_FEATURE_SYSCALL32)) {
938	ret = register_callback(CALLBACKTYPE_syscall32,	938	ret = register_callback(CALLBACKTYPE_syscall32,
939	xen_syscall32_target);	939	xen_entry_SYSCALL_compat);
940	if (ret != 0)	940	if (ret != 0)
941	setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);	941	setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);
942	}	942	}

arch/x86/xen/xen-asm.S+10−10

@@ -234,7 +234,7 @@ SYM_CODE_END(xenpv_restore_regs_and_return_to_usermode) · 233 unmodified lines
234	*/	234	*/
235		235
236	/* Normal 64-bit system call target */	236	/* Normal 64-bit system call target */
237	SYM_CODE_START(xen_syscall_target)	237	SYM_CODE_START(xen_entry_SYSCALL_64)
238	UNWIND_HINT_EMPTY	238	UNWIND_HINT_EMPTY
239	ENDBR	239	ENDBR
240	popq %rcx	240	popq %rcx
@@ -249,12 +249,12 @@ SYM_CODE_START(xen_syscall_target) · 8 unmodified lines
249	movq $__USER_CS, 1*8(%rsp)	249	movq $__USER_CS, 1*8(%rsp)
250		250
251	jmp entry_SYSCALL_64_after_hwframe	251	jmp entry_SYSCALL_64_after_hwframe
252	SYM_CODE_END(xen_syscall_target)	252	SYM_CODE_END(xen_entry_SYSCALL_64)
253		253
254	#ifdef CONFIG_IA32_EMULATION	254	#ifdef CONFIG_IA32_EMULATION
255		255
256	/* 32-bit compat syscall target */	256	/* 32-bit compat syscall target */
257	SYM_CODE_START(xen_syscall32_target)	257	SYM_CODE_START(xen_entry_SYSCALL_compat)
258	UNWIND_HINT_EMPTY	258	UNWIND_HINT_EMPTY
259	ENDBR	259	ENDBR
260	popq %rcx	260	popq %rcx
@@ -269,10 +269,10 @@ SYM_CODE_START(xen_syscall32_target) · 8 unmodified lines
269	movq $__USER32_CS, 1*8(%rsp)	269	movq $__USER32_CS, 1*8(%rsp)
270		270
271	jmp entry_SYSCALL_compat_after_hwframe	271	jmp entry_SYSCALL_compat_after_hwframe
272	SYM_CODE_END(xen_syscall32_target)	272	SYM_CODE_END(xen_entry_SYSCALL_compat)
273		273
274	/* 32-bit compat sysenter target */	274	/* 32-bit compat sysenter target */
275	SYM_CODE_START(xen_sysenter_target)	275	SYM_CODE_START(xen_entry_SYSENTER_compat)
276	UNWIND_HINT_EMPTY	276	UNWIND_HINT_EMPTY
277	ENDBR	277	ENDBR
278	/*	278	/*
@@ -291,19 +291,19 @@ SYM_CODE_START(xen_sysenter_target) · 12 unmodified lines
291	movq $__USER32_CS, 1*8(%rsp)	291	movq $__USER32_CS, 1*8(%rsp)
292		292
293	jmp entry_SYSENTER_compat_after_hwframe	293	jmp entry_SYSENTER_compat_after_hwframe
294	SYM_CODE_END(xen_sysenter_target)	294	SYM_CODE_END(xen_entry_SYSENTER_compat)
295		295
296	#else /* !CONFIG_IA32_EMULATION */	296	#else /* !CONFIG_IA32_EMULATION */
297		297
298	SYM_CODE_START(xen_syscall32_target)	298	SYM_CODE_START(xen_entry_SYSCALL_compat)
299	SYM_CODE_START(xen_sysenter_target)	299	SYM_CODE_START(xen_entry_SYSENTER_compat)
300	UNWIND_HINT_EMPTY	300	UNWIND_HINT_EMPTY
301	ENDBR	301	ENDBR
302	lea 16(%rsp), %rsp /* strip %rcx, %r11 */	302	lea 16(%rsp), %rsp /* strip %rcx, %r11 */
303	mov $-ENOSYS, %rax	303	mov $-ENOSYS, %rax
304	pushq $0	304	pushq $0
305	jmp hypercall_iret	305	jmp hypercall_iret
306	SYM_CODE_END(xen_sysenter_target)	306	SYM_CODE_END(xen_entry_SYSENTER_compat)
307	SYM_CODE_END(xen_syscall32_target)	307	SYM_CODE_END(xen_entry_SYSCALL_compat)
308		308
309	#endif /* CONFIG_IA32_EMULATION */	309	#endif /* CONFIG_IA32_EMULATION */

arch/x86/xen/xen-ops.h+3−3

@@ -10,10 +10,10 @@ · 9 unmodified lines
10	/* These are code, but not functions. Defined in entry.S */	10	/* These are code, but not functions. Defined in entry.S */
11	extern const char xen_failsafe_callback[];	11	extern const char xen_failsafe_callback[];
12		12
13	void xen_sysenter_target(void);	13	void xen_entry_SYSENTER_compat(void);
14	#ifdef CONFIG_X86_64	14	#ifdef CONFIG_X86_64
15	void xen_syscall_target(void);	15	void xen_entry_SYSCALL_64(void);
16	void xen_syscall32_target(void);	16	void xen_entry_SYSCALL_compat(void);
17	#endif	17	#endif
18		18
19	extern void *xen_initial_gdt;	19	extern void *xen_initial_gdt;

x86/xen: Rename SYS* entry points

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code