rng-tools: Supply patches to fix rngd block reboot issue
PATCH 1/1 rng-tools: Supply patches to fix rngd block reboot issue
There will be issue about "Hardware RNG Entropy Gatherer Daemon slow stop" during "reboot" of CN96xx.
Backport the patches from
https://github.com/nhorman/rng-tools/commit/3e47faae108df4824531bf9c003cc1c65b7b2842
and
https://github.com/nhorman/rng-tools/commit/cf1475fbdf33d5c3a62099b6b20f2b2017d6de33
Signed-off-by De Huo <[email protected]>
--- .../0001-Allow-jitter-threads-to-exit-faster.patch | 130 +++++++++++++++++++++ .../rng-tools/0002-Daemonize-earlier-in-init.patch | 88 ++++++++++++++ meta/recipes-support/rng-tools/rng-tools_6.7.bb | 2 + 3 files changed, 220 insertions(+) create mode 100644 meta/recipes-support/rng-tools/rng-tools/0001-Allow-jitter-threads-to-exit-faster.patch create mode 100644 meta/recipes-support/rng-tools/rng-tools/0002-Daemonize-earlier-in-init.patch
meta/recipes-support/rng-tools/rng-tools/0001-Allow-jitter-threads-to-exit-faster.patch new file +130 -0
@@ -0,0 +1,130 @@ +From 3e47faae108df4824531bf9c003cc1c65b7b2842 Mon Sep 17 00:00:00 2001 +From: Neil Horman <[email protected]> +Date: Fri, 7 Jun 2019 08:51:02 -0400 +Subject: [PATCH] Allow jitter threads to exit faster + +commit:3e47faae108df4824531bf9c003cc1c65b7b2842 +https://github.com/nhorman/rng-tools + +Even with the recent pipe adjustments, it can take a long time for +jitterentropy to exit. This is because the call to jent_read_entropy +can take a long time to complete, and termination signal delivery won't +cause it to return early, like a syscall. + +Mitigate this by using sigsetjmp/siglongjmp. We set a return point at +the top of the loop for each thread, and register a signal handler to +execute a siglongjmp back to that point so that we can recheck the +active flag and break the loop as soon as a signal is delivered. + +Upstream-Status: Backport + +Signed-off-by: Neil Horman <[email protected]> +Signed-off-by: Anca Nicoleta Mihalache <[email protected]> +Signed-off-by: De Huo <[email protected]> +--- + rngd_jitter.c | 32 ++++++++++++++++++++++++++++++-- + 1 file changed, 30 insertions(+), 2 deletions(-) + +diff --git a/rngd_jitter.c b/rngd_jitter.c +index 54070ae..7f01ee9 100644 +--- a/rngd_jitter.c ++++ b/rngd_jitter.c +@@ -26,6 +26,7 @@ + #include <time.h> + #include <unistd.h> + #include <signal.h> ++#include <setjmp.h> + #include "rng-tools-config.h" + + #include <jitterentropy.h> +@@ -48,6 +49,7 @@ struct thread_data { + int active; + int done; + struct timespec slptm; ++ sigjmp_buf jmpbuf; + }; + + static struct thread_data *tdata; +@@ -228,6 +230,16 @@ static inline void update_sleep_time(struct thread_data *me, + me->slptm.tv_nsec /= 2; + } + ++void jitter_thread_exit_signal(int signum) ++{ ++ pthread_t self = pthread_self(); ++ int i; ++ for(i=0;i<num_threads;i++) { ++ if (threads[i] == self) ++ siglongjmp(tdata[i].jmpbuf, 1); ++ } ++} ++ + static void *thread_entropy_task(void *data) + { + cpu_set_t cpuset; +@@ -263,6 +275,13 @@ static void *thread_entropy_task(void *data) + goto out; + } + ++ /* ++ * Use setjmp here to allow us to return early from ++ * jent_read_entropy, as it can run for a long time ++ */ ++ if (sigsetjmp(me->jmpbuf, 1)) ++ goto out_interrupt; ++ + /* Now go to sleep until there is more work to do */ + do { + message(LOG_DAEMON|LOG_DEBUG, "JITTER thread on cpu %d wakes up for refill\n", me->core_id); +@@ -286,7 +305,11 @@ static void *thread_entropy_task(void *data) + message(LOG_DAEMON|LOG_DEBUG, "DONE Writing to pipe with return %ld\n", ret); + if (first) + me->active = 1; +- if (ret < 0) ++ /* ++ * suppress EBADF errors, as those indicate the pipe is ++ * closed and we are exiting ++ */ ++ if ((ret < 0) && (errno != EBADF)) + message(LOG_DAEMON|LOG_WARNING, "Error on pipe write: %s\n", strerror(errno)); + if (!first && !me->active) + break; +@@ -296,6 +319,7 @@ static void *thread_entropy_task(void *data) + + } while (me->active); + ++out_interrupt: + free(tmpbuf); + out: + me->done = 1; +@@ -335,6 +359,7 @@ int validate_jitter_options(struct rng *ent_src) + return 0; + } + ++ + /* + * Init JITTER + */ +@@ -349,6 +374,9 @@ int init_jitter_entropy_source(struct rng *ent_src) + #ifdef HAVE_LIBGCRYPT + char key[AES_BLOCK]; + #endif ++ ++ signal(SIGUSR1, jitter_thread_exit_signal); ++ + int ret = jent_entropy_init(); + if(ret) { + message(LOG_DAEMON|LOG_WARNING, "JITTER rng fails with code %d\n", ret); +@@ -474,8 +502,8 @@ void close_jitter_entropy_source(struct rng *ent_src) + /* And wait for completion of each thread */ + for (i=0; i < num_threads; i++) { + message(LOG_DAEMON|LOG_DEBUG, "Checking on done for thread %d\n", i); ++ pthread_kill(threads[i], SIGUSR1); + while (!tdata[i].done) +- pthread_kill(threads[i], SIGINT); + if(tdata[i].done) { + message(LOG_DAEMON|LOG_INFO, "Closing thread %d\n", tdata[i].core_id); + pthread_join(threads[i], NULL); +-- +2.23.0 +
meta/recipes-support/rng-tools/rng-tools/0002-Daemonize-earlier-in-init.patch new file +88 -0
88 lines not on this page · raw message
meta/recipes-support/rng-tools/rng-tools_6.7.bb +2 -0
@@ -13,6 +13,8 @@ SRC_URI = "\ file://init \ file://default \ file://rngd.service \ + file://0001-Allow-jitter-threads-to-exit-faster.patch \ + file://0002-Daemonize-earlier-in-init.patch \ " SRCREV = "9fc873c5af0e392632e6b736938b811f7ca97251"
Signature · 1 line
1.9.1