Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161442AbWBUItC (ORCPT ); Tue, 21 Feb 2006 03:49:02 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161440AbWBUIsp (ORCPT ); Tue, 21 Feb 2006 03:48:45 -0500 Received: from mx3.mail.elte.hu ([157.181.1.138]:3247 "EHLO mx3.mail.elte.hu") by vger.kernel.org with ESMTP id S1161442AbWBUIsg (ORCPT ); Tue, 21 Feb 2006 03:48:36 -0500 Date: Tue, 21 Feb 2006 09:47:01 +0100 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Ulrich Drepper , Paul Jackson , Thomas Gleixner , Arjan van de Ven , Andrew Morton Subject: [patch 5/6] lightweight robust futexes: i386 Message-ID: <20060221084701.GF5506@elte.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-ELTE-SpamScore: 0.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=0.0 required=5.9 tests=AWL autolearn=no SpamAssassin version=3.0.3 0.0 AWL AWL: From: address is in the auto white-list X-ELTE-VirusStatus: clean Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2452 Lines: 81 i386: add the futex_atomic_cmpxchg_inuser() assembly implementation, and wire up the new syscalls. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Acked-by: Ulrich Drepper ---- arch/i386/kernel/syscall_table.S | 2 ++ include/asm-i386/futex.h | 23 ++++++++++++++++++++++- include/asm-i386/unistd.h | 4 +++- 3 files changed, 27 insertions(+), 2 deletions(-) Index: linux/arch/i386/kernel/syscall_table.S =================================================================== --- linux.orig/arch/i386/kernel/syscall_table.S +++ linux/arch/i386/kernel/syscall_table.S @@ -310,3 +310,5 @@ ENTRY(sys_call_table) .long sys_pselect6 .long sys_ppoll .long sys_unshare /* 310 */ + .long sys_set_robust_list + .long sys_get_robust_list Index: linux/include/asm-i386/futex.h =================================================================== --- linux.orig/include/asm-i386/futex.h +++ linux/include/asm-i386/futex.h @@ -107,7 +107,28 @@ futex_atomic_op_inuser (int encoded_op, static inline int futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval) { - return -ENOSYS; + if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) + return -EFAULT; + + __asm__ __volatile__( + "1: " LOCK_PREFIX "cmpxchgl %3, %1 \n" + + "2: .section .fixup, \"ax\" \n" + "3: mov %2, %0 \n" + " jmp 2b \n" + " .previous \n" + + " .section __ex_table, \"a\" \n" + " .align 8 \n" + " .long 1b,3b \n" + " .previous \n" + + : "=a" (oldval), "=m" (*uaddr) + : "i" (-EFAULT), "r" (newval), "0" (oldval) + : "memory" + ); + + return oldval; } #endif Index: linux/include/asm-i386/unistd.h =================================================================== --- linux.orig/include/asm-i386/unistd.h +++ linux/include/asm-i386/unistd.h @@ -316,8 +316,10 @@ #define __NR_pselect6 308 #define __NR_ppoll 309 #define __NR_unshare 310 +#define __NR_set_robust_list 311 +#define __NR_get_robust_list 312 -#define NR_syscalls 311 +#define NR_syscalls 313 /* * user-visible error numbers are in the range -1 - -128: see - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/