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

Commit 83a17d26 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Prepare to move to more saner user copy exception handling. 



The fixup helper function mechanism for handling user copy fault
handling is not %100 accurrate, and can never be made so.

We are going to transition the code to return the running return
return length, which is always kept track in one or more registers
of each of these routines.

In order to convert them one by one, we have to allow the existing
behavior to continue functioning.

Therefore make all the copy code that wants the fixup helper to be
used return negative one.

After all of the user copy routines have been converted, this logic
and the fixup helpers themselves can be removed completely.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa95ce36

arch/sparc/include/asm/uaccess_64.h

+15 −6
Original line number Diff line number Diff line
@@ -198,8 +198,11 @@ copy_from_user(void *to, const void __user *from, unsigned long size) 
	check_object_size(to, size, false);



	ret = ___copy_from_user(to, from, size);

	if (unlikely(ret))

	if (unlikely(ret)) {

		if ((long)ret < 0)

			ret = copy_from_user_fixup(to, from, size);

		return ret;

	}



	return ret;

}
@@ -218,10 +221,13 @@ copy_to_user(void __user *to, const void *from, unsigned long size) 
	check_object_size(from, size, true);



	ret = ___copy_to_user(to, from, size);

	if (unlikely(ret))

	if (unlikely(ret)) {

		if ((long)ret < 0)

			ret = copy_to_user_fixup(to, from, size);

		return ret;

	}

	return ret;

}

#define __copy_to_user copy_to_user



unsigned long __must_check ___copy_in_user(void __user *to,
@@ -234,10 +240,13 @@ copy_in_user(void __user *to, void __user *from, unsigned long size) 
{

	unsigned long ret = ___copy_in_user(to, from, size);



	if (unlikely(ret))

	if (unlikely(ret)) {

		if ((long)ret < 0)

			ret = copy_in_user_fixup(to, from, size);

		return ret;

	}

	return ret;

}

#define __copy_in_user copy_in_user



unsigned long __must_check __clear_user(void __user *, unsigned long);

arch/sparc/kernel/head_64.S

+11 −12
Original line number Diff line number Diff line
@@ -926,41 +926,40 @@ tlb_type: .word 0 /* Must NOT end up in BSS */ 
EXPORT_SYMBOL(tlb_type)

	.section	".fixup",#alloc,#execinstr



	.globl	__retl_efault, __ret_one, __retl_one

ENTRY(__retl_efault)

	retl

	 mov	-EFAULT, %o0

ENDPROC(__retl_efault)



ENTRY(__retl_one)

ENTRY(__retl_mone)

	retl

	 mov	1, %o0

ENDPROC(__retl_one)

	 mov	-1, %o0

ENDPROC(__retl_mone)



ENTRY(__retl_one_fp)

ENTRY(__retl_mone_fp)

	VISExitHalf

	retl

	 mov	1, %o0

ENDPROC(__retl_one_fp)

ENDPROC(__retl_mone_fp)



ENTRY(__ret_one_asi)

ENTRY(__ret_mone_asi)

	wr	%g0, ASI_AIUS, %asi

	ret

	 restore %g0, 1, %o0

ENDPROC(__ret_one_asi)

ENDPROC(__ret_mone_asi)



ENTRY(__retl_one_asi)

ENTRY(__retl_mone_asi)

	wr	%g0, ASI_AIUS, %asi

	retl

	 mov	1, %o0

ENDPROC(__retl_one_asi)

ENDPROC(__retl_mone_asi)



ENTRY(__retl_one_asi_fp)

ENTRY(__retl_mone_asi_fp)

	wr	%g0, ASI_AIUS, %asi

	VISExitHalf

	retl

	 mov	1, %o0

ENDPROC(__retl_one_asi_fp)

ENDPROC(__retl_mone_asi_fp)



ENTRY(__retl_o1)

	retl

arch/sparc/lib/GENcopy_from_user.S

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
98:	x;			\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, __retl_one;	\

	.word 98b, __retl_mone;	\

	.text;			\

	.align 4;

arch/sparc/lib/GENcopy_to_user.S

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
98:	x;			\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, __retl_one;	\

	.word 98b, __retl_mone;	\

	.text;			\

	.align 4;

arch/sparc/lib/NG2copy_from_user.S

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
98:	x;			\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, __retl_one_asi;\

	.word 98b, __retl_mone_asi;\

	.text;			\

	.align 4;
@@ -15,7 +15,7 @@ 
98:	x;			\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, __retl_one_asi_fp;\

	.word 98b, __retl_mone_asi_fp;\

	.text;			\

	.align 4;