Refine the implementation of TLS by xiaoxiang781216 · Pull Request #6337 · apache/nuttx

xiaoxiang781216 · 2022-05-27T11:28:28Z

Summary

tls: Merge tls_xxx into pthread_keyxxx
libc/tls: Make tls_get_info as the pulibc function instead up_tls_info
sched/tls: Add tls_init_info and tls_dup_info
sched/tls: Add task_init_info and task_uninit_info

Impact

Code refactor

Testing

ostest

pkarashchenko · 2022-05-27T12:11:58Z

Please rebase your changes

xiaoxiang781216 · 2022-05-28T16:51:22Z

depend on: apache/nuttx-apps#1173

davids5 · 2022-05-29T10:13:29Z

@xiaoxiang781216 are the comments https://github.com/apache/incubator-nuttx/blob/a10c4dde56134f54974c4bf7f57c49e3cd1eeadb/libs/libc/tls/Kconfig#L19 still valid?

xiaoxiang781216 · 2022-05-29T11:32:11Z

@xiaoxiang781216 are the comments

https://github.com/apache/incubator-nuttx/blob/a10c4dde56134f54974c4bf7f57c49e3cd1eeadb/libs/libc/tls/Kconfig#L19

still valid?

Yes, it's here:
https://github.com/apache/incubator-nuttx/pull/6337/files#diff-2c833ffaa18374fab0d57499dc593937167b198a630cb4e9068f654aaebdc42dR308
I just mov the same code from include/nuttx/arch.h to include/nuttx/tls.h

it's always better to provide the standard api directly Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

it isn't good to change the stack size passed by caller Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

masayuki2009 · 2022-06-03T23:31:16Z

@xiaoxiang781216

I noticed that rv-virt:knsh64 failed.

$ qemu-system-riscv64 -semihosting -nographic -cpu rv64 -smp 8 -M virt -bios none -kernel ./nuttx/nuttx
ABC[    0.000000] up_assert: Assertion failed at file:init/nx_bringup.c line: 297 task: Idle Task
[    0.000000] up_assert: Assertion failed at file:common/riscv_swint.c line: 189 task: Idle Task
[    0.000000] riscv_registerdump: EPC: 00000000800071de
[    0.000000] riscv_registerdump: A0: 0000000000000000 A1: 0000000000000000 A2: 0000000010000000 A3: 0000000000000001
[    0.000000] riscv_registerdump: A4: 0000000000000001 A5: 0000000000000000 A6: 0000000000000074 A7: 000000000000006a
[    0.000000] riscv_registerdump: T0: 00000000000001ff T1: 000000000000006c T2: 000000000000002d T3: 0000000000000068
[    0.000000] riscv_registerdump: T4: 0000000000000009 T5: 000000000000002a T6: 000000000000002e
[    0.000000] riscv_registerdump: S0: 0000000080200928 S1: 0000000080206b30 S2: 0000000080200928 S3: 0000000080200918
[    0.000000] riscv_registerdump: S4: 0000000080201050 S5: 0000000000000000 S6: 0000000000000000 S7: 0000000000000000
[    0.000000] riscv_registerdump: S8: 0000000000000000 S9: 0000000000000000 S10: 0000000000000000 S11: 0000000000000000
[    0.000000] riscv_registerdump: SP: 0000000080206b20 FP: 0000000080200928 TP: 0000000000000000 RA: 00000000800071de
[    0.000000] riscv_dumpstate: sp:     0000000080200850
[    0.000000] riscv_dumpstate: IRQ stack:
[    0.000000] riscv_dumpstate:   base: 00000000802000f0
[    0.000000] riscv_dumpstate:   size: 0000000000000800
[    0.000000] riscv_stackdump: 0000000080200840: 802000f0 00000000 80006cbc 00000000 000000bd 00000000 80015138 00000000
[    0.000000] riscv_stackdump: 0000000080200860: deadbeef deadbeef 00000000 00000000 80201050 00000000 80200918 00000000
[    0.000000] riscv_stackdump: 0000000080200880: 80201050 00000000 80206a18 00000000 80206a18 00000000 800043ac 00000000
[    0.000000] riscv_stackdump: 00000000802008a0: deadbeef deadbeef 800015f6 00000000 80200928 00000000 80201050 00000000
[    0.000000] riscv_stackdump: 00000000802008c0: 80206a18 00000000 80001812 00000000 deadbeef deadbeef 00000100 00000000
[    0.000000] riscv_dumpstate: sp:     0000000080206b20
[    0.000000] riscv_dumpstate: User stack:
[    0.000000] riscv_dumpstate:   base: 0000000080206030
[    0.000000] riscv_dumpstate:   size: 0000000000000bd0
[    0.000000] riscv_dumpstate: User Stack
[    0.000000] riscv_stackdump: 0000000080206b20: 00000000 00000000 80006e50 00000000 00000129 00000000 80015280 00000000
[    0.000000] riscv_stackdump: 0000000080206b40: 00000000 00000000 00000000 00000000 00000000 00000000 80200918 00000000
[    0.000000] riscv_stackdump: 0000000080206b60: 80201064 00000000 80201068 00000000 80200928 00000000 800043ac 00000000
[    0.000000] riscv_stackdump: 0000000080206b80: 80200928 00000000 80001b48 00000000 80200928 00000000 80016400 00000000
[    0.000000] riscv_stackdump: 0000000080206ba0: 80200928 00000000 80001a94 00000000 80400000 00000000 00400000 00000000
[    0.000000] riscv_stackdump: 0000000080206bc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
[    0.000000] riscv_stackdump: 0000000080206be0: 00000000 00000000 80000d72 00000000 00000000 00000000 80000046 00000000
[    0.000000] riscv_showtasks:    PID    PRI      USED     STACK   FILLED    COMMAND
[    0.000000] riscv_showtasks:   ----   ----       744      2048    36.3%    irq
[    0.000000] riscv_dump_task:      0      0      1184      3024    39.1%    Idle Task

xiaoxiang781216 · 2022-06-04T06:22:32Z

@xiaoxiang781216

I noticed that rv-virt:knsh64 failed.

$ qemu-system-riscv64 -semihosting -nographic -cpu rv64 -smp 8 -M virt -bios none -kernel ./nuttx/nuttx
ABC[    0.000000] up_assert: Assertion failed at file:init/nx_bringup.c line: 297 task: Idle Task
[    0.000000] up_assert: Assertion failed at file:common/riscv_swint.c line: 189 task: Idle Task
[    0.000000] riscv_registerdump: EPC: 00000000800071de
[    0.000000] riscv_registerdump: A0: 0000000000000000 A1: 0000000000000000 A2: 0000000010000000 A3: 0000000000000001
[    0.000000] riscv_registerdump: A4: 0000000000000001 A5: 0000000000000000 A6: 0000000000000074 A7: 000000000000006a
[    0.000000] riscv_registerdump: T0: 00000000000001ff T1: 000000000000006c T2: 000000000000002d T3: 0000000000000068
[    0.000000] riscv_registerdump: T4: 0000000000000009 T5: 000000000000002a T6: 000000000000002e
[    0.000000] riscv_registerdump: S0: 0000000080200928 S1: 0000000080206b30 S2: 0000000080200928 S3: 0000000080200918
[    0.000000] riscv_registerdump: S4: 0000000080201050 S5: 0000000000000000 S6: 0000000000000000 S7: 0000000000000000
[    0.000000] riscv_registerdump: S8: 0000000000000000 S9: 0000000000000000 S10: 0000000000000000 S11: 0000000000000000
[    0.000000] riscv_registerdump: SP: 0000000080206b20 FP: 0000000080200928 TP: 0000000000000000 RA: 00000000800071de
[    0.000000] riscv_dumpstate: sp:     0000000080200850
[    0.000000] riscv_dumpstate: IRQ stack:
[    0.000000] riscv_dumpstate:   base: 00000000802000f0
[    0.000000] riscv_dumpstate:   size: 0000000000000800
[    0.000000] riscv_stackdump: 0000000080200840: 802000f0 00000000 80006cbc 00000000 000000bd 00000000 80015138 00000000
[    0.000000] riscv_stackdump: 0000000080200860: deadbeef deadbeef 00000000 00000000 80201050 00000000 80200918 00000000
[    0.000000] riscv_stackdump: 0000000080200880: 80201050 00000000 80206a18 00000000 80206a18 00000000 800043ac 00000000
[    0.000000] riscv_stackdump: 00000000802008a0: deadbeef deadbeef 800015f6 00000000 80200928 00000000 80201050 00000000
[    0.000000] riscv_stackdump: 00000000802008c0: 80206a18 00000000 80001812 00000000 deadbeef deadbeef 00000100 00000000
[    0.000000] riscv_dumpstate: sp:     0000000080206b20
[    0.000000] riscv_dumpstate: User stack:
[    0.000000] riscv_dumpstate:   base: 0000000080206030
[    0.000000] riscv_dumpstate:   size: 0000000000000bd0
[    0.000000] riscv_dumpstate: User Stack
[    0.000000] riscv_stackdump: 0000000080206b20: 00000000 00000000 80006e50 00000000 00000129 00000000 80015280 00000000
[    0.000000] riscv_stackdump: 0000000080206b40: 00000000 00000000 00000000 00000000 00000000 00000000 80200918 00000000
[    0.000000] riscv_stackdump: 0000000080206b60: 80201064 00000000 80201068 00000000 80200928 00000000 800043ac 00000000
[    0.000000] riscv_stackdump: 0000000080206b80: 80200928 00000000 80001b48 00000000 80200928 00000000 80016400 00000000
[    0.000000] riscv_stackdump: 0000000080206ba0: 80200928 00000000 80001a94 00000000 80400000 00000000 00400000 00000000
[    0.000000] riscv_stackdump: 0000000080206bc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
[    0.000000] riscv_stackdump: 0000000080206be0: 00000000 00000000 80000d72 00000000 00000000 00000000 80000046 00000000
[    0.000000] riscv_showtasks:    PID    PRI      USED     STACK   FILLED    COMMAND
[    0.000000] riscv_showtasks:   ----   ----       744      2048    36.3%    irq
[    0.000000] riscv_dump_task:      0      0      1184      3024    39.1%    Idle Task

let me try it.

xiaoxiang781216 · 2022-06-04T14:23:12Z

@masayuki2009 the assertion happen here:

  ret = exec_spawn(CONFIG_INIT_FILEPATH, argv, NULL,
                   CONFIG_INIT_SYMTAB, CONFIG_INIT_NEXPORTS, &attr);
  DEBUGASSERT(ret >= 0);

But I can't find init in my apps/bin/ folder. Could you point me the setup document of knsh64?

masayuki2009 · 2022-06-05T01:25:03Z

@xiaoxiang781216

But I can't find init in my apps/bin/ folder. Could you point me the setup document of knsh64?

The crash messages were incorrect.

$ qemu-system-riscv64 -semihosting -nographic -cpu rv64 -smp 8 -M virt -bios none -kernel ./nuttx
ABC
NuttShell (NSH) NuttX-10.3.0
nsh> hello
Hello, World!!
[    0.000000] riscv_exception: EXCEPTION: Store/AMO access fault. MCAUSE: 0000000000000007
[    0.000000] riscv_exception: PANIC!!! Exception = 0000000000000007
[    0.000000] up_assert: Assertion failed at file:common/riscv_exception.c line: 89 task: hello
[    0.000000] riscv_registerdump: EPC: 0000000080005c3c
[    0.000000] riscv_registerdump: A0: 0000000000000001 A1: 0000000080208038 A2: 0000000000000019 A3: 0000000080206c38
[    0.000000] riscv_registerdump: A4: 0000000080208018 A5: 0000000080208058 A6: 0000000000000101 A7: 0000000000000000
[    0.000000] riscv_registerdump: T0: 000000008000399c T1: 0000000000000000 T2: 0000000000000000 T3: 0000000000000000
[    0.000000] riscv_registerdump: T4: 0000000000000000 T5: 0000000000000000 T6: 0000000000000000
[    0.000000] riscv_registerdump: S0: 0000000080208040 S1: 0000000080206c00 S2: ffffffffffffffe0 S3: fffffffffffffff8
[    0.000000] riscv_registerdump: S4: ffffffffffffffe0 S5: 0000000000000000 S6: 0000000000000000 S7: 0000000000000000
[    0.000000] riscv_registerdump: S8: 0000000000000000 S9: 0000000000000000 S10: 0000000000000000 S11: 0000000000000000
[    0.000000] riscv_registerdump: SP: 0000000080209d90 FP: 0000000080208040 TP: 0000000000000000 RA: 0000000080005b60
[    0.000000] riscv_dumpstate: sp:     0000000080200830
[    0.000000] riscv_dumpstate: IRQ stack:
[    0.000000] riscv_dumpstate:   base: 00000000802000f0
[    0.000000] riscv_dumpstate:   size: 0000000000000800
[    0.000000] riscv_stackdump: 0000000080200820: 802000f0 00000000 80006cbc 00000000 00000059 00000000 80014ee8 00000000
[    0.000000] riscv_stackdump: 0000000080200840: deadbeef deadbeef 00000000 00000000 ffffffe0 ffffffff fffffff8 ffffffff
[    0.000000] riscv_stackdump: 0000000080200860: ffffffe0 ffffffff 80209c88 00000000 00000007 00000000 800043ac 00000000
[    0.000000] riscv_stackdump: 0000000080200880: 00000009 00000000 80001464 00000000 00000000 00000000 80201050 00000000
[    0.000000] riscv_stackdump: 00000000802008a0: 80209c88 00000000 80001bca 00000000 c0003200 00000000 80000f98 00000000
[    0.000000] riscv_stackdump: 00000000802008c0: 80209d58 00000000 80206c00 00000000 00000007 00000000 80000dfe 00000000
[    0.000000] riscv_dumpstate: sp:     0000000080209d90
[    0.000000] riscv_dumpstate: User stack:
[    0.000000] riscv_dumpstate:   base: 00000000c0004050
[    0.000000] riscv_dumpstate:   size: 00000000000007b0
[    0.000000] riscv_dumpstate: Kernel stack:
[    0.000000] riscv_dumpstate:   base: 0000000080209260
[    0.000000] riscv_dumpstate:   size: 0000000000000c00
[    0.000000] riscv_dumpstate: Kernel Stack
[    0.000000] riscv_stackdump: 0000000080209d80: 00000000 00000000 00040120 00000000 fffffff8 ffffffff 80209120 00000000
[    0.000000] riscv_stackdump: 0000000080209da0: fffffff8 ffffffff 80007a52 00000000 00000000 00000000 00000000 00000000
[    0.000000] riscv_stackdump: 0000000080209dc0: 802090c2 00000000 80208f00 00000000 802090a0 00000000 800127e4 00000000
[    0.000000] riscv_stackdump: 0000000080209de0: 80207ec0 00000000 80010c8e 00000000 802090c2 00000000 802090a0 00000000
[    0.000000] riscv_stackdump: 0000000080209e00: 80208f00 00000000 80011982 00000000 00000000 00000000 00000000 00000000
[    0.000000] riscv_stackdump: 0000000080209e20: 00000000 00000000 80011c54 00000000 00000000 00000000 800039a8 00000000
[    0.000000] riscv_stackdump: 0000000080209e40: 00000000 00000000 800015bc 00000000 c00014de 00000000 00040020 00000000
[    0.000000] riscv_showtasks:    PID    PRI      USED     STACK   FILLED    COMMAND
[    0.000000] riscv_showtasks:   ----   ----       776      2048    37.8%    irq
[    0.000000] riscv_dump_task:      0      0      1328      3024    43.9%    Idle Task
[    0.000000] riscv_dump_task:      1    100      1952      1952   100.0%!   /system/bin/init
[    0.000000] riscv_dump_task:      2    100       536      1968    27.2%    hello

It seems that the init task consumes more stack than before.
Actually, it consumed less memory before merging this PR.

qemu-system-riscv64 -semihosting -nographic -cpu rv64 -smp 8 -M virt -bios none -kernel ./nuttx
ABC
NuttShell (NSH) NuttX-10.3.0
nsh> hello
Hello, World!!
nsh> ps
  PID GROUP PRI POLICY   TYPE    NPX STATE    EVENT     SIGMASK   STACK   USED  FILLED COMMAND
    0     0   0 FIFO     Kthread N-- Ready              00000000 003024 001328  43.9%  Idle Task
    1     1 100 RR       Task    --- Running            00000000 002000 001736  86.8%! /system/bin/init
nsh>

xiaoxiang781216 · 2022-06-05T05:36:12Z

@masayuki2009 it is made by 48a0a2e. Could you try #6365?

pkarashchenko reviewed May 27, 2022

View reviewed changes

Comment thread libs/libc/tls/Make.defs

xiaoxiang781216 force-pushed the tls branch from bb86848 to be2975f Compare May 27, 2022 11:36

pkarashchenko reviewed May 27, 2022

View reviewed changes

Comment thread libs/libc/pthread/pthread_keycreate.c Outdated

Comment thread libs/libc/pthread/pthread_keydelete.c Outdated

xiaoxiang781216 force-pushed the tls branch 2 times, most recently from 2983ae1 to f096fcc Compare May 27, 2022 14:48

pkarashchenko approved these changes May 27, 2022

View reviewed changes

xiaoxiang781216 force-pushed the tls branch 2 times, most recently from 300b045 to 37ef8f9 Compare May 27, 2022 18:19

pkarashchenko self-requested a review May 27, 2022 19:05

pkarashchenko reviewed May 28, 2022

View reviewed changes

Comment thread libs/libc/pthread/pthread_setspecific.c Outdated

pkarashchenko self-requested a review May 28, 2022 14:15

xiaoxiang781216 force-pushed the tls branch 2 times, most recently from 962cfe5 to a10c4dd Compare May 28, 2022 15:54

xiaoxiang781216 changed the title ~~tls: Merge tls_xxx into pthread_keyxxx~~ Refine the implementation of TLS May 28, 2022

xiaoxiang781216 force-pushed the tls branch from a10c4dd to e5c2da2 Compare May 29, 2022 12:15

pkarashchenko reviewed May 30, 2022

View reviewed changes

Comment thread libs/libc/pthread/pthread_keycreate.c

Comment thread libs/libc/pthread/pthread_keycreate.c

Comment thread libs/libc/pthread/pthread_keydelete.c

pkarashchenko self-requested a review May 30, 2022 10:22

xiaoxiang781216 force-pushed the tls branch 2 times, most recently from b0b5925 to 0d73ae3 Compare May 30, 2022 17:48

xiaoxiang781216 mentioned this pull request May 30, 2022

system/libuv: Include nuttx/tls.h to call task local storage api apache/nuttx-apps#1177

Merged

xiaoxiang781216 force-pushed the tls branch from 0d73ae3 to c8d1fdc Compare May 30, 2022 19:59

pkarashchenko reviewed May 31, 2022

View reviewed changes

Comment thread libs/libc/pthread/pthread_keycreate.c

xiaoxiang781216 added 4 commits June 2, 2022 04:32

tls: Merge tls_xxx into pthread_keyxxx

029d8ec

it's always better to provide the standard api directly Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

sched/tls: Don't compensate the tls size to the stack size

48a0a2e

it isn't good to change the stack size passed by caller Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

libc/tls: Make tls_get_info as the pulibc function instead up_tls_info

11313e1

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

sched/tls: Add tls_init_info and tls_dup_info

90db0a5

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

sched/tls: Add task_init_info and task_uninit_info

ab46417

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

xiaoxiang781216 force-pushed the tls branch from c8d1fdc to ab46417 Compare June 1, 2022 20:32

xiaoxiang781216 requested a review from pkarashchenko June 1, 2022 20:33

pkarashchenko approved these changes Jun 3, 2022

View reviewed changes

pkarashchenko merged commit 01c8beb into apache:master Jun 3, 2022

xiaoxiang781216 deleted the tls branch June 4, 2022 06:21

xiaoxiang781216 mentioned this pull request Jun 5, 2022

sched/tls: Wrap up_info_size into tls_info_size #6365

Merged

This was referenced Jun 5, 2022

dump_task: also dump thread param when dump thread name #6367

Merged

sched/tls: Shouldn't get tls info directly from sp in kernel space #6377

Merged

Uh oh!

Conversation

xiaoxiang781216 commented May 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Impact

Testing

Uh oh!

Uh oh!

pkarashchenko commented May 27, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xiaoxiang781216 commented May 28, 2022

Uh oh!

davids5 commented May 29, 2022

Uh oh!

xiaoxiang781216 commented May 29, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

masayuki2009 commented Jun 3, 2022

Uh oh!

xiaoxiang781216 commented Jun 4, 2022

Uh oh!

xiaoxiang781216 commented Jun 4, 2022

Uh oh!

masayuki2009 commented Jun 5, 2022

Uh oh!

xiaoxiang781216 commented Jun 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

xiaoxiang781216 commented May 27, 2022 •

edited

Loading