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.

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

esp32s3_wifi_adapter.c: Fix a deadlock #15445

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

yamt
Copy link
Contributor

@yamt yamt commented Jan 7, 2025

Summary

esp32s3_wifi_adapter.c: Fix a deadlock

Fixes: #15314

Impact

Testing

esp32s3-devkit:wifi

@github-actions github-actions bot added Area: Networking Effects networking subsystem Arch: xtensa Issues related to the Xtensa architecture Size: S The size of the change in this PR is small labels Jan 7, 2025
@yamt
Copy link
Contributor Author

yamt commented Jan 7, 2025

i marked this a draft because i haven't tested this well.
i will drop the assertion patch after testing.

@yamt yamt mentioned this pull request Jan 7, 2025
1 task
net/utils/net_lock.c Outdated Show resolved Hide resolved
@fdcavalcanti
Copy link
Contributor

Hi @yamt I'll run some tests and get back to you.

@fdcavalcanti
Copy link
Contributor

Got build failures on defconfigs eth_lan9250, qemu_debug and qemu_openth. Seems like the same error on CI.

xtensa-esp32s3-elf-ld: /builds/idf/apache/incubator-nuttx/staging/libnet.a(net_lock.o):(.literal.net_lock+0x4): undefined reference to `g_wifiexcl_lock'
make[1]: *** [Makefile:176: nuttx] Error 1
make: *** [tools/Unix.mk:552: nuttx] Error 2

WiFi test is ok.

@yamt
Copy link
Contributor Author

yamt commented Jan 8, 2025

Got build failures on defconfigs eth_lan9250, qemu_debug and qemu_openth. Seems like the same error on CI.

xtensa-esp32s3-elf-ld: /builds/idf/apache/incubator-nuttx/staging/libnet.a(net_lock.o):(.literal.net_lock+0x4): undefined reference to `g_wifiexcl_lock'
make[1]: *** [Makefile:176: nuttx] Error 1
make: *** [tools/Unix.mk:552: nuttx] Error 2

WiFi test is ok.

thank you.
was it (WIFI test) with DEBUGASSERT enabled?

@fdcavalcanti
Copy link
Contributor

Yes, every test runs with debug assertion enabled.

@yamt yamt force-pushed the esp32s3-wifi-deadlock branch from ac3dda4 to 34c8a38 Compare January 8, 2025 11:29
@github-actions github-actions bot added Size: XS The size of the change in this PR is very small and removed Area: Networking Effects networking subsystem Size: S The size of the change in this PR is small labels Jan 8, 2025
@yamt
Copy link
Contributor Author

yamt commented Jan 8, 2025

Yes, every test runs with debug assertion enabled.

ok. thank you.
i now dropped the assertion patch from this PR.

@yamt yamt marked this pull request as ready for review January 8, 2025 11:30
Copy link
Contributor

@fdcavalcanti fdcavalcanti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@xiaoxiang781216 xiaoxiang781216 merged commit c0eaf12 into apache:master Jan 8, 2025
13 checks passed
yamt added a commit to yamt/incubator-nuttx that referenced this pull request Jan 14, 2025
yamt added a commit to yamt/incubator-nuttx that referenced this pull request Jan 14, 2025
yamt added a commit to yamt/incubator-nuttx that referenced this pull request Jan 14, 2025
yamt added a commit to yamt/incubator-nuttx that referenced this pull request Jan 14, 2025
yamt added a commit to yamt/incubator-nuttx that referenced this pull request Jan 14, 2025
xiaoxiang781216 pushed a commit that referenced this pull request Jan 14, 2025
xiaoxiang781216 pushed a commit that referenced this pull request Jan 14, 2025
xiaoxiang781216 pushed a commit that referenced this pull request Jan 14, 2025
xiaoxiang781216 pushed a commit that referenced this pull request Jan 14, 2025
linguini1 pushed a commit to linguini1/nuttx that referenced this pull request Jan 16, 2025
linguini1 pushed a commit to linguini1/nuttx that referenced this pull request Jan 16, 2025
linguini1 pushed a commit to linguini1/nuttx that referenced this pull request Jan 16, 2025
linguini1 pushed a commit to linguini1/nuttx that referenced this pull request Jan 16, 2025
linguini1 pushed a commit to linguini1/nuttx that referenced this pull request Jan 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Arch: xtensa Issues related to the Xtensa architecture Size: XS The size of the change in this PR is very small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] esp32s3 wifi deadlock
3 participants