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

Commit dff933da authored by Al Viro's avatar Al Viro
Browse files

sparc64: clear syscall_noerror on the entry to syscall, not on the exit 



Move that sucker to just before TI_FPDEPTH and replace stb with sth in
etrap_save().  Take current_ds to its old place, so that we don't push
wsaved into TI_... flags.  That allows to lose clearing syscall_noerror
on return from syscall.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ddffeb8c

arch/sparc/include/asm/ptrace.h

+1 −3
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ struct global_reg_snapshot { 
};

extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS];



#define force_successful_syscall_return()	    \

do {	current_thread_info()->syscall_noerror = 1; \

} while (0)

#define force_successful_syscall_return() set_thread_noerror(1)

#define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))

#define instruction_pointer(regs) ((regs)->tpc)

#define instruction_pointer_set(regs, val) ((regs)->tpc = (val))

arch/sparc/include/asm/switch_to_64.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ do { flush_tlb_pending(); \ 
	/* If you are tempted to conditionalize the following */	\

	/* so that ASI is only written if it changes, think again. */	\

	__asm__ __volatile__("wr %%g0, %0, %%asi"			\

	: : "r" (__thread_flag_byte_ptr(task_thread_info(next))[TI_FLAG_BYTE_CURRENT_DS]));\

	: : "r" (task_thread_info(next)->current_ds));\

	trap_block[current_thread_info()->cpu].thread =			\

		task_thread_info(next);					\

	__asm__ __volatile__(						\

arch/sparc/include/asm/thread_info_64.h

+12 −13
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#define TI_FLAG_FAULT_CODE_SHIFT	56

#define TI_FLAG_BYTE_WSTATE		1

#define TI_FLAG_WSTATE_SHIFT		48

#define TI_FLAG_BYTE_CWP		2

#define TI_FLAG_CWP_SHIFT		40

#define TI_FLAG_BYTE_CURRENT_DS		3

#define TI_FLAG_CURRENT_DS_SHIFT	32

#define TI_FLAG_BYTE_FPDEPTH		4

#define TI_FLAG_FPDEPTH_SHIFT		24

#define TI_FLAG_BYTE_NOERROR		2

#define TI_FLAG_BYTE_NOERROR_SHIFT	40

#define TI_FLAG_BYTE_FPDEPTH		3

#define TI_FLAG_FPDEPTH_SHIFT		32

#define TI_FLAG_BYTE_CWP		4

#define TI_FLAG_CWP_SHIFT		24

#define TI_FLAG_BYTE_WSAVED		5

#define TI_FLAG_WSAVED_SHIFT		16
@@ -47,7 +47,7 @@ struct thread_info { 
	struct exec_domain	*exec_domain;

	int			preempt_count;	/* 0 => preemptable, <0 => BUG */

	__u8			new_child;

	__u8			syscall_noerror;

	__u8			current_ds;

	__u16			cpu;



	unsigned long		*utraps;
@@ -74,9 +74,9 @@ struct thread_info { 
#define TI_FAULT_CODE	(TI_FLAGS + TI_FLAG_BYTE_FAULT_CODE)

#define TI_WSTATE	(TI_FLAGS + TI_FLAG_BYTE_WSTATE)

#define TI_CWP		(TI_FLAGS + TI_FLAG_BYTE_CWP)

#define TI_CURRENT_DS	(TI_FLAGS + TI_FLAG_BYTE_CURRENT_DS)

#define TI_FPDEPTH	(TI_FLAGS + TI_FLAG_BYTE_FPDEPTH)

#define TI_WSAVED	(TI_FLAGS + TI_FLAG_BYTE_WSAVED)

#define TI_SYS_NOERROR	(TI_FLAGS + TI_FLAG_BYTE_NOERROR)

#define TI_FPSAVED	0x00000010

#define TI_KSP		0x00000018

#define TI_FAULT_ADDR	0x00000020
@@ -84,7 +84,7 @@ struct thread_info { 
#define TI_EXEC_DOMAIN	0x00000030

#define TI_PRE_COUNT	0x00000038

#define TI_NEW_CHILD	0x0000003c

#define TI_SYS_NOERROR	0x0000003d

#define TI_CURRENT_DS	0x0000003d

#define TI_CPU		0x0000003e

#define TI_UTRAPS	0x00000040

#define TI_REG_WINDOW	0x00000048
@@ -121,7 +121,7 @@ struct thread_info { 
#define INIT_THREAD_INFO(tsk)				\

{							\

	.task		=	&tsk,			\

	.flags		= ((unsigned long)ASI_P) << TI_FLAG_CURRENT_DS_SHIFT,	\

	.current_ds	=	ASI_P,			\

	.exec_domain	=	&default_exec_domain,	\

	.preempt_count	=	INIT_PREEMPT_COUNT,	\

	.restart_block	= {				\
@@ -153,13 +153,12 @@ register struct thread_info *current_thread_info_reg asm("g6"); 
#define set_thread_wstate(val)		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSTATE] = (val))

#define get_thread_cwp()		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_CWP])

#define set_thread_cwp(val)		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_CWP] = (val))

#define get_thread_current_ds()		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_CURRENT_DS])

#define set_thread_current_ds(val)	(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_CURRENT_DS] = (val))

#define get_thread_noerror()		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_NOERROR])

#define set_thread_noerror(val)		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_NOERROR] = (val))

#define get_thread_fpdepth()		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_FPDEPTH])

#define set_thread_fpdepth(val)		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_FPDEPTH] = (val))

#define get_thread_wsaved()		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED])

#define set_thread_wsaved(val)		(__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED] = (val))



#endif /* !(__ASSEMBLY__) */



/*

arch/sparc/include/asm/uaccess_64.h

+2 −2
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ 
#define VERIFY_READ	0

#define VERIFY_WRITE	1



#define get_fs() ((mm_segment_t) { get_thread_current_ds() })

#define get_fs() ((mm_segment_t){(current_thread_info()->current_ds)})

#define get_ds() (KERNEL_DS)



#define segment_eq(a,b)  ((a).seg == (b).seg)



#define set_fs(val)								\

do {										\

	set_thread_current_ds((val).seg);					\

	current_thread_info()->current_ds =(val).seg;				\

	__asm__ __volatile__ ("wr %%g0, %0, %%asi" : : "r" ((val).seg));	\

} while(0)

arch/sparc/kernel/etrap_64.S

+6 −2
Original line number Diff line number Diff line
@@ -92,8 +92,10 @@ etrap_save: save %g2, -STACK_BIAS, %sp 
		rdpr	%wstate, %g2

		wrpr	%g0, 0, %canrestore

		sll	%g2, 3, %g2



		/* Set TI_SYS_FPDEPTH to 1 and clear TI_SYS_NOERROR.  */

		mov	1, %l5

		stb	%l5, [%l6 + TI_FPDEPTH]

		sth	%l5, [%l6 + TI_SYS_NOERROR]



		wrpr	%g3, 0, %otherwin

		wrpr	%g2, 0, %wstate
@@ -152,7 +154,9 @@ etrap_save: save %g2, -STACK_BIAS, %sp 
		add	%l6, TI_FPSAVED + 1, %l4

		srl	%l5, 1, %l3

		add	%l5, 2, %l5

		stb	%l5, [%l6 + TI_FPDEPTH]



		/* Set TI_SYS_FPDEPTH to %l5 and clear TI_SYS_NOERROR.  */

		sth	%l5, [%l6 + TI_SYS_NOERROR]

		ba,pt	%xcc, 2b

		 stb	%g0, [%l4 + %l3]

		nop