Unify the code of libelf and modlib, and delete the implementation of libelf #14100

anjiahao1 · 2024-10-11T08:09:54Z

Summary

Move the special usage of libelf to modlib, enhance and fix bugs in modlib, and then remove the libelf implementation. This will allow us to better reuse the code for dynamic loading

Impact

Dynamic loading/kernal mode

Testing

run rv-virt:knsh and pass ostest

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

github-actions · 2024-10-11T08:10:40Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

github-actions · 2024-10-11T08:12:27Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

github-actions · 2024-10-11T12:03:57Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

this commit is part two, all logic move to modlib, so we can remove it. and change all use defconfig Signed-off-by: anjiahao <anjiahao@xiaomi.com>

if modp is NULL, we can use export and nexport load externl symbol Signed-off-by: anjiahao <anjiahao@xiaomi.com>

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

undefine lib_free Signed-off-by: anjiahao <anjiahao@xiaomi.com>

github-actions · 2024-10-11T12:57:23Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

anjiahao1 · 2024-10-11T14:29:02Z

depends on app 2696

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

github-actions · 2024-10-11T14:33:07Z

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

masayuki2009 · 2024-10-12T06:57:59Z

@anjiahao1

I noticed that getprime crashes with rv-virt:knsh after merging this PR.

/home/ishikawa/opensource/QEMU/qemu-9.0.0/build/qemu-system-riscv32 -semihosting -nographic -cpu rv32 -M virt,aclint=on -kernel nuttx

OpenSBI v1.4
   ____                    _____ ____ _____
  / __ \                  / ____|  _ \_   _|
 | |  | |_ __   ___ _ __ | (___ | |_) || |
 | |  | | '_ \ / _ \ '_ \ \___ \|  _ < | |
 | |__| | |_) |  __/ | | |____) | |_) || |_
  \____/| .__/ \___|_| |_|_____/|____/_____|
        | |
        |_|

Platform Name             : riscv-virtio,qemu
Platform Features         : medeleg
Platform HART Count       : 1
Platform IPI Device       : aclint-mswi
Platform Timer Device     : aclint-mtimer @ 10000000Hz
Platform Console Device   : semihosting
Platform HSM Device       : ---
Platform PMU Device       : ---
Platform Reboot Device    : syscon-reboot
Platform Shutdown Device  : syscon-poweroff
Platform Suspend Device   : ---
Platform CPPC Device      : ---
Firmware Base             : 0x80000000
Firmware Size             : 319 KB
Firmware RW Offset        : 0x40000
Firmware RW Size          : 63 KB
Firmware Heap Offset      : 0x47000
Firmware Heap Size        : 35 KB (total), 2 KB (reserved), 9 KB (used), 24 KB (free)
Firmware Scratch Size     : 4096 B (total), 184 B (used), 3912 B (free)
Runtime SBI Version       : 2.0

Domain0 Name              : root
Domain0 Boot HART         : 0
Domain0 HARTs             : 0*
Domain0 Region00          : 0x00100000-0x00100fff M: (I,R,W) S/U: (R,W)
Domain0 Region01          : 0x02000000-0x0200ffff M: (I,R,W) S/U: ()
Domain0 Region02          : 0x80040000-0x8004ffff M: (R,W) S/U: ()
Domain0 Region03          : 0x80000000-0x8003ffff M: (R,X) S/U: ()
Domain0 Region04          : 0x0c400000-0x0c5fffff M: (I,R,W) S/U: (R,W)
Domain0 Region05          : 0x0c000000-0x0c3fffff M: (I,R,W) S/U: (R,W)
Domain0 Region06          : 0x00000000-0xffffffff M: () S/U: (R,W,X)
Domain0 Next Address      : 0x80200000
Domain0 Next Arg1         : 0x87e00000
Domain0 Next Mode         : S-mode
Domain0 SysReset          : yes
Domain0 SysSuspend        : yes

Boot HART ID              : 0
Boot HART Domain          : root
Boot HART Priv Version    : v1.12
Boot HART Base ISA        : rv32imafdch
Boot HART ISA Extensions  : sstc,zicntr,zihpm,zicboz,zicbom
Boot HART PMP Count       : 16
Boot HART PMP Granularity : 2 bits
Boot HART PMP Address Bits: 32
Boot HART MHPM Info       : 16 (0x0007fff8)
Boot HART MIDELEG         : 0x00001666
Boot HART MEDELEG         : 0x00f0b509
ABC
NuttShell (NSH) NuttX-12.0.0
nsh> uname -a
NuttX 12.0.0 b503b323ce Oct 12 2024 15:55:50 risc-v rv-virt
nsh> ps
  PID GROUP PRI POLICY   TYPE    NPX STATE    EVENT     SIGMASK           STACK COMMAND
    0     0   0 FIFO     Kthread   - Ready              0000000000000000 0003056 Idle_Task
    1     0 100 RR       Kthread   - Waiting  Semaphore 0000000000000000 0001984 lpwork 0x80600010 0x80600034
    2     2 100 RR       Task      - Running            0000000000000000 0003024 /system/bin/init
nsh> free
      total       used       free    maxused    maxfree  nused  nfree name
    4164028      17236    4146792     716368    3448016    343      5 Kmem
    4194304     606208    3588096    3588096 Page
nsh> hello
Hello, World!!
nsh> getprime
[1846835937280000.001000] dump_assert_info: Current Version: NuttX  12.0.0 b503b323ce Oct 12 2024 15:55:48 risc-v
[1846835937280000.001000] dump_assert_info: Assertion failed : at file: misc/lib_envpath.c:167 task: /system/bin/init process: /system/bin/init 0xc000001a
[1846835937280000.001000] up_dump_register: EPC: 802129ae
[1846835937280000.001000] up_dump_register: A0: 80606780 A1: 000000a7 A2: 00000000 A3: 00000000
[1846835937280000.001000] up_dump_register: A4: 00000002 A5: 00000000 A6: ffffffff A7: 00000001
[1846835937280000.001000] up_dump_register: T0: 00000000 T1: ffff0000 T2: 00000000 T3: 00000000
[1846835937280000.001000] up_dump_register: T4: 00030001 T5: c0802a54 T6: 00000000
[1846835937280000.001000] up_dump_register: S0: 80606000 S1: 00000000 S2: 00000000 S3: 00042022
[1846835937280000.001000] up_dump_register: S4: 80607000 S5: 00000006 S6: 80607000 S7: 8021ad94
[1846835937280000.001000] up_dump_register: S8: 000000a7 S9: 80608808 S10: c000e000 S11: 00000000
[1846835937280000.001000] up_dump_register: SP: 80609254 FP: 80606000 TP: 80608808 RA: 802129ae

lupyuen · 2024-10-13T05:38:35Z

Sorry @anjiahao1 I'm also having problems with knsh64: https://gist.github.com/lupyuen/5bfa7af7e2927e7fd1ba7b65e8c405e5

$ git reset --hard 56aa628eeca4d96d80eba21a90656f17f771a451
HEAD is now at 56aa628eec binfmt_loadmodule.c:fix build break
...
$ qemu-system-riscv64 -semihosting -M virt,aclint=on -cpu rv64 -kernel nuttx -nographic
QEMU emulator version 9.0.2
OpenSBI v1.4
ABC
dump_assert_info: Current Version: NuttX  12.7.0-RC0 56aa628eec Oct 13 2024 13:07:08 risc-v
dump_assert_info: Assertion failed : at file: init/nx_bringup.c:381 task: Idle_Task process: Kernel 0x80200fda

The previous commit works OK: https://gist.github.com/lupyuen/c6a32aab4ba186c53ffc4c1150541a8b

Any idea why this is failing? Thanks!

xiaoxiang781216 · 2024-10-13T05:41:17Z

@anjiahao1 please take a look.

anjiahao1 · 2024-10-13T05:43:06Z

Ok, I will fix this problem today.

anjiahao1 · 2024-10-13T09:32:46Z

#14205 @lupyuen @masayuki2009 hello, this pr fix it

tmedicci · 2024-10-23T18:49:16Z

Hi @anjiahao1 , we are facing problems on ESP32-S3 caused by this PR too I created an issue #14487 Could you please take a look?

tmedicci · 2024-10-30T11:06:18Z

Hi @anjiahao1 , we are facing problems on ESP32-S3 caused by this PR too I created an issue #14487 Could you please take a look?

Hi @anjiahao1 , did you see this too?

anjiahao1 · 2024-10-30T12:11:38Z

Hi @anjiahao1 , we are facing problems on ESP32-S3 caused by this PR too I created an issue #14487 Could you please take a look?

Hi @anjiahao1 , did you see this too?

Sorry, I have some things to deal with during the week. I will fix this problem on Friday.

anjiahao1 added 5 commits October 11, 2024 16:02

modlib:Modify modlib loading DYN elf file conditions

2bb9134

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib:move elf LMA logic to modlib

0eaed0e

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib:move get file info logic to modlib

9a11c61

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib:fix bug when read modlib sections name

c8e99ae

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

coredump:Move private functions to internal header files

3d107f2

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

anjiahao1 force-pushed the 101101 branch from 03598e5 to 127abcd Compare October 11, 2024 08:11

anjiahao1 added 3 commits October 11, 2024 20:03

modlib:add new api to uninitialize modp

5b9caa5

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modilib:add new args to modp record init arry

35af627

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib:support modlib can load exec

a3e73d0

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

anjiahao1 force-pushed the 101101 branch from 127abcd to 140a714 Compare October 11, 2024 12:03

anjiahao1 and others added 8 commits October 11, 2024 20:56

binfmt:use modlib api inside of elf api [1/2]

d0c995e

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

binfmt/libelf:Remove libelf implementation [2/2]

60dbfbb

this commit is part two, all logic move to modlib, so we can remove it. and change all use defconfig Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib_bind:add new args export and nexport to modlib_bind

b471c0e

if modp is NULL, we can use export and nexport load externl symbol Signed-off-by: anjiahao <anjiahao@xiaomi.com>

binfmt/modlib: move modlib_sectname to public

98b6739

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>

modlib:move modlib_findsection to common headfile

5533ac8

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib:Allow loading elf from block devices

b0f198c

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

modlib:if use LMA, not set bss

66f9a68

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

binfmt_loadmodule.c:fix build break

c56e86e

undefine lib_free Signed-off-by: anjiahao <anjiahao@xiaomi.com>

anjiahao1 force-pushed the 101101 branch from 140a714 to c56e86e Compare October 11, 2024 12:56

sabre-6quad:by pass coredump ci ci

b33718b

Signed-off-by: anjiahao <anjiahao@xiaomi.com>

xiaoxiang781216 approved these changes Oct 12, 2024

View reviewed changes

xiaoxiang781216 merged commit b503b32 into apache:master Oct 12, 2024

tmedicci mentioned this pull request Oct 23, 2024

[BUG] ELF loader on ESP32-S3 broken after #14100 #14487

Closed

1 task

anchao mentioned this pull request Feb 7, 2025

[BREAKING]libc/elf: rename modlib to elf apache/nuttx-apps#2985

Merged

Unify the code of libelf and modlib, and delete the implementation of libelf #14100

Unify the code of libelf and modlib, and delete the implementation of libelf #14100

Uh oh!

Conversation

anjiahao1 commented Oct 11, 2024

Summary

Impact

Testing

Uh oh!

github-actions bot commented Oct 11, 2024

Uh oh!

github-actions bot commented Oct 11, 2024

Uh oh!

github-actions bot commented Oct 11, 2024

Uh oh!

github-actions bot commented Oct 11, 2024

Uh oh!

anjiahao1 commented Oct 11, 2024

Uh oh!

github-actions bot commented Oct 11, 2024

Uh oh!

masayuki2009 commented Oct 12, 2024

Uh oh!

lupyuen commented Oct 13, 2024

Uh oh!

xiaoxiang781216 commented Oct 13, 2024

Uh oh!

anjiahao1 commented Oct 13, 2024

Uh oh!

anjiahao1 commented Oct 13, 2024

Uh oh!

tmedicci commented Oct 23, 2024

Uh oh!

tmedicci commented Oct 30, 2024

Uh oh!

anjiahao1 commented Oct 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants