Fix race in gpio_set_irq_enabled_with_callback #2635
Merged
Conversation
This file contains hidden or 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
The order depends on whether you're enabling or disabling
lurch
reviewed
Aug 22, 2025
Comment on lines
+199
to
204
| // when enabling, first set callback, then enable the interrupt | ||
| // when disabling, first disable the interrupt, then clear callback | ||
| if (enabled) gpio_set_irq_callback(callback); | ||
| gpio_set_irq_enabled(gpio, events, enabled); | ||
| if (!enabled) gpio_set_irq_callback(callback); | ||
| if (enabled) irq_set_enabled(IO_IRQ_BANK0, true); |
Contributor
There was a problem hiding this comment.
Is this function likely to get used in performance-critical code? If it is, perhaps it's worth reducing the branches? 🤔 (or is this one of those cases where the compiler is able to do this optimisation automatically?)
Suggested change
| // when enabling, first set callback, then enable the interrupt | |
| // when disabling, first disable the interrupt, then clear callback | |
| if (enabled) gpio_set_irq_callback(callback); | |
| gpio_set_irq_enabled(gpio, events, enabled); | |
| if (!enabled) gpio_set_irq_callback(callback); | |
| if (enabled) irq_set_enabled(IO_IRQ_BANK0, true); | |
| // when enabling, first set callback, then enable the interrupt | |
| // when disabling, first disable the interrupt, then clear callback | |
| if (enabled) { | |
| gpio_set_irq_callback(callback); | |
| gpio_set_irq_enabled(gpio, events, enabled); | |
| irq_set_enabled(IO_IRQ_BANK0, true); | |
| } else { | |
| gpio_set_irq_enabled(gpio, events, enabled); | |
| gpio_set_irq_callback(callback); | |
| } |
Contributor
Author
There was a problem hiding this comment.
I'll defer to @kilograham on this - I'm happy with either
Contributor
There was a problem hiding this comment.
it is fine; the compiler will sort it out
kilograham
approved these changes
Sep 10, 2025
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.
When disabling, if you get an interrupt after
gpio_set_irq_callbackbeforegpio_set_irq_enabledthen you get anunhandled_user_irqFix is to change where you
gpio_set_irq_callbackdepending on whether you're enabling or disabling