From: Herbert Xu <herbert@gondor.apana.org.au>
To: Fengguang Wu <fengguang.wu@intel.com>,
Rusty Russell <rusty@rustcorp.com.au>, LKP <lkp@01.org>,
linux-kernel@vger.kernel.org,
Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
Amos Kong <akong@redhat.com>,
m@bues.ch, mpm@selenic.com, amit.shah@redhat.com
Subject: [PATCH 5/5] hwrng: core - Move hwrng_init call into set_current_rng
Date: Tue, 23 Dec 2014 16:40:22 +1100 [thread overview]
Message-ID: <E1Y3ICk-0007dg-OB@gondolin.me.apana.org.au> (raw)
In-Reply-To: 20141223053909.GA28001@gondor.apana.org.au
We always do hwrng_init in set_current_rng. In fact, our current
reference count system relies on this. So make this explicit by
moving hwrng_init into set_current_rng.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
drivers/char/hw_random/core.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 787ef42..32a8a86 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -71,6 +71,7 @@ MODULE_PARM_DESC(default_quality,
"default entropy content of hwrng per mill");
static void drop_current_rng(void);
+static int hwrng_init(struct hwrng *rng);
static void start_khwrngd(void);
static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size,
@@ -103,11 +104,20 @@ static inline void cleanup_rng(struct kref *kref)
complete(&rng->cleanup_done);
}
-static void set_current_rng(struct hwrng *rng)
+static int set_current_rng(struct hwrng *rng)
{
+ int err;
+
BUG_ON(!mutex_is_locked(&rng_mutex));
+
+ err = hwrng_init(rng);
+ if (err)
+ return err;
+
drop_current_rng();
current_rng = rng;
+
+ return 0;
}
static void drop_current_rng(void)
@@ -149,7 +159,7 @@ static void put_rng(struct hwrng *rng)
mutex_unlock(&rng_mutex);
}
-static inline int hwrng_init(struct hwrng *rng)
+static int hwrng_init(struct hwrng *rng)
{
if (kref_get_unless_zero(&rng->ref))
goto skip_init;
@@ -310,15 +320,9 @@ static ssize_t hwrng_attr_current_store(struct device *dev,
err = -ENODEV;
list_for_each_entry(rng, &rng_list, list) {
if (strcmp(rng->name, buf) == 0) {
- if (rng == current_rng) {
- err = 0;
- break;
- }
- err = hwrng_init(rng);
- if (err)
- break;
- set_current_rng(rng);
err = 0;
+ if (rng != current_rng)
+ err = set_current_rng(rng);
break;
}
}
@@ -481,10 +485,9 @@ int hwrng_register(struct hwrng *rng)
old_rng = current_rng;
err = 0;
if (!old_rng) {
- err = hwrng_init(rng);
+ err = set_current_rng(rng);
if (err)
goto out_unlock;
- set_current_rng(rng);
}
list_add_tail(&rng->list, &rng_list);
@@ -518,8 +521,7 @@ void hwrng_unregister(struct hwrng *rng)
tail = list_entry(rng_list.prev, struct hwrng, list);
- if (hwrng_init(tail) == 0)
- set_current_rng(tail);
+ set_current_rng(tail);
}
}
prev parent reply other threads:[~2014-12-23 5:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 3:09 [hwrng] WARNING: CPU: 0 PID: 1 at include/linux/kref.h:47 set_current_rng() Fengguang Wu
2014-12-23 5:39 ` [0/5] hwrng: Fix kref warning and underlying bugs Herbert Xu
2014-12-23 5:40 ` [PATCH 1/5] hwrng: core - Use struct completion for cleanup_done Herbert Xu
2014-12-23 23:19 ` Rusty Russell
2014-12-23 5:40 ` [PATCH 2/5] hwrng: core - Fix current_rng init/cleanup race yet again Herbert Xu
2014-12-23 23:26 ` Rusty Russell
2014-12-26 0:52 ` Herbert Xu
2014-12-23 5:40 ` [PATCH 3/5] hwrng: core - Do not register device opportunistically Herbert Xu
2014-12-23 23:29 ` Rusty Russell
2014-12-26 1:00 ` Herbert Xu
2014-12-23 5:40 ` [PATCH 4/5] hwrng: core - Drop current rng in set_current_rng Herbert Xu
2014-12-23 5:40 ` Herbert Xu [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:
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=E1Y3ICk-0007dg-OB@gondolin.me.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=akong@redhat.com \
--cc=amit.shah@redhat.com \
--cc=fengguang.wu@intel.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@01.org \
--cc=m@bues.ch \
--cc=mpm@selenic.com \
--cc=rusty@rustcorp.com.au \
/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;
as well as URLs for NNTP newsgroup(s).