Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix atomic build on riscv64 #433

Closed
wants to merge 3 commits into from
Closed

Fix atomic build on riscv64 #433

wants to merge 3 commits into from

Conversation

LocutusOfBorg
Copy link
Contributor

Add check for atomic need (e.g. this fixes the build on riscv64 architecture)

@LocutusOfBorg
Add CheckAtomic.cmake from cmake-extra-modules package
559aa84 
Add check for atomic need (e.g. this fixes the build on riscv64 architecture)
@michael-methner
Copy link
Collaborator

Hello @LocutusOfBorg ,
thank you for providing the fix and documenting the license correctly.
But I rather do not pull in this commit as DLT is licensed under MPL license and I do not want to contaminate it with other licenses.

Which compilers do require this check? std::atomic is part of C++11, so actually a quite old feature.

@LocutusOfBorg
Copy link
Contributor Author

Its riscv64 architecture, some atomic are not optimizable.
Changing atomic to atomic works in avoiding the whole -latomic linkage.

@LocutusOfBorg
Revert "Add CheckAtomic.cmake from cmake-extra-modules package"
0d18b4f 
This reverts commit 559aa84.
@LocutusOfBorg
Change atomic bool to atomic int, this way riscv64 builds fine withou…
8d10933 
…t needing of external latomic, because gcc is not able to optimize natively the code.
@LocutusOfBorg LocutusOfBorg changed the title Add CheckAtomic.cmake from cmake-extra-modules package Fix atomic build on riscv64 Jan 18, 2023
@LocutusOfBorg
Copy link
Contributor Author

Hello, this is fixed in a better way from 2224cdd

@michael-methner
Copy link
Collaborator

Hello, this is fixed in a better way from 2224cdd

Do I understand you correctly, that the linked patch is also solving your issues on riscv64? Then I would close this PR.

@LocutusOfBorg
Copy link
Contributor Author

yes thanks!

@LocutusOfBorg LocutusOfBorg deleted the atomic branch January 21, 2023 15:41
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 29, 2023
@kraj
dlt-daemon: upgrade 2.18.8 -> 2.18.9 (commit: 9a2312d3512a27620d41b9a…
be3bd0a 
…325338b6e7b3d42de)

Drop patches now part of new upstream release:
- 0001-Fix-memory-leak.patch
- 0001-cmake-Link-with-libatomic-on-rv32-rv64.patch
- 0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch

Cherry-pick and propose upstream two patches to fix build failures with security hardening flags enabled
and with some systemd configuration (underlink)
- 481.patch
- 482.patch

Add new dlt-adaptor-stdin cmake optional flag
Drop PV variable, not needed anymore
Drop latomic manual added flag, upstream code changed to avoid its need
See: COVESA/dlt-daemon#433 and COVESA/dlt-daemon@2224cdd
(changed from atomic_bool to atomic_int, the latter doesn't require manual atomic library link since
it can be optimized properly by the compiler on riscv platforms)

What's Changed:

    dlt-system: fix a libc buffer overflow detection on 32bit targets by @mtitinger in openembedded#337
    dlt-daemon: create sockets using "android way" by @sebastienraillet in openembedded#333
    fixes compilation issue with clang by @sebastienraillet in openembedded#339
    dlt-daemon: Only create directories if they do not exist yet by @alexmohr in openembedded#340
    dlt-system : fix invalid free with ConfigurationFileName by @mtitinger in openembedded#342
    fix for the issue openembedded#341 by @rvalovyi in openembedded#347
    Forcibly the severity level set by @dhnatiuk1 in openembedded#346
    fix -Wformat issues reported by clang by @sebastienraillet in openembedded#349
    dlt-system: fix invalid free by removing unused TempDir by @andreirusu96 in openembedded#350
    Support for Cygwin toolchain. by @DoctorNoobingstoneIPresume in openembedded#351
    filetransfer: Return error if no free space by @ssugiura in openembedded#354
    lib: Correct VARI usage in dlt_user_log_write_uint by @ssugiura in openembedded#356
    Fix DLT User/Client tests by @andreirusu96 in openembedded#357
    tests: Deplicate unused files and variables by @ssugiura in openembedded#359
    Fix the target name in documentation by @mawillers in openembedded#372
    cmake: Add option to enable each adaptor by itself by @alexmohr in openembedded#364
    cmake: Add options to enable/disable each dlt console tool by @alexmohr in openembedded#363
    filetransfer: Fix getFileCreationDate2 stat check by @andreirusu96 in openembedded#361
    dlt_config_file_parser.c：Fix a pointer release bug in the file。 by @Leslie-bcy in openembedded#376
    Update workflow by @thanhbnq in openembedded#389
    README: Update link to github actions by @ssugiura in openembedded#392
    Fix handle returned value by @thanhbnq in openembedded#384
    systemd: install adaptor-udp service for adaptor=on by @danielweber2018 in openembedded#393
    automotive-dlt.pc: add the path to find the static library by @zeerd in openembedded#387
    enforce-trace-limit: ContextLogLevel is now enforced in the daemon by @alexmohr in openembedded#382
    dlt-daemon-connection: Start up even if not all bindings are valid by @alexmohr in openembedded#380
    dlt_common.c: Change default logging_mode by @wusto in openembedded#406
    logstorage: Truncate ECUid in Logstorage filter to prevent crash by @andreirusu96 in openembedded#402
    Update dlt_for_developers.md by @marques-bruno in openembedded#405
    dlt-gateway: Fix crash on invalid ip by @alexmohr in openembedded#381
    dlt_client:Block in connect() by @thanhbnq in openembedded#409
    dlt_daemon_client: Fix change loglevel of application by @lti9hc in openembedded#408
    Update maintainer by @thanhbnq in openembedded#410
    systemd: add support for socket activation via systemd by @alexmohr in openembedded#401
    internal-logging: Fix issues with file logging by @alexmohr in openembedded#378
    dlt_common: change output of message for log initialization by @lti9hc in openembedded#412
    Avoid memory corruption behind buffer wp in function dlt_getloginfo_conv_ascii_to_id by @michael-methner in openembedded#411
    dlt_daemon_client: Fix Control Msg ECUId comparison with active Gateway by @andreirusu96 in openembedded#414
    Fix for Resource and Memory Leak by @lti9hc in openembedded#418
    dlt-receive: set host interface and allow multiple udp multicast addresses by @thanhbnq in openembedded#420
    dlt-system: Fix buffer overflow detection on 32bit targets by @sandy-lcq in openembedded#398
    cmake: network trace enable toggle by @danielweber2018 in openembedded#424
    client: Fix Get Log Info response conversion method by @andreirusu96 in openembedded#422
    filetransfer: fix filesize divisible by blocksize case by @danielweber2018 in openembedded#383
    Updates for Coding Styles by @thanhbnq in openembedded#425
    gateway: Fix Node handling and ECUid checks by @andreirusu96 in openembedded#429
    Update contacts and removed mailing lists by @michael-methner in openembedded#431
    dlt-user: Fix crashes in dlt_free during dlt_init by @alexmohr in openembedded#362
    dlt-convert: Fix memory leak by calling dlt_file_free by @lvklevankhanh in openembedded#434
    dlt-user: fix potential non closed socket in init/free by @alexmohr in openembedded#435
    Check for negative index in dlt_file_message by @michael-methner in openembedded#437
    Fix memory leak by @lvklevankhanh in openembedded#441
    dlt-connection: add socket timeout by @alexmohr in openembedded#439
    Installs dlt.conf on android by @sebastienraillet in openembedded#446
    This changes a mispatch from fcb676a to install udp binary correctly by @smooge in openembedded#449
    logfile: exhance internal dlt logging by introducing size limits by @danielweber2018 in openembedded#369
    dlt-logd-converter: fixes android 12 compilation by @sebastienraillet in openembedded#445
    dlt-logd-converter: Fix getting log level from log msg by @RobinChenJP in openembedded#456
    house-keeper: remove infinite wait by @alexmohr in openembedded#438
    cmake: remove duplicated option message by @minminlittleshrimp in openembedded#454
    Android: Add new feature in Android bp by @minminlittleshrimp in openembedded#461
    dlt_multiple_files: remove superfluous mode bits and add header file to header list by @minminlittleshrimp in openembedded#462
    dlt-user: fix crash with certain strings by @alexmohr in openembedded#463

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
daregit pushed a commit to daregit/yocto-combined that referenced this pull request May 22, 2024
@kraj
src/meta-openembedded:dlt-daemon: upgrade 2.18.8 -> 2.18.9 (commit: 9…
2dc551e 
…a2312d3512a27620d41b9a325338b6e7b3d42de)

Drop patches now part of new upstream release:
- 0001-Fix-memory-leak.patch
- 0001-cmake-Link-with-libatomic-on-rv32-rv64.patch
- 0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch

Cherry-pick and propose upstream two patches to fix build failures with security hardening flags enabled
and with some systemd configuration (underlink)
- 481.patch
- 482.patch

Add new dlt-adaptor-stdin cmake optional flag
Drop PV variable, not needed anymore
Drop latomic manual added flag, upstream code changed to avoid its need
See: COVESA/dlt-daemon#433 and COVESA/dlt-daemon@2224cdd
(changed from atomic_bool to atomic_int, the latter doesn't require manual atomic library link since
it can be optimized properly by the compiler on riscv platforms)

What's Changed:

    dlt-system: fix a libc buffer overflow detection on 32bit targets by @mtitinger in #337
    dlt-daemon: create sockets using "android way" by @sebastienraillet in #333
    fixes compilation issue with clang by @sebastienraillet in #339
    dlt-daemon: Only create directories if they do not exist yet by @alexmohr in #340
    dlt-system : fix invalid free with ConfigurationFileName by @mtitinger in #342
    fix for the issue #341 by @rvalovyi in #347
    Forcibly the severity level set by @dhnatiuk1 in #346
    fix -Wformat issues reported by clang by @sebastienraillet in #349
    dlt-system: fix invalid free by removing unused TempDir by @andreirusu96 in #350
    Support for Cygwin toolchain. by @DoctorNoobingstoneIPresume in #351
    filetransfer: Return error if no free space by @ssugiura in #354
    lib: Correct VARI usage in dlt_user_log_write_uint by @ssugiura in #356
    Fix DLT User/Client tests by @andreirusu96 in #357
    tests: Deplicate unused files and variables by @ssugiura in #359
    Fix the target name in documentation by @mawillers in #372
    cmake: Add option to enable each adaptor by itself by @alexmohr in #364
    cmake: Add options to enable/disable each dlt console tool by @alexmohr in #363
    filetransfer: Fix getFileCreationDate2 stat check by @andreirusu96 in #361
    dlt_config_file_parser.c：Fix a pointer release bug in the file。 by @Leslie-bcy in #376
    Update workflow by @thanhbnq in #389
    README: Update link to github actions by @ssugiura in #392
    Fix handle returned value by @thanhbnq in #384
    systemd: install adaptor-udp service for adaptor=on by @danielweber2018 in #393
    automotive-dlt.pc: add the path to find the static library by @zeerd in #387
    enforce-trace-limit: ContextLogLevel is now enforced in the daemon by @alexmohr in #382
    dlt-daemon-connection: Start up even if not all bindings are valid by @alexmohr in #380
    dlt_common.c: Change default logging_mode by @wusto in #406
    logstorage: Truncate ECUid in Logstorage filter to prevent crash by @andreirusu96 in #402
    Update dlt_for_developers.md by @marques-bruno in #405
    dlt-gateway: Fix crash on invalid ip by @alexmohr in #381
    dlt_client:Block in connect() by @thanhbnq in #409
    dlt_daemon_client: Fix change loglevel of application by @lti9hc in #408
    Update maintainer by @thanhbnq in #410
    systemd: add support for socket activation via systemd by @alexmohr in #401
    internal-logging: Fix issues with file logging by @alexmohr in #378
    dlt_common: change output of message for log initialization by @lti9hc in #412
    Avoid memory corruption behind buffer wp in function dlt_getloginfo_conv_ascii_to_id by @michael-methner in #411
    dlt_daemon_client: Fix Control Msg ECUId comparison with active Gateway by @andreirusu96 in #414
    Fix for Resource and Memory Leak by @lti9hc in #418
    dlt-receive: set host interface and allow multiple udp multicast addresses by @thanhbnq in #420
    dlt-system: Fix buffer overflow detection on 32bit targets by @sandy-lcq in #398
    cmake: network trace enable toggle by @danielweber2018 in #424
    client: Fix Get Log Info response conversion method by @andreirusu96 in #422
    filetransfer: fix filesize divisible by blocksize case by @danielweber2018 in #383
    Updates for Coding Styles by @thanhbnq in #425
    gateway: Fix Node handling and ECUid checks by @andreirusu96 in #429
    Update contacts and removed mailing lists by @michael-methner in #431
    dlt-user: Fix crashes in dlt_free during dlt_init by @alexmohr in #362
    dlt-convert: Fix memory leak by calling dlt_file_free by @lvklevankhanh in #434
    dlt-user: fix potential non closed socket in init/free by @alexmohr in #435
    Check for negative index in dlt_file_message by @michael-methner in #437
    Fix memory leak by @lvklevankhanh in #441
    dlt-connection: add socket timeout by @alexmohr in #439
    Installs dlt.conf on android by @sebastienraillet in #446
    This changes a mispatch from fcb676a to install udp binary correctly by @smooge in #449
    logfile: exhance internal dlt logging by introducing size limits by @danielweber2018 in #369
    dlt-logd-converter: fixes android 12 compilation by @sebastienraillet in #445
    dlt-logd-converter: Fix getting log level from log msg by @RobinChenJP in #456
    house-keeper: remove infinite wait by @alexmohr in #438
    cmake: remove duplicated option message by @minminlittleshrimp in #454
    Android: Add new feature in Android bp by @minminlittleshrimp in #461
    dlt_multiple_files: remove superfluous mode bits and add header file to header list by @minminlittleshrimp in #462
    dlt-user: fix crash with certain strings by @alexmohr in #463

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LocutusOfBorg @michael-methner