[PATCH] lightweight robust futexes: compat (34f192c6) · Commits · 戴 / test

include/linux/compat.h

+18 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,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);

+3 −0

Original line number	Diff line number	Diff line
		@@ -874,6 +874,9 @@ struct task_struct {
		int cpuset_mem_spread_rotor;
		#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;

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.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

+0 −23

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -239,28 +238,6 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
		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)
		{

+5 −0

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -855,6 +856,10 @@ fastcall NORET_TYPE void do_exit(long code)
		}
		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);