summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2022-09-22 18:46:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-15 08:02:57 +0200
commitf0b13483ee942b76350afeddd8131285cf4d3de2 (patch)
treeaeb3c6027d5876c54877baf66081bdc061c5898d
parent5bb860b8d4fcaebcde22a745e6714adfddf58773 (diff)
random: avoid reading two cache lines on irq randomness
commit 9ee0507e896b45af6d65408c77815800bce30008 upstream. In order to avoid reading and dirtying two cache lines on every IRQ, move the work_struct to the bottom of the fast_pool struct. add_ interrupt_randomness() always touches .pool and .count, which are currently split, because .mix pushes everything down. Instead, move .mix to the bottom, so that .pool and .count are always in the first cache line, since .mix is only accessed when the pool is full. Fixes: 58340f8e952b ("random: defer fast pool mixing to worker") Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/char/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 030b0adbd4dd..c8a0d3f4767a 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -920,10 +920,10 @@ EXPORT_SYMBOL_GPL(unregister_random_vmfork_notifier);
#endif
struct fast_pool {
- struct work_struct mix;
unsigned long pool[4];
unsigned long last;
unsigned int count;
+ struct work_struct mix;
};
static DEFINE_PER_CPU(struct fast_pool, irq_randomness) = {