-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Fix linux BLE deadlock #26418
Merged
tehampson
merged 7 commits into
project-chip:master
from
tehampson:further-fix-into-ble
May 11, 2023
Merged
Fix linux BLE deadlock #26418
tehampson
merged 7 commits into
project-chip:master
from
tehampson:further-fix-into-ble
May 11, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tehampson
commented
May 8, 2023
tehampson
referenced
this pull request
May 8, 2023
…is started (#26338) * chip-repl hits the Code is unsafe/racy assert when BLE commissioning is started * Add lock/unlock to CancelTimer * Fix a few other issue * Restyle * Small fix * Last few fixes
PR #26418: Size comparison from 6c0c5ea to f1c4ab1 Full report (1 build for cc32xx)
|
tehampson
changed the title
Rely on checking if stack lock is already aquired before acquiring
Fix linux BLE deadload
May 10, 2023
pullapprove
bot
requested review from
amitnj,
andy31415,
anush-apple,
arkq,
carol-apple,
cecille,
chrisdecenzo,
chshu,
chulspro,
cliffamzn,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis and
franck-apple
May 10, 2023 19:56
pullapprove
bot
requested review from
ksperling-apple,
lazarkov,
lpbeliveau-silabs,
LuDuda,
mlepage-google,
mrjerryjohns,
msandstedt,
mspang,
nivi-apple,
saurabhst,
selissia,
sharadb-amazon,
tcarmelveilleux,
tecimovic,
vijs,
vivien-apple,
woody-apple,
xylophone21,
younghak-hwang and
yufengwangca
May 10, 2023 19:56
bzbarsky-apple
approved these changes
May 10, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for hunting this down!
arkq
approved these changes
May 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem:
pychip_ble_start_scanning
resulted in assert while callingStartTimer
while inChipDeviceScanner::StartScan
. This resulted in chip-repl hits the Code is unsafe/racy assert when BLE commissioning is started #26338 PR being createdChipDeviceScanner::StartScan
. Those other callers callChipDeviceScanner::StartScan
from a method that was scheduled to run on the ChipStack withScheduleWork
.Solution:
ChipDeviceScanner::StartScan
is called with theChipStackLock
. These seems to allow both cases to coexist.CancelTimer
still does seem to be dependent on if it was called in scheduled work that does callTimerExpiredCallback
, or some other thread. For the time being acquiring the ChipStackLock logic over there still makes sense.Test:
chip-tool pairing ble-wifi 1 asdf asdf 20202021 3840
, no longer deadlockschip-repl
issuingasdf = chip.ble.DiscoverSync(timeoutMs=2000)
followed byfor x in asdf: print(f"TMsg {x}")
works.chip-repl
, issuingdevCtrl.CommissionWiFi(3840, 20202021, 1, "asdf", "asdf")
no longer deadlocks.