From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Julia Cartwright <julia@ni.com>,
Daniel Wagner <daniel.wagner@siemens.com>,
tom.zanussi@linux.intel.com, Alex Shi <alex.shi@linaro.org>
Subject: [PATCH RT 02/13] random: avoid preempt_disable()ed section
Date: Wed, 17 Jan 2018 10:14:06 -0500 [thread overview]
Message-ID: <20180117151430.804706484@goodmis.org> (raw)
In-Reply-To: 20180117151404.093229667@goodmis.org
[-- Attachment #1: 0002-random-avoid-preempt_disable-ed-section.patch --]
[-- Type: text/plain, Size: 2158 bytes --]
3.18.91-rt98-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
extract_crng() will use sleeping locks while in a preempt_disable()
section due to get_cpu_var().
Work around it with local_locks.
Cc: stable-rt@vger.kernel.org # where it applies to
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
drivers/char/random.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c
index acb8e7c218d1..06c4b06fcea0 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -260,6 +260,7 @@
#include <linux/irq.h>
#include <linux/syscalls.h>
#include <linux/completion.h>
+#include <linux/locallock.h>
#include <asm/processor.h>
#include <asm/uaccess.h>
@@ -1712,6 +1713,7 @@ int random_int_secret_init(void)
static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash)
__aligned(sizeof(unsigned long));
+static DEFINE_LOCAL_IRQ_LOCK(hash_entropy_int_lock);
/*
* Get a random word for internal kernel use only. Similar to urandom but
@@ -1727,12 +1729,12 @@ unsigned int get_random_int(void)
if (arch_get_random_int(&ret))
return ret;
- hash = get_cpu_var(get_random_int_hash);
+ hash = get_locked_var(hash_entropy_int_lock, get_random_int_hash);
hash[0] += current->pid + jiffies + random_get_entropy();
md5_transform(hash, random_int_secret);
ret = hash[0];
- put_cpu_var(get_random_int_hash);
+ put_locked_var(hash_entropy_int_lock, get_random_int_hash);
return ret;
}
@@ -1749,12 +1751,12 @@ unsigned long get_random_long(void)
if (arch_get_random_long(&ret))
return ret;
- hash = get_cpu_var(get_random_int_hash);
+ hash = get_locked_var(hash_entropy_int_lock, get_random_int_hash);
hash[0] += current->pid + jiffies + random_get_entropy();
md5_transform(hash, random_int_secret);
ret = *(unsigned long *)hash;
- put_cpu_var(get_random_int_hash);
+ put_locked_var(hash_entropy_int_lock, get_random_int_hash);
return ret;
}
--
2.13.2
next prev parent reply other threads:[~2018-01-17 15:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-17 15:14 [PATCH RT 00/13] Linux 3.18.91-rt98-rc1 Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 01/13] rtmutex: Make lock_killable work Steven Rostedt
2018-01-17 15:14 ` Steven Rostedt [this message]
2018-01-17 15:14 ` [PATCH RT 03/13] sched: Prevent task state corruption by spurious lock wakeup Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 04/13] fs: convert two more BH_Uptodate_Lock related bitspinlocks Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 05/13] md/raid5: do not disable interrupts Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 06/13] locking/rt-mutex: fix deadlock in device mapper / block-IO Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 07/13] Revert "fs: jbd2: pull your plug when waiting for space" Steven Rostedt
2018-01-17 15:46 ` Sebastian Andrzej Siewior
2018-01-17 17:13 ` Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 08/13] cpu_pm: replace raw_notifier to atomic_notifier Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 09/13] kernel/hrtimer: migrate deferred timer on CPU down Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 10/13] kernel/hrtimer/hotplug: dont wake ktimersoftd while holding the hrtimer base lock Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 11/13] rt/locking: allow recursive local_trylock() Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 12/13] net: use trylock in icmp_sk Steven Rostedt
2018-01-17 15:14 ` [PATCH RT 13/13] Linux 3.18.91-rt98-rc1 Steven Rostedt
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=20180117151430.804706484@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=alex.shi@linaro.org \
--cc=bigeasy@linutronix.de \
--cc=daniel.wagner@siemens.com \
--cc=jkacur@redhat.com \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
/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).