Commit 3f168221 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: merge __get_user_asm and its users. 



Move __get_user_asm and __get_user_size and __get_user_nocheck
to uaccess.h. This requires us to define a macro at __get_user_size
for the 64-bit access case.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6fd4725d

include/asm-x86/uaccess.h

+49 −1
Original line number Diff line number Diff line
@@ -233,6 +233,47 @@ do { \ 


#endif



#ifdef CONFIG_X86_32

#define __get_user_asm_u64(x, ptr, retval, errret)	(x) = __get_user_bad()

#else

#define __get_user_asm_u64(x, ptr, retval, errret) \

	 __get_user_asm(x, ptr, retval, "q", "", "=r", errret)

#endif



#define __get_user_size(x, ptr, size, retval, errret)			\

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__get_user_asm(x, ptr, retval, "b", "b", "=q", errret);	\

		break;							\

	case 2:								\

		__get_user_asm(x, ptr, retval, "w", "w", "=r", errret);	\

		break;							\

	case 4:								\

		__get_user_asm(x, ptr, retval, "l", "k", "=r", errret);	\

		break;							\

	case 8:								\

		__get_user_asm_u64(x, ptr, retval, errret);		\

		break;							\

	default:							\

		(x) = __get_user_bad();					\

	}								\

} while (0)



#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)	\

	asm volatile("1:	mov"itype" %2,%"rtype"1\n"		\

		     "2:\n"						\

		     ".section .fixup,\"ax\"\n"				\

		     "3:	mov %3,%0\n"				\

		     "	xor"itype" %"rtype"1,%"rtype"1\n"		\

		     "	jmp 2b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r" (err), ltype(x)				\

		     : "m" (__m(addr)), "i" (errret), "0" (err))



#define __put_user_nocheck(x, ptr, size)			\

({								\

	long __pu_err;						\
@@ -240,7 +281,14 @@ do { \ 
	__pu_err;						\

})





#define __get_user_nocheck(x, ptr, size)				\

({									\

	long __gu_err;							\

	unsigned long __gu_val;						\

	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);	\

	(x) = (__force __typeof__(*(ptr)))__gu_val;			\

	__gu_err;							\

})



/* FIXME: this hack is definitely wrong -AK */

struct __large_struct { unsigned long buf[100]; };

include/asm-x86/uaccess_32.h

+0 −41
Original line number Diff line number Diff line
@@ -145,47 +145,6 @@ extern void __put_user_8(void); 
#define __put_user(x, ptr)						\

	__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))



#define __get_user_nocheck(x, ptr, size)				\

({									\

	long __gu_err;							\

	unsigned long __gu_val;						\

	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);	\

	(x) = (__typeof__(*(ptr)))__gu_val;				\

	__gu_err;							\

})



#define __get_user_size(x, ptr, size, retval, errret)			\

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__get_user_asm(x, ptr, retval, "b", "b", "=q", errret);	\

		break;							\

	case 2:								\

		__get_user_asm(x, ptr, retval, "w", "w", "=r", errret);	\

		break;							\

	case 4:								\

		__get_user_asm(x, ptr, retval, "l", "", "=r", errret);	\

		break;							\

	default:							\

		(x) = __get_user_bad();					\

	}								\

} while (0)



#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)	\

	asm volatile("1:	mov"itype" %2,%"rtype"1\n"		\

		     "2:\n"						\

		     ".section .fixup,\"ax\"\n"				\

		     "3:	movl %3,%0\n"				\

		     "	xor"itype" %"rtype"1,%"rtype"1\n"		\

		     "	jmp 2b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r" (err), ltype (x)				\

		     : "m" (__m(addr)), "i" (errret), "0" (err))





unsigned long __must_check __copy_to_user_ll

		(void __user *to, const void *from, unsigned long n);

unsigned long __must_check __copy_from_user_ll

include/asm-x86/uaccess_64.h

+0 −43
Original line number Diff line number Diff line
@@ -57,49 +57,6 @@ extern void __put_user_bad(void); 
	__pu_err;						\

})



#define __get_user_nocheck(x, ptr, size)			\

({								\

	int __gu_err;						\

	unsigned long __gu_val;					\

	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);\

	(x) = (__force typeof(*(ptr)))__gu_val;			\

	__gu_err;						\

})



#define __get_user_size(x, ptr, size, retval, errret)			\

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__get_user_asm(x, ptr, retval, "b", "b", "=q", errret);\

		break;							\

	case 2:								\

		__get_user_asm(x, ptr, retval, "w", "w", "=r", errret);\

		break;							\

	case 4:								\

		__get_user_asm(x, ptr, retval, "l", "k", "=r", errret);\

		break;							\

	case 8:								\

		__get_user_asm(x, ptr, retval, "q", "", "=r", errret);	\

		break;							\

	default:							\

		(x) = __get_user_bad();					\

	}								\

} while (0)



#define __get_user_asm(x, addr, err, itype, rtype, ltype, errno)	\

	asm volatile("1:	mov"itype" %2,%"rtype"1\n"		\

		     "2:\n"						\

		     ".section .fixup, \"ax\"\n"			\

		     "3:	mov %3,%0\n"				\

		     "	xor"itype" %"rtype"1,%"rtype"1\n"		\

		     "	jmp 2b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r" (err), ltype (x)				\

		     : "m" (__m(addr)), "i"(errno), "0"(err))



/*

 * Copy To/From Userspace

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE