Commit 94ec7088 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'locking/futex' into locking/core, to pick up pending futex changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents cdb7d2d6 78272d44

include/linux/futex.h

+34 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 


#include <linux/sched.h>

#include <linux/ktime.h>

#include <linux/mm_types.h>



#include <uapi/linux/futex.h>



struct inode;

struct mm_struct;

struct task_struct;



/*
@@ -34,6 +34,7 @@ union futex_key { 
		u64 i_seq;

		unsigned long pgoff;

		unsigned int offset;

		/* unsigned int node; */

	} shared;

	struct {

		union {
@@ -42,11 +43,13 @@ union futex_key { 
		};

		unsigned long address;

		unsigned int offset;

		/* unsigned int node; */

	} private;

	struct {

		u64 ptr;

		unsigned long word;

		unsigned int offset;

		unsigned int node;	/* NOT hashed! */

	} both;

};
@@ -77,7 +80,25 @@ void futex_exec_release(struct task_struct *tsk); 


long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,

	      u32 __user *uaddr2, u32 val2, u32 val3);

#else

int futex_hash_prctl(unsigned long arg2, unsigned long arg3, unsigned long arg4);



#ifdef CONFIG_FUTEX_PRIVATE_HASH

int futex_hash_allocate_default(void);

void futex_hash_free(struct mm_struct *mm);



static inline void futex_mm_init(struct mm_struct *mm)

{

	RCU_INIT_POINTER(mm->futex_phash, NULL);

	mutex_init(&mm->futex_hash_lock);

}



#else /* !CONFIG_FUTEX_PRIVATE_HASH */

static inline int futex_hash_allocate_default(void) { return 0; }

static inline void futex_hash_free(struct mm_struct *mm) { }

static inline void futex_mm_init(struct mm_struct *mm) { }

#endif /* CONFIG_FUTEX_PRIVATE_HASH */



#else /* !CONFIG_FUTEX */

static inline void futex_init_task(struct task_struct *tsk) { }

static inline void futex_exit_recursive(struct task_struct *tsk) { }

static inline void futex_exit_release(struct task_struct *tsk) { }
@@ -88,6 +109,17 @@ static inline long do_futex(u32 __user *uaddr, int op, u32 val, 
{

	return -EINVAL;

}

static inline int futex_hash_prctl(unsigned long arg2, unsigned long arg3, unsigned long arg4)

{

	return -EINVAL;

}

static inline int futex_hash_allocate_default(void)

{

	return 0;

}

static inline void futex_hash_free(struct mm_struct *mm) { }

static inline void futex_mm_init(struct mm_struct *mm) { }



#endif



#endif

include/linux/mm_types.h

+6 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define INIT_PASID	0



struct address_space;

struct futex_private_hash;

struct mem_cgroup;



/*
@@ -1031,7 +1032,11 @@ struct mm_struct { 
		 */

		seqcount_t mm_lock_seq;

#endif



#ifdef CONFIG_FUTEX_PRIVATE_HASH

		struct mutex			futex_hash_lock;

		struct futex_private_hash	__rcu *futex_phash;

		struct futex_private_hash	*futex_phash_new;

#endif



		unsigned long hiwater_rss; /* High-watermark of RSS usage */

		unsigned long hiwater_vm;  /* High-water virtual memory usage */

include/linux/mmap_lock.h

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/rwsem.h>

#include <linux/tracepoint-defs.h>

#include <linux/types.h>

#include <linux/cleanup.h>



#define MMAP_LOCK_INITIALIZER(name) \

	.mmap_lock = __RWSEM_INITIALIZER((name).mmap_lock),
@@ -211,6 +212,9 @@ static inline void mmap_read_unlock(struct mm_struct *mm) 
	up_read(&mm->mmap_lock);

}



DEFINE_GUARD(mmap_read_lock, struct mm_struct *,

	     mmap_read_lock(_T), mmap_read_unlock(_T))



static inline void mmap_read_unlock_non_owner(struct mm_struct *mm)

{

	__mmap_lock_trace_released(mm, false);

include/linux/rcuref.h

+21 −1
Original line number Diff line number Diff line
@@ -30,7 +30,11 @@ static inline void rcuref_init(rcuref_t *ref, unsigned int cnt) 
 * rcuref_read - Read the number of held reference counts of a rcuref

 * @ref:	Pointer to the reference count

 *

 * Return: The number of held references (0 ... N)

 * Return: The number of held references (0 ... N). The value 0 does not

 * indicate that it is safe to schedule the object, protected by this reference

 * counter, for deconstruction.

 * If you want to know if the reference counter has been marked DEAD (as

 * signaled by rcuref_put()) please use rcuread_is_dead().

 */

static inline unsigned int rcuref_read(rcuref_t *ref)

{
@@ -40,6 +44,22 @@ static inline unsigned int rcuref_read(rcuref_t *ref) 
	return c >= RCUREF_RELEASED ? 0 : c + 1;

}



/**

 * rcuref_is_dead -	Check if the rcuref has been already marked dead

 * @ref:		Pointer to the reference count

 *

 * Return: True if the object has been marked DEAD. This signals that a previous

 * invocation of rcuref_put() returned true on this reference counter meaning

 * the protected object can safely be scheduled for deconstruction.

 * Otherwise, returns false.

 */

static inline bool rcuref_is_dead(rcuref_t *ref)

{

	unsigned int c = atomic_read(&ref->refcnt);



	return (c >= RCUREF_RELEASED) && (c < RCUREF_NOREF);

}



extern __must_check bool rcuref_get_slowpath(rcuref_t *ref);



/**

include/linux/restart_block.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct restart_block { 
	unsigned long arch_data;

	long (*fn)(struct restart_block *);

	union {

		/* For futex_wait and futex_wait_requeue_pi */

		/* For futex_wait() */

		struct {

			u32 __user *uaddr;

			u32 val;