futex: Remove put_futex_key() (9180bd46) · Commits · 戴 / test

kernel/futex.c

+12 −49

Original line number	Diff line number	Diff line
		@@ -677,10 +677,6 @@ out:
		return err;
		}

		static inline void put_futex_key(union futex_key *key)
		{
		}

		/**
		* fault_in_user_writeable() - Fault in user address and verify RW access
		* @uaddr: pointer to faulting user space address
		@@ -1617,7 +1613,7 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset)

		/* Make sure we really have tasks to wakeup */
		if (!hb_waiters_pending(hb))
		goto out_put_key;
		goto out;

		spin_lock(&hb->lock);

		@@ -1640,8 +1636,6 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset)

		spin_unlock(&hb->lock);
		wake_up_q(&wake_q);
		out_put_key:
		put_futex_key(&key);
		out:
		return ret;
		}
		@@ -1712,7 +1706,7 @@ retry:
		goto out;
		ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE);
		if (unlikely(ret != 0))
		goto out_put_key1;
		goto out;

		hb1 = hash_futex(&key1);
		hb2 = hash_futex(&key2);
		@@ -1730,13 +1724,13 @@ retry_private:
		* an MMU, but we might get them from range checking
		*/
		ret = op_ret;
		goto out_put_keys;
		goto out;
		}

		if (op_ret == -EFAULT) {
		ret = fault_in_user_writeable(uaddr2);
		if (ret)
		goto out_put_keys;
		goto out;
		}

		if (!(flags & FLAGS_SHARED)) {
		@@ -1744,8 +1738,6 @@ retry_private:
		goto retry_private;
		}

		put_futex_key(&key2);
		put_futex_key(&key1);
		cond_resched();
		goto retry;
		}
		@@ -1781,10 +1773,6 @@ retry_private:
		out_unlock:
		double_unlock_hb(hb1, hb2);
		wake_up_q(&wake_q);
		out_put_keys:
		put_futex_key(&key2);
		out_put_key1:
		put_futex_key(&key1);
		out:
		return ret;
		}
		@@ -1996,7 +1984,7 @@ retry:
		ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2,
		requeue_pi ? FUTEX_WRITE : FUTEX_READ);
		if (unlikely(ret != 0))
		goto out_put_key1;
		goto out;

		/*
		* The check above which compares uaddrs is not sufficient for
		@@ -2004,7 +1992,7 @@ retry:
		*/
		if (requeue_pi && match_futex(&key1, &key2)) {
		ret = -EINVAL;
		goto out_put_keys;
		goto out;
		}

		hb1 = hash_futex(&key1);
		@@ -2025,13 +2013,11 @@ retry_private:

		ret = get_user(curval, uaddr1);
		if (ret)
		goto out_put_keys;
		goto out;

		if (!(flags & FLAGS_SHARED))
		goto retry_private;

		put_futex_key(&key2);
		put_futex_key(&key1);
		goto retry;
		}
		if (curval != *cmpval) {
		@@ -2090,8 +2076,6 @@ retry_private:
		case -EFAULT:
		double_unlock_hb(hb1, hb2);
		hb_waiters_dec(hb2);
		put_futex_key(&key2);
		put_futex_key(&key1);
		ret = fault_in_user_writeable(uaddr2);
		if (!ret)
		goto retry;
		@@ -2106,8 +2090,6 @@ retry_private:
		*/
		double_unlock_hb(hb1, hb2);
		hb_waiters_dec(hb2);
		put_futex_key(&key2);
		put_futex_key(&key1);
		/*
		* Handle the case where the owner is in the middle of
		* exiting. Wait for the exit to complete otherwise
		@@ -2217,10 +2199,6 @@ out_unlock:
		wake_up_q(&wake_q);
		hb_waiters_dec(hb2);

		out_put_keys:
		put_futex_key(&key2);
		out_put_key1:
		put_futex_key(&key1);
		out:
		return ret ? ret : task_count;
		}
		@@ -2697,7 +2675,6 @@ retry_private:
		if (!(flags & FLAGS_SHARED))
		goto retry_private;

		put_futex_key(&q->key);
		goto retry;
		}

		@@ -2707,8 +2684,6 @@ retry_private:
		}

		out:
		if (ret)
		put_futex_key(&q->key);
		return ret;
		}

		@@ -2853,7 +2828,6 @@ retry_private:
		* - EAGAIN: The user space value changed.
		*/
		queue_unlock(hb);
		put_futex_key(&q.key);
		/*
		* Handle the case where the owner is in the middle of
		* exiting. Wait for the exit to complete otherwise
		@@ -2961,13 +2935,11 @@ no_block:
		put_pi_state(pi_state);
		}

		goto out_put_key;
		goto out;

		out_unlock_put_key:
		queue_unlock(hb);

		out_put_key:
		put_futex_key(&q.key);
		out:
		if (to) {
		hrtimer_cancel(&to->timer);
		@@ -2980,12 +2952,11 @@ uaddr_faulted:

		ret = fault_in_user_writeable(uaddr);
		if (ret)
		goto out_put_key;
		goto out;

		if (!(flags & FLAGS_SHARED))
		goto retry_private;

		put_futex_key(&q.key);
		goto retry;
		}

		@@ -3114,16 +3085,13 @@ retry:
		out_unlock:
		spin_unlock(&hb->lock);
		out_putkey:
		put_futex_key(&key);
		return ret;

		pi_retry:
		put_futex_key(&key);
		cond_resched();
		goto retry;

		pi_faulted:
		put_futex_key(&key);

		ret = fault_in_user_writeable(uaddr);
		if (!ret)
		@@ -3265,7 +3233,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
		*/
		ret = futex_wait_setup(uaddr, val, flags, &q, &hb);
		if (ret)
		goto out_key2;
		goto out;

		/*
		* The check above which compares uaddrs is not sufficient for
		@@ -3274,7 +3242,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
		if (match_futex(&q.key, &key2)) {
		queue_unlock(hb);
		ret = -EINVAL;
		goto out_put_keys;
		goto out;
		}

		/* Queue the futex_q, drop the hb lock, wait for wakeup. */
		@@ -3284,7 +3252,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
		ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
		spin_unlock(&hb->lock);
		if (ret)
		goto out_put_keys;
		goto out;

		/*
		* In order for us to be here, we know our q.key == key2, and since
		@@ -3374,11 +3342,6 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
		ret = -EWOULDBLOCK;
		}

		out_put_keys:
		put_futex_key(&q.key);
		out_key2:
		put_futex_key(&key2);

		out:
		if (to) {
		hrtimer_cancel(&to->timer);

Admin message