From patchwork Tue Nov 13 15:00:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12826 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C23E723E28 for ; Tue, 13 Nov 2012 15:00:59 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4D22BA18C1C for ; Tue, 13 Nov 2012 15:00:59 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so10393925iej.11 for ; Tue, 13 Nov 2012 07:00:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=c+HFOtu14MXzm9ojpfGLJJOeYtxLTtTo4/l1s+wn4WU=; b=Vfld35TO9dp7uOpItnJqO03Wv1HJewo1ioGhG/2QEksDDGWXYVWPkEI8MRL700BJvI c+ttzYljanPvdKQV+0XauF2W1V5Z4RLWHwxRi5IZYPUP6A7UhseMQvEVIzvr0MsyHN9E 1tCK3Fa6fGtDtwJqVohFR7WkvZ1Ju1TGQktZYBpLJa7OABj1OEHEQSM68w0nM1mnAb+L EDPkeExHPMZ8bfZa4bc4K37wYNgWdPuvonLYr/HYpCLvwMFcc/4vL0PWnLrbv82pTAUk c48ZwSu/syZRE4SVtJK1ggJCXzkIuDUM2LICCH6m8WkAd9DHQ9EDW1KibBk/wUhWLLA5 ApwQ== Received: by 10.43.46.2 with SMTP id um2mr14601853icb.18.1352818858775; Tue, 13 Nov 2012 07:00:58 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp522245igt; Tue, 13 Nov 2012 07:00:58 -0800 (PST) Received: by 10.60.154.231 with SMTP id vr7mr17294726oeb.119.1352818858102; Tue, 13 Nov 2012 07:00:58 -0800 (PST) Received: from mail-oa0-f52.google.com (mail-oa0-f52.google.com [209.85.219.52]) by mx.google.com with ESMTPS id b2si9940015oec.14.2012.11.13.07.00.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Nov 2012 07:00:58 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.219.52 as permitted sender) client-ip=209.85.219.52; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.219.52 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-oa0-f52.google.com with SMTP id o6so10158681oag.39 for ; Tue, 13 Nov 2012 07:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=c+HFOtu14MXzm9ojpfGLJJOeYtxLTtTo4/l1s+wn4WU=; b=yeFOOjA1AtnZcE6YS5q9+VUpcFKyST6Qt0r9NActm3CYspBVxJcPD9oUcJUPwRTZwF AOpu2HdobzqdfohXF4+3OAo/9P+DHEIDLoshdvdUt/HqcVGenPjoe9y1wn+yx4VqXeUu hkR8jhzUoTMuETomiR2hlTCo7xfp2Mm6n0jeystlEXmppTf768QMEbYHpHuwwcNlX1G1 MejQH8fuObOS3f4SRaqGrmactrtf2fce4huoChXffTx/Dv8hTSzs9meydNQ7M54yRTIT 0oWGSlQKM8zOdVUT3Nw9yKs2MnGhx4Z6UhvV77m2MgG0IkkWbRMIJa/qDjhy87AIst/f 1Kwg== Received: by 10.182.86.225 with SMTP id s1mr18013935obz.91.1352818857605; Tue, 13 Nov 2012 07:00:57 -0800 (PST) Received: from localhost (ppp-70-129-143-201.dsl.rcsntx.swbell.net. [70.129.143.201]) by mx.google.com with ESMTPS id d7sm5877904oee.2.2012.11.13.07.00.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Nov 2012 07:00:56 -0800 (PST) Sender: Rob Clark From: Rob Clark To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, dri-devel@lists.freedesktop.org, Arnd Bergmann , Russell King , Rob Clark Subject: [PATCH] ARM: add get_user() support for 8 byte types Date: Tue, 13 Nov 2012 09:00:54 -0600 Message-Id: <1352818854-10958-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.8.0 X-Gm-Message-State: ALoCoQkrbYarNLPgL43/EQhzQc+t6V6/4eP+CiBFDtjB/xUhljMnL0yyUkAFB69zO9Y34dEuuXOp From: Rob Clark A new atomic modeset/pageflip ioctl being developed in DRM requires get_user() to work for 64bit types (in addition to just put_user()). v1: original v2: pass correct size to check_uaccess, and better handling of narrowing double word read with __get_user_xb() (Russell King's suggestion) Signed-off-by: Rob Clark --- arch/arm/include/asm/uaccess.h | 18 +++++++++++++++++- arch/arm/lib/getuser.S | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 7e1f760..e2236ad 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -100,6 +100,7 @@ static inline void set_fs(mm_segment_t fs) extern int __get_user_1(void *); extern int __get_user_2(void *); extern int __get_user_4(void *); +extern int __get_user_8(void *); #define __GUP_CLOBBER_1 "lr", "cc" #ifdef CONFIG_CPU_USE_DOMAINS @@ -108,6 +109,7 @@ extern int __get_user_4(void *); #define __GUP_CLOBBER_2 "lr", "cc" #endif #define __GUP_CLOBBER_4 "lr", "cc" +#define __GUP_CLOBBER_8 "lr", "cc" #define __get_user_x(__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \ @@ -118,11 +120,19 @@ extern int __get_user_4(void *); : "0" (__p), "r" (__l) \ : __GUP_CLOBBER_##__s) +/* narrowing a double-word get into a single 32bit word register: */ +#ifdef BIG_ENDIAN +#define __get_user_xb(__r2,__p,__e,__l,__s) \ + __get_user_x(__r2,(uintptr_t)__p + 4,__e,__l,__s) +#else +#define __get_user_xb __get_user_x +#endif + #define __get_user_check(x,p) \ ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ - register unsigned long __r2 asm("r2"); \ + register typeof(x) __r2 asm("r2"); \ register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \ @@ -135,6 +145,12 @@ extern int __get_user_4(void *); case 4: \ __get_user_x(__r2, __p, __e, __l, 4); \ break; \ + case 8: \ + if (sizeof((x)) < 8) \ + __get_user_xb(__r2, __p, __e, __l, 4); \ + else \ + __get_user_x(__r2, __p, __e, __l, 8); \ + break; \ default: __e = __get_user_bad(); break; \ } \ x = (typeof(*(p))) __r2; \ diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 9b06bb4..ed98707 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S @@ -18,7 +18,7 @@ * Inputs: r0 contains the address * r1 contains the address limit, which must be preserved * Outputs: r0 is the error code - * r2 contains the zero-extended value + * r2, r3 contains the zero-extended value * lr corrupted * * No other registers must be altered. (see @@ -66,6 +66,19 @@ ENTRY(__get_user_4) mov pc, lr ENDPROC(__get_user_4) +ENTRY(__get_user_8) + check_uaccess r0, 8, r1, r2, __get_user_bad +#ifdef CONFIG_THUMB2_KERNEL +5: TUSER(ldr) r2, [r0] +6: TUSER(ldr) r3, [r0, #4] +#else +5: TUSER(ldr) r2, [r0], #4 +6: TUSER(ldr) r3, [r0] +#endif + mov r0, #0 + mov pc, lr +ENDPROC(__get_user_8) + __get_user_bad: mov r2, #0 mov r0, #-EFAULT @@ -77,4 +90,6 @@ ENDPROC(__get_user_bad) .long 2b, __get_user_bad .long 3b, __get_user_bad .long 4b, __get_user_bad + .long 5b, __get_user_bad + .long 6b, __get_user_bad .popsection