Merge branch 'core-fixes-for-linus' of... (3b383767) · Commits · 戴 / test

kernel/futex.c

+76 −61

Original line number	Diff line number	Diff line
		@@ -89,36 +89,36 @@ struct futex_pi_state {
		union futex_key key;
		};

		/*
		* We use this hashed waitqueue instead of a normal wait_queue_t, so
		/**
		* struct futex_q - The hashed futex queue entry, one per waiting task
		* @task: the task waiting on the futex
		* @lock_ptr: the hash bucket lock
		* @key: the key the futex is hashed on
		* @pi_state: optional priority inheritance state
		* @rt_waiter: rt_waiter storage for use with requeue_pi
		* @requeue_pi_key: the requeue_pi target futex key
		* @bitset: bitset for the optional bitmasked wakeup
		*
		* We use this hashed waitqueue, instead of a normal wait_queue_t, so
		* we can wake only the relevant ones (hashed queues may be shared).
		*
		* A futex_q has a woken state, just like tasks have TASK_RUNNING.
		* It is considered woken when plist_node_empty(&q->list) \|\| q->lock_ptr == 0.
		* The order of wakup is always to make the first condition true, then
		* wake up q->waiter, then make the second condition true.
		* the second.
		*
		* PI futexes are typically woken before they are removed from the hash list via
		* the rt_mutex code. See unqueue_me_pi().
		*/
		struct futex_q {
		struct plist_node list;
		/* Waiter reference */
		struct task_struct *task;

		/* Which hash list lock to use: */
		struct task_struct *task;
		spinlock_t *lock_ptr;

		/* Key which the futex is hashed on: */
		union futex_key key;

		/* Optional priority inheritance state: */
		struct futex_pi_state *pi_state;

		/* rt_waiter storage for requeue_pi: */
		struct rt_mutex_waiter *rt_waiter;

		/* The expected requeue pi target futex key: */
		union futex_key *requeue_pi_key;

		/* Bitset for the optional bitmasked wakeup */
		u32 bitset;
		};

		@@ -198,11 +198,12 @@ static void drop_futex_key_refs(union futex_key *key)
		}

		/**
		* get_futex_key - Get parameters which are the keys for a futex.
		* get_futex_key() - Get parameters which are the keys for a futex
		* @uaddr: virtual address of the futex
		* @fshared: 0 for a PROCESS_PRIVATE futex, 1 for PROCESS_SHARED
		* @key: address where result is stored.
		* @rw: mapping needs to be read/write (values: VERIFY_READ, VERIFY_WRITE)
		* @rw: mapping needs to be read/write (values: VERIFY_READ,
		* VERIFY_WRITE)
		*
		* Returns a negative error code or 0
		* The key words are stored in *key on success.
		@@ -288,8 +289,8 @@ void put_futex_key(int fshared, union futex_key *key)
		drop_futex_key_refs(key);
		}

		/*
		* fault_in_user_writeable - fault in user address and verify RW access
		/**
		* fault_in_user_writeable() - Fault in user address and verify RW access
		* @uaddr: pointer to faulting user space address
		*
		* Slow path to fixup the fault we just took in the atomic write
		@@ -588,7 +589,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
		}

		/**
		* futex_lock_pi_atomic() - atomic work required to acquire a pi aware futex
		* futex_lock_pi_atomic() - Atomic work required to acquire a pi aware futex
		* @uaddr: the pi futex user address
		* @hb: the pi futex hash bucket
		* @key: the futex key associated with uaddr and hb
		@@ -1011,9 +1012,9 @@ void requeue_futex(struct futex_q q, struct futex_hash_bucket hb1,

		/**
		* requeue_pi_wake_futex() - Wake a task that acquired the lock during requeue
		* q: the futex_q
		* key: the key of the requeue target futex
		* hb: the hash_bucket of the requeue target futex
		* @q: the futex_q
		* @key: the key of the requeue target futex
		* @hb: the hash_bucket of the requeue target futex
		*
		* During futex_requeue, with requeue_pi=1, it is possible to acquire the
		* target futex if it is uncontended or via a lock steal. Set the futex_q key
		@@ -1350,6 +1351,25 @@ static inline struct futex_hash_bucket queue_lock(struct futex_q q)
		return hb;
		}

		static inline void
		queue_unlock(struct futex_q q, struct futex_hash_bucket hb)
		{
		spin_unlock(&hb->lock);
		drop_futex_key_refs(&q->key);
		}

		/**
		* queue_me() - Enqueue the futex_q on the futex_hash_bucket
		* @q: The futex_q to enqueue
		* @hb: The destination hash bucket
		*
		* The hb->lock must be held by the caller, and is released here. A call to
		* queue_me() is typically paired with exactly one call to unqueue_me(). The
		* exceptions involve the PI related operations, which may use unqueue_me_pi()
		* or nothing if the unqueue is done as part of the wake process and the unqueue
		* state is implicit in the state of woken task (see futex_wait_requeue_pi() for
		* an example).
		*/
		static inline void queue_me(struct futex_q q, struct futex_hash_bucket hb)
		{
		int prio;
		@@ -1373,19 +1393,17 @@ static inline void queue_me(struct futex_q q, struct futex_hash_bucket hb)
		spin_unlock(&hb->lock);
		}

		static inline void
		queue_unlock(struct futex_q q, struct futex_hash_bucket hb)
		{
		spin_unlock(&hb->lock);
		drop_futex_key_refs(&q->key);
		}

		/*
		* queue_me and unqueue_me must be called as a pair, each
		* exactly once. They are called with the hashed spinlock held.
		/**
		* unqueue_me() - Remove the futex_q from its futex_hash_bucket
		* @q: The futex_q to unqueue
		*
		* The q->lock_ptr must not be held by the caller. A call to unqueue_me() must
		* be paired with exactly one earlier call to queue_me().
		*
		* Returns:
		* 1 - if the futex_q was still queued (and we removed unqueued it)
		* 0 - if the futex_q was already removed by the waking thread
		*/

		/* Return 1 if we were still queued (ie. 0 means we were woken) */
		static int unqueue_me(struct futex_q *q)
		{
		spinlock_t *lock_ptr;
		@@ -1638,17 +1656,14 @@ out:
		static void futex_wait_queue_me(struct futex_hash_bucket hb, struct futex_q q,
		struct hrtimer_sleeper *timeout)
		{
		queue_me(q, hb);

		/*
		* There might have been scheduling since the queue_me(), as we
		* cannot hold a spinlock across the get_user() in case it
		* faults, and we cannot just set TASK_INTERRUPTIBLE state when
		* queueing ourselves into the futex hash. This code thus has to
		* rely on the futex_wake() code removing us from hash when it
		* wakes us up.
		* The task state is guaranteed to be set before another task can
		* wake it. set_current_state() is implemented using set_mb() and
		* queue_me() calls spin_unlock() upon completion, both serializing
		* access to the hash list and forcing another memory barrier.
		*/
		set_current_state(TASK_INTERRUPTIBLE);
		queue_me(q, hb);

		/* Arm the timer */
		if (timeout) {
		@@ -1658,8 +1673,8 @@ static void futex_wait_queue_me(struct futex_hash_bucket hb, struct futex_q q,
		}

		/*
		* !plist_node_empty() is safe here without any lock.
		* q.lock_ptr != 0 is not safe, because of ordering against wakeup.
		* If we have been removed from the hash list, then another task
		* has tried to wake us, and we can skip the call to schedule().
		*/
		if (likely(!plist_node_empty(&q->list))) {
		/*
		@@ -2114,12 +2129,12 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,

		/**
		* futex_wait_requeue_pi() - Wait on uaddr and take uaddr2
		* @uaddr: the futex we initialyl wait on (non-pi)
		* @uaddr: the futex we initially wait on (non-pi)
		* @fshared: whether the futexes are shared (1) or not (0). They must be
		* the same type, no requeueing from private to shared, etc.
		* @val: the expected value of uaddr
		* @abs_time: absolute timeout
		* @bitset: 32 bit wakeup bitset set by userspace, defaults to all.
		* @bitset: 32 bit wakeup bitset set by userspace, defaults to all
		* @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0)
		* @uaddr2: the pi futex we will take prior to returning to user-space
		*
		@@ -2246,7 +2261,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,
		res = fixup_owner(uaddr2, fshared, &q, !ret);
		/*
		* If fixup_owner() returned an error, proprogate that. If it
		* acquired the lock, clear our -ETIMEDOUT or -EINTR.
		* acquired the lock, clear -ETIMEDOUT or -EINTR.
		*/
		if (res)
		ret = (res < 0) ? res : 0;
		@@ -2302,7 +2317,7 @@ out:
		*/

		/**
		* sys_set_robust_list - set the robust-futex list head of a task
		* sys_set_robust_list() - Set the robust-futex list head of a task
		* @head: pointer to the list-head
		* @len: length of the list-head, as userspace expects
		*/
		@@ -2323,7 +2338,7 @@ SYSCALL_DEFINE2(set_robust_list, struct robust_list_head __user *, head,
		}

		/**
		* sys_get_robust_list - get the robust-futex list head of a task
		* sys_get_robust_list() - Get the robust-futex list head of a task
		* @pid: pid of the process [zero for current task]
		* @head_ptr: pointer to a list-head pointer, the kernel fills it in
		* @len_ptr: pointer to a length field, the kernel fills in the header size

Admin message