public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Amos Kong <akong@redhat.com>
To: linux-crypto@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org,
	herbert@gondor.apana.org.au, rusty@rustcorp.com.au,
	kvm@vger.kernel.org, m@bues.ch, mpm@selenic.com,
	amit.shah@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH v5 REPOST 2/6] hw_random: move some code out mutex_lock for avoiding underlying deadlock
Date: Mon,  8 Dec 2014 16:50:36 +0800	[thread overview]
Message-ID: <1418028640-4891-3-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1418028640-4891-1-git-send-email-akong@redhat.com>

In next patch, we use reference counting for each struct hwrng,
changing reference count also needs to take mutex_lock. Before
releasing the lock, if we try to stop a kthread that waits to
take the lock to reduce the referencing count, deadlock will
occur.

Signed-off-by: Amos Kong <akong@redhat.com>
---
 drivers/char/hw_random/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index b1b6042..a0905c8 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -474,12 +474,12 @@ void hwrng_unregister(struct hwrng *rng)
 		}
 	}
 	if (list_empty(&rng_list)) {
+		mutex_unlock(&rng_mutex);
 		unregister_miscdev();
 		if (hwrng_fill)
 			kthread_stop(hwrng_fill);
-	}
-
-	mutex_unlock(&rng_mutex);
+	} else
+		mutex_unlock(&rng_mutex);
 }
 EXPORT_SYMBOL_GPL(hwrng_unregister);
 
-- 
1.9.3


  parent reply	other threads:[~2014-12-08  8:51 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-08  8:50 [PATCH v5 REPOST 0/6] fix hw_random stuck Amos Kong
2014-12-08  8:50 ` [PATCH v5 REPOST 1/6] hw_random: place mutex around read functions and buffers Amos Kong
2017-09-25 22:00   ` Dmitry Torokhov
2017-09-26  6:36     ` Pankaj Gupta
2017-09-26 16:52       ` Dmitry Torokhov
2017-09-27  6:35         ` Pankaj Gupta
2014-12-08  8:50 ` Amos Kong [this message]
2014-12-08  8:50 ` [PATCH v5 REPOST 3/6] hw_random: use reference counts on each struct hwrng Amos Kong
2014-12-08  8:50 ` [PATCH v5 REPOST 4/6] hw_random: fix unregister race Amos Kong
2014-12-08  8:50 ` [PATCH v5 REPOST 5/6] hw_random: don't double-check old_rng Amos Kong
2014-12-08  8:50 ` [PATCH v5 REPOST 6/6] hw_random: don't init list element we're about to add to list Amos Kong
2014-12-22 12:05 ` [PATCH v5 REPOST 0/6] fix hw_random stuck Herbert Xu

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=1418028640-4891-3-git-send-email-akong@redhat.com \
    --to=akong@redhat.com \
    --cc=amit.shah@redhat.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=kvm@vger.kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m@bues.ch \
    --cc=mpm@selenic.com \
    --cc=rusty@rustcorp.com.au \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox