net: make net_get_random_once irqsave
Subsystems (2)
PATCH 1/2 net: make net_get_random_once irqsave
I initial build a non-irqsave version of net_get_random_once because I would liked to have the freedom to defer even the extraction process of get_random_bytes until the nonblocking pool is fully seeded.
I don't think this is a good idea anymore and thus this patch makes net_get_random_once irqsave. Now someone using net_get_random_once does not need to care from where it is called.
--- include/linux/net.h | 1 - net/core/utils.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/net.h +0 -1
@@ -250,7 +250,6 @@ bool __net_get_random_once(void *buf, int nbytes, bool *done,#define ___NET_RANDOM_STATIC_KEY_INIT STATIC_KEY_INIT_FALSE#endif /* HAVE_JUMP_LABEL */ -/* BE CAREFUL: this function is not interrupt safe */ #define net_get_random_once (buf, nbytes) \ ({ \ bool ___ret = false; \
net/core/utils.c +4 -3
@@ -370,16 +370,17 @@ bool __net_get_random_once(void *buf, int nbytes, bool *done, struct static_key *done_key) {static DEFINE_SPINLOCK (lock); +unsigned long flags; -spin_lock_bh (&lock); +spin_lock_irqsave (&lock, flags);if (*done) { -spin_unlock_bh (&lock); +spin_unlock_irqrestore (&lock, flags);return false; }get_random_bytes (buf, nbytes); *done = true; -spin_unlock_bh (&lock); +spin_unlock_irqrestore (&lock, flags);__net_random_once_disable_jump (done_key);
Signature · 1 line
1.8.3.1
PATCH v2 1/2 net: make net_get_random_once irq safe
I initial build non irq safe version of net_get_random_once because I would liked to have the freedom to defer even the extraction process of get_random_bytes until the nonblocking pool is fully seeded.
I don't think this is a good idea anymore and thus this patch makes net_get_random_once irq safe. Now someone using net_get_random_once does not need to care from where it is called.
---
v2: Reword the commit message only. It looked horribly.
include/linux/net.h | 1 - net/core/utils.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/net.h +0 -1
@@ -250,7 +250,6 @@ bool __net_get_random_once(void *buf, int nbytes, bool *done,#define ___NET_RANDOM_STATIC_KEY_INIT STATIC_KEY_INIT_FALSE#endif /* HAVE_JUMP_LABEL */ -/* BE CAREFUL: this function is not interrupt safe */ #define net_get_random_once (buf, nbytes) \ ({ \ bool ___ret = false; \
net/core/utils.c +4 -3
@@ -370,16 +370,17 @@ bool __net_get_random_once(void *buf, int nbytes, bool *done, struct static_key *done_key) {static DEFINE_SPINLOCK (lock); +unsigned long flags; -spin_lock_bh (&lock); +spin_lock_irqsave (&lock, flags);if (*done) { -spin_unlock_bh (&lock); +spin_unlock_irqrestore (&lock, flags);return false; }get_random_bytes (buf, nbytes); *done = true; -spin_unlock_bh (&lock); +spin_unlock_irqrestore (&lock, flags);__net_random_once_disable_jump (done_key);
Signature · 1 line
1.8.3.1
From: Hannes Frederic Sowa <[email protected]>
Date: Wed, 23 Oct 2013 13:12:00 +0200
Quoted 11 lines
I initial build a non-irqsave version of
net_get_random_oncebecause I would liked to have the freedom to defer even the extraction process ofget_random_bytesuntil the nonblocking pool is fully seeded.I don't think this is a good idea anymore and thus this patch makes
net_get_random_onceirqsave. Now someone usingnet_get_random_oncedoes not need to care from where it is called.Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>
Applied.