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

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

x86: merge __put_user_asm and its user. 



Move both __put_user_asm and __put_user_size to
uaccess.h. i386 already had a special function for 64-bit access,
so for x86_64, we just define a macro with the same name.
Note that for X86_64, CONFIG_X86_WP_WORKS_OK will always
be defined, so the #else part will never be even compiled in.

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 d42e6af6

include/asm-x86/uaccess.h

+84 −0
Original line number Original line Diff line number Diff line
@@ -178,6 +178,90 @@ extern int __get_user_bad(void); 
	__ret_gu;							\

	__ret_gu;							\

})

})





#ifdef CONFIG_X86_32

#define __put_user_u64(x, addr, err)					\

	asm volatile("1:	movl %%eax,0(%2)\n"			\

		     "2:	movl %%edx,4(%2)\n"			\

		     "3:\n"						\

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

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

		     "	jmp 3b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 4b)				\

		     _ASM_EXTABLE(2b, 4b)				\

		     : "=r" (err)					\

		     : "A" (x), "r" (addr), "i" (-EFAULT), "0" (err))

#else

#define __put_user_u64(x, ptr, retval) \

	__put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT)

#endif



#ifdef CONFIG_X86_WP_WORKS_OK



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

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__put_user_asm(x, ptr, retval, "b", "b", "iq", errret);	\

		break;							\

	case 2:								\

		__put_user_asm(x, ptr, retval, "w", "w", "ir", errret);	\

		break;							\

	case 4:								\

		__put_user_asm(x, ptr, retval, "l", "k",  "ir", errret);\

		break;							\

	case 8:								\

		__put_user_u64((__typeof__(*ptr))(x), ptr, retval);	\

		break;							\

	default:							\

		__put_user_bad();					\

	}								\

} while (0)



#else



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

do {									\

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

	retval = 0;							\

									\

	if (unlikely(__copy_to_user_ll(ptr, &__pus_tmp, size) != 0))	\

		retval = errret;					\

} while (0)



#endif



#define __put_user_nocheck(x, ptr, size)			\

({								\

	long __pu_err;						\

	__put_user_size((x), (ptr), (size), __pu_err, -EFAULT);	\

	__pu_err;						\

})







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

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

#define __m(x) (*(struct __large_struct __user *)(x))



/*

 * Tell gcc we read from memory instead of writing: this is because

 * we do not write to any memory gcc knows about, so there are no

 * aliasing issues.

 */

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

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

		     "2:\n"						\

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

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

		     "	jmp 2b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r"(err)					\

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







#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

# include "uaccess_32.h"

# include "uaccess_32.h"

include/asm-x86/uaccess_32.h

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

#define __put_user(x, ptr)						\

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

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





#define __put_user_nocheck(x, ptr, size)			\

({								\

	long __pu_err;						\

	__put_user_size((x), (ptr), (size), __pu_err, -EFAULT);	\

	__pu_err;						\

})





#define __put_user_u64(x, addr, err)					\

	asm volatile("1:	movl %%eax,0(%2)\n"			\

		     "2:	movl %%edx,4(%2)\n"			\

		     "3:\n"						\

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

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

		     "	jmp 3b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 4b)				\

		     _ASM_EXTABLE(2b, 4b)				\

		     : "=r" (err)					\

		     : "A" (x), "r" (addr), "i" (-EFAULT), "0" (err))



#ifdef CONFIG_X86_WP_WORKS_OK



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

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__put_user_asm(x, ptr, retval, "b", "b", "iq", errret);	\

		break;							\

	case 2:								\

		__put_user_asm(x, ptr, retval, "w", "w", "ir", errret);	\

		break;							\

	case 4:								\

		__put_user_asm(x, ptr, retval, "l", "k",  "ir", errret);\

		break;							\

	case 8:								\

		__put_user_u64((__typeof__(*ptr))(x), ptr, retval);	\

		break;							\

	default:							\

		__put_user_bad();					\

	}								\

} while (0)



#else



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

do {									\

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

	retval = 0;							\

									\

	if (unlikely(__copy_to_user_ll(ptr, &__pus_tmp, size) != 0))	\

		retval = errret;					\

} while (0)



#endif

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

#define __m(x) (*(struct __large_struct __user *)(x))



/*

 * Tell gcc we read from memory instead of writing: this is because

 * we do not write to any memory gcc knows about, so there are no

 * aliasing issues.

 */

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

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

		     "2:\n"						\

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

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

		     "	jmp 2b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r"(err)					\

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





#define __get_user_nocheck(x, ptr, size)				\

#define __get_user_nocheck(x, ptr, size)				\

({									\

({									\

	long __gu_err;							\

	long __gu_err;							\

include/asm-x86/uaccess_64.h

+0 −51
Original line number Original line Diff line number Diff line
@@ -34,14 +34,6 @@ extern void __put_user_bad(void); 
#define __get_user_unaligned __get_user

#define __get_user_unaligned __get_user

#define __put_user_unaligned __put_user

#define __put_user_unaligned __put_user





#define __put_user_nocheck(x, ptr, size)		\

({							\

	int __pu_err;					\

	__put_user_size((x), (ptr), (size), __pu_err, -EFAULT);	\

	__pu_err;					\

})





#define __put_user_check(x, ptr, size)				\

#define __put_user_check(x, ptr, size)				\

({								\

({								\

	int __pu_err;						\

	int __pu_err;						\
@@ -65,49 +57,6 @@ extern void __put_user_bad(void); 
	__pu_err;						\

	__pu_err;						\

})

})





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

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__put_user_asm(x, ptr, retval, "b", "b", "iq", errret);\

		break;							\

	case 2:								\

		__put_user_asm(x, ptr, retval, "w", "w", "ir", errret);\

		break;							\

	case 4:								\

		__put_user_asm(x, ptr, retval, "l", "k", "ir", errret);\

		break;							\

	case 8:								\

		__put_user_asm(x, ptr, retval, "q", "", "Zr", errret);	\

		break;							\

	default:							\

		__put_user_bad();					\

	}								\

} while (0)



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

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

#define __m(x) (*(struct __large_struct __user *)(x))



/*

 * Tell gcc we read from memory instead of writing: this is because

 * we do not write to any memory gcc knows about, so there are no

 * aliasing issues.

 */

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

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

		     "2:\n"						\

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

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

		     "	jmp 2b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r"(err)					\

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





#define __get_user_nocheck(x, ptr, size)			\

#define __get_user_nocheck(x, ptr, size)			\

({								\

({								\

	int __gu_err;						\

	int __gu_err;						\