* [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 @ 2019-12-10 10:08 Christian Hermann 2019-12-10 11:12 ` Roland Hieber 2020-08-13 11:55 ` Alexander Dahl 0 siblings, 2 replies; 5+ messages in thread From: Christian Hermann @ 2019-12-10 10:08 UTC (permalink / raw) To: ptxdist * upstream provides new tarballs only on github * pull upstream patch to enable threads * fix license identifier Signed-off-by: Christian Hermann <christian.hermann@hytera.de> --- ...-fix-compilation-with-enable-threads.patch | 33 +++++++++++++++++++ patches/haveged-1.9.8/series | 1 + rules/haveged.make | 14 ++++---- 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch create mode 100644 patches/haveged-1.9.8/series diff --git a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch new file mode 100644 index 000000000..38895a97c --- /dev/null +++ b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch @@ -0,0 +1,33 @@ +From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Thu, 14 Nov 2019 16:15:00 +0100 +Subject: [PATCH] build: Fix compilation with --enable-threads +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Previously failed with: + +havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’? + 190 | *bp++ = BUILD_THREAD; + | ^~~~~~~~~~~~ + | BUILD_THREADS + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + src/havegetune.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/havegetune.c b/src/havegetune.c +index de39c53..6f14476 100644 +--- a/src/havegetune.c ++++ b/src/havegetune.c +@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none */ + *bp++ = BUILD_CPUID; + #endif + #if NUMBER_CORES>1 +- *bp++ = BUILD_THREAD; ++ *bp++ = BUILD_THREADS; + #endif + #ifdef ONLINE_TESTS_ENABLE + *bp++ = BUILD_OLT; diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series new file mode 100644 index 000000000..cb49a0968 --- /dev/null +++ b/patches/haveged-1.9.8/series @@ -0,0 +1 @@ +0001-cb1f06-fix-compilation-with-enable-threads.patch diff --git a/rules/haveged.make b/rules/haveged.make index 80d1910f3..8f49ad49e 100644 --- a/rules/haveged.make +++ b/rules/haveged.make @@ -14,16 +14,18 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged # # Paths and names # -HAVEGED_VERSION := 1.9.2 -HAVEGED_MD5 := fb1d8b3dcbb9d06b30eccd8aa500fd31 +HAVEGED_VERSION := 1.9.8 +HAVEGED_MD5 := fba3c88e416ad99ed69849b61fdcaad0 HAVEGED := haveged-$(HAVEGED_VERSION) HAVEGED_SUFFIX := tar.gz HAVEGED_URL := \ - http://www.issihosts.com/haveged/$(HAVEGED).$(HAVEGED_SUFFIX) \ - http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX) + https://github.com/jirka-h/haveged/archive/v$(HAVEGED_VERSION).tar.gz HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX) HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED) -HAVEGED_LICENSE := GPL-3.0-only +HAVEGED_LICENSE := GPL-3.0-or-later +HAVEGED_LICENSE_FILES := \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be784b15f # ---------------------------------------------------------------------------- # Prepare @@ -42,7 +44,7 @@ HAVEGED_CONF_OPT := \ --enable-initdir=/usr/lib/systemd/system \ --disable-nistest \ --disable-olt \ - --disable-threads \ + --enable-threads \ --enable-tune # ---------------------------------------------------------------------------- -- 2.24.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 2019-12-10 10:08 [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 Christian Hermann @ 2019-12-10 11:12 ` Roland Hieber 2020-08-13 11:55 ` Alexander Dahl 1 sibling, 0 replies; 5+ messages in thread From: Roland Hieber @ 2019-12-10 11:12 UTC (permalink / raw) To: ptxdist On Tue, Dec 10, 2019 at 11:08:56AM +0100, Christian Hermann wrote: > * upstream provides new tarballs only on github > * pull upstream patch to enable threads > * fix license identifier > > Signed-off-by: Christian Hermann <christian.hermann@hytera.de> > --- > ...-fix-compilation-with-enable-threads.patch | 33 +++++++++++++++++++ > patches/haveged-1.9.8/series | 1 + > rules/haveged.make | 14 ++++---- > 3 files changed, 42 insertions(+), 6 deletions(-) > create mode 100644 patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch > create mode 100644 patches/haveged-1.9.8/series > > diff --git a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch > new file mode 100644 > index 000000000..38895a97c > --- /dev/null > +++ b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch > @@ -0,0 +1,33 @@ > +From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 > +From: Lars Wendler <polynomial-c@gentoo.org> > +Date: Thu, 14 Nov 2019 16:15:00 +0100 > +Subject: [PATCH] build: Fix compilation with --enable-threads > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Previously failed with: > + > +havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’? > + 190 | *bp++ = BUILD_THREAD; > + | ^~~~~~~~~~~~ > + | BUILD_THREADS > + > +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> > +--- > + src/havegetune.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/havegetune.c b/src/havegetune.c > +index de39c53..6f14476 100644 > +--- a/src/havegetune.c > ++++ b/src/havegetune.c > +@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none */ > + *bp++ = BUILD_CPUID; > + #endif > + #if NUMBER_CORES>1 > +- *bp++ = BUILD_THREAD; > ++ *bp++ = BUILD_THREADS; > + #endif > + #ifdef ONLINE_TESTS_ENABLE > + *bp++ = BUILD_OLT; > diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series > new file mode 100644 > index 000000000..cb49a0968 > --- /dev/null > +++ b/patches/haveged-1.9.8/series > @@ -0,0 +1 @@ > +0001-cb1f06-fix-compilation-with-enable-threads.patch > diff --git a/rules/haveged.make b/rules/haveged.make > index 80d1910f3..8f49ad49e 100644 > --- a/rules/haveged.make > +++ b/rules/haveged.make > @@ -14,16 +14,18 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged > # > # Paths and names > # > -HAVEGED_VERSION := 1.9.2 > -HAVEGED_MD5 := fb1d8b3dcbb9d06b30eccd8aa500fd31 > +HAVEGED_VERSION := 1.9.8 > +HAVEGED_MD5 := fba3c88e416ad99ed69849b61fdcaad0 > HAVEGED := haveged-$(HAVEGED_VERSION) > HAVEGED_SUFFIX := tar.gz > HAVEGED_URL := \ > - http://www.issihosts.com/haveged/$(HAVEGED).$(HAVEGED_SUFFIX) \ > - http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX) > + https://github.com/jirka-h/haveged/archive/v$(HAVEGED_VERSION).tar.gz > HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX) > HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED) > -HAVEGED_LICENSE := GPL-3.0-only > +HAVEGED_LICENSE := GPL-3.0-or-later > +HAVEGED_LICENSE_FILES := \ > + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > + file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be784b15f > Reviewed-by: Roland Hieber <rhi@pengutronix.de> Thanks for adding these! :) - Roland > # ---------------------------------------------------------------------------- > # Prepare > @@ -42,7 +44,7 @@ HAVEGED_CONF_OPT := \ > --enable-initdir=/usr/lib/systemd/system \ > --disable-nistest \ > --disable-olt \ > - --disable-threads \ > + --enable-threads \ > --enable-tune > > # ---------------------------------------------------------------------------- > -- > 2.24.0 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 2019-12-10 10:08 [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 Christian Hermann 2019-12-10 11:12 ` Roland Hieber @ 2020-08-13 11:55 ` Alexander Dahl 2020-08-17 14:06 ` Christian Hermann 1 sibling, 1 reply; 5+ messages in thread From: Alexander Dahl @ 2020-08-13 11:55 UTC (permalink / raw) To: ptxdist; +Cc: Christian Hermann Hei hei, sorry for digging in mails from last year, I just stumbled over this when migrating a BSP to a newer version … Am Dienstag, 10. Dezember 2019, 11:08:56 CEST schrieb Christian Hermann: > * upstream provides new tarballs only on github > * pull upstream patch to enable threads What's the benefit of having threads enabled for haveged? I saw two threads running on a single core ARM SoC. Sounds quite heavy for me for such a simple task haveged is supposed to do? Greets Alex > * fix license identifier > > Signed-off-by: Christian Hermann <christian.hermann@hytera.de> > --- > ...-fix-compilation-with-enable-threads.patch | 33 +++++++++++++++++++ > patches/haveged-1.9.8/series | 1 + > rules/haveged.make | 14 ++++---- > 3 files changed, 42 insertions(+), 6 deletions(-) > create mode 100644 > patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch > create mode 100644 patches/haveged-1.9.8/series > > diff --git > a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat > ch > b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat > ch new file mode 100644 > index 000000000..38895a97c > --- /dev/null > +++ > b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat > ch @@ -0,0 +1,33 @@ > +From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 > +From: Lars Wendler <polynomial-c@gentoo.org> > +Date: Thu, 14 Nov 2019 16:15:00 +0100 > +Subject: [PATCH] build: Fix compilation with --enable-threads > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Previously failed with: > + > +havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this > function); did you mean ‘BUILD_THREADS’? + 190 | *bp++ = BUILD_THREAD; > + | ^~~~~~~~~~~~ > + | BUILD_THREADS > + > +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> > +--- > + src/havegetune.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/havegetune.c b/src/havegetune.c > +index de39c53..6f14476 100644 > +--- a/src/havegetune.c > ++++ b/src/havegetune.c > +@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none > */ + *bp++ = BUILD_CPUID; > + #endif > + #if NUMBER_CORES>1 > +- *bp++ = BUILD_THREAD; > ++ *bp++ = BUILD_THREADS; > + #endif > + #ifdef ONLINE_TESTS_ENABLE > + *bp++ = BUILD_OLT; > diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series > new file mode 100644 > index 000000000..cb49a0968 > --- /dev/null > +++ b/patches/haveged-1.9.8/series > @@ -0,0 +1 @@ > +0001-cb1f06-fix-compilation-with-enable-threads.patch > diff --git a/rules/haveged.make b/rules/haveged.make > index 80d1910f3..8f49ad49e 100644 > --- a/rules/haveged.make > +++ b/rules/haveged.make > @@ -14,16 +14,18 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged > # > # Paths and names > # > -HAVEGED_VERSION := 1.9.2 > -HAVEGED_MD5 := fb1d8b3dcbb9d06b30eccd8aa500fd31 > +HAVEGED_VERSION := 1.9.8 > +HAVEGED_MD5 := fba3c88e416ad99ed69849b61fdcaad0 > HAVEGED := haveged-$(HAVEGED_VERSION) > HAVEGED_SUFFIX := tar.gz > HAVEGED_URL := \ > - http://www.issihosts.com/haveged/$(HAVEGED).$(HAVEGED_SUFFIX) \ > - http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX) > + https://github.com/jirka-h/haveged/archive/v$(HAVEGED_VERSION).tar.gz > HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX) > HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED) > -HAVEGED_LICENSE := GPL-3.0-only > +HAVEGED_LICENSE := GPL-3.0-or-later > +HAVEGED_LICENSE_FILES := \ > + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > + file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be7 > 84b15f > > # > --------------------------------------------------------------------------- > - # Prepare > @@ -42,7 +44,7 @@ HAVEGED_CONF_OPT := \ > --enable-initdir=/usr/lib/systemd/system \ > --disable-nistest \ > --disable-olt \ > - --disable-threads \ > + --enable-threads \ > --enable-tune > > # > --------------------------------------------------------------------------- > - _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 2020-08-13 11:55 ` Alexander Dahl @ 2020-08-17 14:06 ` Christian Hermann 2020-08-17 14:41 ` Alexander Dahl 0 siblings, 1 reply; 5+ messages in thread From: Christian Hermann @ 2020-08-17 14:06 UTC (permalink / raw) To: ptxdist [-- Attachment #1.1.1.1: Type: text/plain, Size: 5269 bytes --] Hi, quoting upstream (https://raw.githubusercontent.com/jirka-h/haveged/7ae444b7a0aa64a96729d78dd724b4398b9b0eaa/README.md) ``` The --enable-threads option is an experimental prototype for running multiple collection threads in a single haveged instance. The goal is to create a multi-core haveged that would spread collection overhead more evenly over the available cpu resources. ``` I assume you read it as well and and I agree this option should be disabled by default due to its experimental character (or at best made configurable). Regards On 13.08.20 13:55, Alexander Dahl wrote: > Hei hei, > > sorry for digging in mails from last year, I just stumbled over this when > migrating a BSP to a newer version … > > Am Dienstag, 10. Dezember 2019, 11:08:56 CEST schrieb Christian Hermann: >> * upstream provides new tarballs only on github >> * pull upstream patch to enable threads > > What's the benefit of having threads enabled for haveged? I saw two threads > running on a single core ARM SoC. Sounds quite heavy for me for such a simple > task haveged is supposed to do? > > Greets > Alex > >> * fix license identifier >> >> Signed-off-by: Christian Hermann <christian.hermann@hytera.de> >> --- >> ...-fix-compilation-with-enable-threads.patch | 33 +++++++++++++++++++ >> patches/haveged-1.9.8/series | 1 + >> rules/haveged.make | 14 ++++---- >> 3 files changed, 42 insertions(+), 6 deletions(-) >> create mode 100644 >> patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch >> create mode 100644 patches/haveged-1.9.8/series >> >> diff --git >> a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat >> ch >> b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat >> ch new file mode 100644 >> index 000000000..38895a97c >> --- /dev/null >> +++ >> b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat >> ch @@ -0,0 +1,33 @@ >> +From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 >> +From: Lars Wendler <polynomial-c@gentoo.org> >> +Date: Thu, 14 Nov 2019 16:15:00 +0100 >> +Subject: [PATCH] build: Fix compilation with --enable-threads >> +MIME-Version: 1.0 >> +Content-Type: text/plain; charset=UTF-8 >> +Content-Transfer-Encoding: 8bit >> + >> +Previously failed with: >> + >> +havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this >> function); did you mean ‘BUILD_THREADS’? + 190 | *bp++ = BUILD_THREAD; >> + | ^~~~~~~~~~~~ >> + | BUILD_THREADS >> + >> +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> >> +--- >> + src/havegetune.c | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/src/havegetune.c b/src/havegetune.c >> +index de39c53..6f14476 100644 >> +--- a/src/havegetune.c >> ++++ b/src/havegetune.c >> +@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none >> */ + *bp++ = BUILD_CPUID; >> + #endif >> + #if NUMBER_CORES>1 >> +- *bp++ = BUILD_THREAD; >> ++ *bp++ = BUILD_THREADS; >> + #endif >> + #ifdef ONLINE_TESTS_ENABLE >> + *bp++ = BUILD_OLT; >> diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series >> new file mode 100644 >> index 000000000..cb49a0968 >> --- /dev/null >> +++ b/patches/haveged-1.9.8/series >> @@ -0,0 +1 @@ >> +0001-cb1f06-fix-compilation-with-enable-threads.patch >> diff --git a/rules/haveged.make b/rules/haveged.make >> index 80d1910f3..8f49ad49e 100644 >> --- a/rules/haveged.make >> +++ b/rules/haveged.make >> @@ -14,16 +14,18 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged >> # >> # Paths and names >> # >> -HAVEGED_VERSION := 1.9.2 >> -HAVEGED_MD5 := fb1d8b3dcbb9d06b30eccd8aa500fd31 >> +HAVEGED_VERSION := 1.9.8 >> +HAVEGED_MD5 := fba3c88e416ad99ed69849b61fdcaad0 >> HAVEGED := haveged-$(HAVEGED_VERSION) >> HAVEGED_SUFFIX := tar.gz >> HAVEGED_URL := \ >> - http://www.issihosts.com/haveged/$(HAVEGED).$(HAVEGED_SUFFIX) \ >> - http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX) >> + https://github.com/jirka-h/haveged/archive/v$(HAVEGED_VERSION).tar.gz >> HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX) >> HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED) >> -HAVEGED_LICENSE := GPL-3.0-only >> +HAVEGED_LICENSE := GPL-3.0-or-later >> +HAVEGED_LICENSE_FILES := \ >> + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ >> + file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be7 >> 84b15f >> >> # >> --------------------------------------------------------------------------- >> - # Prepare >> @@ -42,7 +44,7 @@ HAVEGED_CONF_OPT := \ >> --enable-initdir=/usr/lib/systemd/system \ >> --disable-nistest \ >> --disable-olt \ >> - --disable-threads \ >> + --enable-threads \ >> --enable-tune >> >> # >> --------------------------------------------------------------------------- >> - > > > > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > [-- Attachment #1.1.1.2: 0x3387FE18007EEC09.asc --] [-- Type: application/pgp-keys, Size: 1791 bytes --] [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 181 bytes --] _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 2020-08-17 14:06 ` Christian Hermann @ 2020-08-17 14:41 ` Alexander Dahl 0 siblings, 0 replies; 5+ messages in thread From: Alexander Dahl @ 2020-08-17 14:41 UTC (permalink / raw) To: Christian Hermann; +Cc: ptxdist [-- Attachment #1.1: Type: text/plain, Size: 6836 bytes --] Hello Christian, On Mon, Aug 17, 2020 at 04:06:25PM +0200, Christian Hermann wrote: > quoting upstream > (https://raw.githubusercontent.com/jirka-h/haveged/7ae444b7a0aa64a96729d78dd724b4398b9b0eaa/README.md) > ``` > The --enable-threads option is an experimental prototype for running > multiple > collection threads in a single haveged instance. The goal is to create a > multi-core haveged that would spread collection overhead more evenly > over the > available cpu resources. > ``` > > I assume you read it as well and and I agree this option should be > disabled by default due to its experimental character (or at best made > configurable). Okay thanks, sufficient as explanation. I read a little more in the upstream README and also found: 286 If haveged is built with threads support, the following is present 287 288 --threads , -t [] Number of threads So this is something for startup at runtime, and probably what I would want to configure at runtime. This would mean editing the init script or systemd unit and should probably done in the BSP, not in pxtdist? Greets Alex > > Regards > > On 13.08.20 13:55, Alexander Dahl wrote: > > Hei hei, > > > > sorry for digging in mails from last year, I just stumbled over this when > > migrating a BSP to a newer version … > > > > Am Dienstag, 10. Dezember 2019, 11:08:56 CEST schrieb Christian Hermann: > >> * upstream provides new tarballs only on github > >> * pull upstream patch to enable threads > > > > What's the benefit of having threads enabled for haveged? I saw two threads > > running on a single core ARM SoC. Sounds quite heavy for me for such a simple > > task haveged is supposed to do? > > > > Greets > > Alex > > > >> * fix license identifier > >> > >> Signed-off-by: Christian Hermann <christian.hermann@hytera.de> > >> --- > >> ...-fix-compilation-with-enable-threads.patch | 33 +++++++++++++++++++ > >> patches/haveged-1.9.8/series | 1 + > >> rules/haveged.make | 14 ++++---- > >> 3 files changed, 42 insertions(+), 6 deletions(-) > >> create mode 100644 > >> patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch > >> create mode 100644 patches/haveged-1.9.8/series > >> > >> diff --git > >> a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat > >> ch > >> b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat > >> ch new file mode 100644 > >> index 000000000..38895a97c > >> --- /dev/null > >> +++ > >> b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.pat > >> ch @@ -0,0 +1,33 @@ > >> +From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 > >> +From: Lars Wendler <polynomial-c@gentoo.org> > >> +Date: Thu, 14 Nov 2019 16:15:00 +0100 > >> +Subject: [PATCH] build: Fix compilation with --enable-threads > >> +MIME-Version: 1.0 > >> +Content-Type: text/plain; charset=UTF-8 > >> +Content-Transfer-Encoding: 8bit > >> + > >> +Previously failed with: > >> + > >> +havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this > >> function); did you mean ‘BUILD_THREADS’? + 190 | *bp++ = BUILD_THREAD; > >> + | ^~~~~~~~~~~~ > >> + | BUILD_THREADS > >> + > >> +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> > >> +--- > >> + src/havegetune.c | 2 +- > >> + 1 file changed, 1 insertion(+), 1 deletion(-) > >> + > >> +diff --git a/src/havegetune.c b/src/havegetune.c > >> +index de39c53..6f14476 100644 > >> +--- a/src/havegetune.c > >> ++++ b/src/havegetune.c > >> +@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none > >> */ + *bp++ = BUILD_CPUID; > >> + #endif > >> + #if NUMBER_CORES>1 > >> +- *bp++ = BUILD_THREAD; > >> ++ *bp++ = BUILD_THREADS; > >> + #endif > >> + #ifdef ONLINE_TESTS_ENABLE > >> + *bp++ = BUILD_OLT; > >> diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series > >> new file mode 100644 > >> index 000000000..cb49a0968 > >> --- /dev/null > >> +++ b/patches/haveged-1.9.8/series > >> @@ -0,0 +1 @@ > >> +0001-cb1f06-fix-compilation-with-enable-threads.patch > >> diff --git a/rules/haveged.make b/rules/haveged.make > >> index 80d1910f3..8f49ad49e 100644 > >> --- a/rules/haveged.make > >> +++ b/rules/haveged.make > >> @@ -14,16 +14,18 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged > >> # > >> # Paths and names > >> # > >> -HAVEGED_VERSION := 1.9.2 > >> -HAVEGED_MD5 := fb1d8b3dcbb9d06b30eccd8aa500fd31 > >> +HAVEGED_VERSION := 1.9.8 > >> +HAVEGED_MD5 := fba3c88e416ad99ed69849b61fdcaad0 > >> HAVEGED := haveged-$(HAVEGED_VERSION) > >> HAVEGED_SUFFIX := tar.gz > >> HAVEGED_URL := \ > >> - http://www.issihosts.com/haveged/$(HAVEGED).$(HAVEGED_SUFFIX) \ > >> - http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX) > >> + https://github.com/jirka-h/haveged/archive/v$(HAVEGED_VERSION).tar.gz > >> HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX) > >> HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED) > >> -HAVEGED_LICENSE := GPL-3.0-only > >> +HAVEGED_LICENSE := GPL-3.0-or-later > >> +HAVEGED_LICENSE_FILES := \ > >> + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > >> + file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be7 > >> 84b15f > >> > >> # > >> --------------------------------------------------------------------------- > >> - # Prepare > >> @@ -42,7 +44,7 @@ HAVEGED_CONF_OPT := \ > >> --enable-initdir=/usr/lib/systemd/system \ > >> --disable-nistest \ > >> --disable-olt \ > >> - --disable-threads \ > >> + --enable-threads \ > >> --enable-tune > >> > >> # > >> --------------------------------------------------------------------------- > >> - > > > > > > > > > > > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > > pub RSA 2048/007EEC09 2020-06-24 Christian Hermann <christian.hermann@hytera.de> > sub RSA 2048/C750181A 2020-06-24 > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 181 bytes --] _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-17 14:41 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-10 10:08 [ptxdist] [PATCH] haveged: version bump 1.9.2 -> 1.9.8 Christian Hermann 2019-12-10 11:12 ` Roland Hieber 2020-08-13 11:55 ` Alexander Dahl 2020-08-17 14:06 ` Christian Hermann 2020-08-17 14:41 ` Alexander Dahl
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox