LKML Archive on
 help / color / Atom feed
From: "tip-bot2 for Dan Carpenter" <>
Cc: Dan Carpenter <>,
	Thomas Gleixner <>,
	"Peter Zijlstra (Intel)" <>,,,
Subject: [tip: locking/urgent] futex: Don't enable IRQs unconditionally in put_pi_state()
Date: Mon, 09 Nov 2020 13:34:57 -0000
Message-ID: <160492889756.11244.1763664400047325043.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201106085205.GA1159983@mwanda>

The following commit has been merged into the locking/urgent branch of tip:

Commit-ID:     1e106aa3509b86738769775969822ffc1ec21bf4
Author:        Dan Carpenter <>
AuthorDate:    Fri, 06 Nov 2020 11:52:05 +03:00
Committer:     Thomas Gleixner <>
CommitterDate: Mon, 09 Nov 2020 14:30:30 +01:00

futex: Don't enable IRQs unconditionally in put_pi_state()

The exit_pi_state_list() function calls put_pi_state() with IRQs disabled
and is not expecting that IRQs will be enabled inside the function.

Use the _irqsave() variant so that IRQs are restored to the original state
instead of being enabled unconditionally.

Fixes: 153fbd1226fb ("futex: Fix more put_pi_state() vs. exit_pi_state_list() races")
Signed-off-by: Dan Carpenter <>
Signed-off-by: Thomas Gleixner <>
Acked-by: Peter Zijlstra (Intel) <>
 kernel/futex.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index ac32887..00259c7 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -788,8 +788,9 @@ static void put_pi_state(struct futex_pi_state *pi_state)
 	if (pi_state->owner) {
 		struct task_struct *owner;
+		unsigned long flags;
-		raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
+		raw_spin_lock_irqsave(&pi_state->pi_mutex.wait_lock, flags);
 		owner = pi_state->owner;
 		if (owner) {
@@ -797,7 +798,7 @@ static void put_pi_state(struct futex_pi_state *pi_state)
 		rt_mutex_proxy_unlock(&pi_state->pi_mutex, owner);
-		raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
+		raw_spin_unlock_irqrestore(&pi_state->pi_mutex.wait_lock, flags);
 	if (current->pi_state_cache) {

      parent reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-06  8:52 [PATCH] " Dan Carpenter
2020-11-09 11:21 ` Peter Zijlstra
2020-11-09 13:34 ` tip-bot2 for Dan Carpenter [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=160492889756.11244.1763664400047325043.tip-bot2@tip-bot2 \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on

Archives are clonable:
	git clone --mirror lkml/git/0.git
	git clone --mirror lkml/git/1.git
	git clone --mirror lkml/git/2.git
	git clone --mirror lkml/git/3.git
	git clone --mirror lkml/git/4.git
	git clone --mirror lkml/git/5.git
	git clone --mirror lkml/git/6.git
	git clone --mirror lkml/git/7.git
	git clone --mirror lkml/git/8.git
	git clone --mirror lkml/git/9.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ \
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone