From e3b1fa5ef03e89bf2b9d476a297876f812bda4a1 Mon Sep 17 00:00:00 2001 From: lean Date: Mon, 21 Jun 2021 11:52:55 +0800 Subject: [PATCH] urngd: fix busy loop in case of ioctl cause high cpu usage --- package/system/urngd/Makefile | 2 +- .../0001-fix-high-cpu-usage-with-docker.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 package/system/urngd/patches/0001-fix-high-cpu-usage-with-docker.patch diff --git a/package/system/urngd/Makefile b/package/system/urngd/Makefile index 54a1f457d..f36b492a4 100644 --- a/package/system/urngd/Makefile +++ b/package/system/urngd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=urngd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/urngd.git diff --git a/package/system/urngd/patches/0001-fix-high-cpu-usage-with-docker.patch b/package/system/urngd/patches/0001-fix-high-cpu-usage-with-docker.patch new file mode 100644 index 000000000..a76f7dc15 --- /dev/null +++ b/package/system/urngd/patches/0001-fix-high-cpu-usage-with-docker.patch @@ -0,0 +1,19 @@ +diff --git a/urngd.c b/urngd.c +index 35ccdec..410d300 100644 +--- a/urngd.c ++++ b/urngd.c +@@ -129,9 +129,14 @@ static size_t gather_entropy(struct urngd *u) + static void low_entropy_cb(struct uloop_fd *ufd, unsigned int events) + { + struct urngd *u = container_of(ufd, struct urngd, rnd_fd); ++ size_t res; + + DEBUG(2, DEV_RANDOM " signals low entropy\n"); +- gather_entropy(u); ++ res = gather_entropy(u); ++ if (!res) { ++ DEBUG(2, "gather_entropy failed, delaying further attempts\n"); ++ sleep(60); ++ } + } + \ No newline at end of file