Skip to contentSkip to conversation

lightweight robust futexes: compat

PATCH In review Ingo Molnar 3 participants 3 messages Feb 21, 2006 – Feb 23, 2006 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 4/6 lightweight robust futexes: compat

32-bit syscall compatibility support. (This patch also moves all futex related compat functionality into kernel/futex_compat.c.)

----

 include/linux/compat.h |   18 ++++++
 include/linux/sched.h  |    3 +
 kernel/Makefile        |    3 +
 kernel/compat.c        |   23 -------
 kernel/exit.c          |    5 +
 kernel/futex_compat.c  |  142 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 171 insertions(+), 23 deletions(-)
include/linux/compat.h +18 -0
Index: linux/include/linux/compat.h
===================================================================
@@ -121,6 +121,24 @@ typedef struct compat_sigevent {
 	} _sigev_un;
 } compat_sigevent_t;
 
+struct compat_robust_list {
+	compat_uptr_t			next;
+};
+
+struct compat_robust_list_head {
+	struct compat_robust_list	list;
+	compat_long_t			futex_offset;
+	compat_uptr_t			list_op_pending;
+};
+
+extern void compat_exit_robust_list(struct task_struct *curr);
+
+asmlinkage long
+compat_sys_set_robust_list(struct compat_robust_list_head __user *head,
+			   compat_size_t len);
+asmlinkage long
+compat_sys_get_robust_list(int pid, compat_uptr_t *head_ptr,
+			   compat_size_t __user *len_ptr);
 
 long compat_sys_semctl(int first, int second, int third, void __user *uptr);
 long compat_sys_msgsnd(int first, int second, int third, void __user *uptr);
include/linux/sched.h +3 -0
Index: linux/include/linux/sched.h
===================================================================
@@ -873,6 +873,9 @@ struct task_struct {
 	int cpuset_mems_generation;
 #endif
 	struct robust_list_head __user *robust_list;
+#ifdef CONFIG_COMPAT
+	struct compat_robust_list_head __user *compat_robust_list;
+#endif
 
 	atomic_t fs_excl;	/* holding fs exclusive resources */
 	struct rcu_head rcu;
kernel/Makefile +3 -0
Index: linux/kernel/Makefile
===================================================================
@@ -12,6 +12,9 @@ obj-y     = sched.o fork.o exec_domain.o
 
 obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
 obj-$(CONFIG_FUTEX) += futex.o
+ifeq ($(CONFIG_COMPAT),y)
+obj-$(CONFIG_FUTEX) += futex_compat.o
+endif
 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
 obj-$(CONFIG_SMP) += cpu.o spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
kernel/compat.c +0 -23
Index: linux/kernel/compat.c
===================================================================
@@ -17,7 +17,6 @@
 #include <linux/time.h>
 #include <linux/signal.h>
 #include <linux/sched.h>	/* for MAX_SCHEDULE_TIMEOUT */
-#include <linux/futex.h>	/* for FUTEX_WAIT */
 #include <linux/syscalls.h>
 #include <linux/unistd.h>
 #include <linux/security.h>
@@ -238,28 +237,6 @@ asmlinkage long compat_sys_sigprocmask(i
 	return ret;
 }
 
-#ifdef CONFIG_FUTEX
-asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, int val,
-		struct compat_timespec __user *utime, u32 __user *uaddr2,
-		int val3)
-{
-	struct timespec t;
-	unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
-	int val2 = 0;
-
-	if ((op == FUTEX_WAIT) && utime) {
-		if (get_compat_timespec(&t, utime))
-			return -EFAULT;
-		timeout = timespec_to_jiffies(&t) + 1;
-	}
-	if (op >= FUTEX_REQUEUE)
-		val2 = (int) (unsigned long) utime;
-
-	return do_futex((unsigned long)uaddr, op, val, timeout,
-			(unsigned long)uaddr2, val2, val3);
-}
-#endif
-
 asmlinkage long compat_sys_setrlimit(unsigned int resource,
 		struct compat_rlimit __user *rlim)
 {
kernel/exit.c +5 -0
Index: linux/kernel/exit.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/cn_proc.h>
 #include <linux/mutex.h>
 #include <linux/futex.h>
+#include <linux/compat.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -852,6 +853,10 @@ fastcall NORET_TYPE void do_exit(long co
 	}
 	if (unlikely(tsk->robust_list))
 		exit_robust_list(tsk);
+#ifdef CONFIG_COMPAT
+	if (unlikely(tsk->compat_robust_list))
+		compat_exit_robust_list(tsk);
+#endif
 	exit_mm(tsk);
 
 	exit_sem(tsk);
kernel/futex_compat.c new file +142 -0

142 lines not on this page · raw message

#1 lore raw

I think this broke the 2.6.16-rc4-mm1 CONFIG_FUTEX build for all but archs:

powerpc sparc64 x86_64

In the added file kernel/futex_compat.c, routine
compat_sys_get_robust_list() the lines:

+ if (put_user(sizeof(*head), len_ptr))
+ return -EFAULT;
+ return put_user(ptr_to_compat(head), head_ptr);

use a ptr_to_compat() routine that only seems to be defined for the above arch's.

My ia64 sn2_defconfig build final link is failing:

kernel/built-in.o(.text+0x54782): In function `compat_sys_get_robust_list':
kernel/futex_compat.c:92: undefined reference to `ptr_to_compat'

Signature · 3 lines
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <[email protected]> 1.925.600.0401
#2 lore raw
Quoted 3 lines · Paul Jackson

kernel/built-in.o(.text+0x54782): In function `compat_sys_get_robust_list':
kernel/futex_compat.c:92: undefined reference to `ptr_to_compat'

Yup. Ingo has sent through fixes for the four missing architectures (uploads them to hot-fixes). Here's ia64:

include/asm-ia64/compat.h

include/asm-ia64/compat.h renamed from include/asm-ia64/compat.h~ia64-add-ptr-to-compatpatch +6 -0
@@ -189,6 +189,12 @@ compat_ptr (compat_uptr_t uptr)
 	return (void __user *) (unsigned long) uptr;
 }
 
+static inline compat_uptr_t
+ptr_to_compat(void __user *uptr)
+{
+	return (u32)(unsigned long)uptr;
+}
+
 static __inline__ void __user *
 compat_alloc_user_space (long len)
 {

_