Skip to content

Comments

sched/spinlock: Refactor critical section implementation with rspinlock foundation and SMP optimization#18135

Closed
hujun260 wants to merge 8 commits intoapache:masterfrom
hujun260:apache_remove_csection
Closed

sched/spinlock: Refactor critical section implementation with rspinlock foundation and SMP optimization#18135
hujun260 wants to merge 8 commits intoapache:masterfrom
hujun260:apache_remove_csection

Conversation

@hujun260
Copy link
Contributor

@hujun260 hujun260 commented Jan 24, 2026 •
edited
Loading

Summary

This pull request refactors the NuttX critical section implementation to use rspinlock_t as the unified foundation while optimizing performance for both SMP and non-SMP configurations. The series introduces enhanced spinlock operations, consolidates the scheduler interface, and eliminates deprecated synchronization mechanisms.

should merge after apache/nuttx-apps#3375

Changes Made

  1. Critical Section Refactoring - Standardize interface naming, remove redundant declarations, and consolidate SMP/non-SMP code paths for improved maintainability and reduced compilation complexity.

  2. Performance Optimization - Optimize critical section scope by narrowing protection windows to essential operations only, reducing interrupt latency and improving system responsiveness.

  3. Architecture Consolidation - Replace up_switch_context with unified nxsched_switch interface across all architecture implementations for improved consistency and reduced code duplication.

  4. Cleanup and Removal - Remove deprecated irqcount field and unnecessary preprocessor directives, simplifying the TCB structure and reducing memory overhead.

TEST

OSTEST pass

@github-actions github-actions bot added Area: Tooling Arch: arm Issues related to ARM (32-bit) architecture Arch: arm64 Issues related to ARM64 (64-bit) architecture Arch: risc-v Issues related to the RISC-V (32-bit or 64-bit) architecture Arch: simulator Issues related to the SIMulator Arch: sparc Issues related to the SPARC architecture Arch: x86_64 Issues related to the x86_64 architecture Arch: xtensa Issues related to the Xtensa architecture Area: Drivers Drivers issues Area: File System File System issues Area: OS Components OS Components issues Area: USB Size: XL The size of the change in this PR is very large. Consider breaking down the PR into smaller pieces. labels Jan 24, 2026
@hujun260 hujun260 force-pushed the apache_remove_csection branch from 4e30316 to 3435fb0 Compare January 24, 2026 09:04
@hujun260 hujun260 force-pushed the apache_remove_csection branch 8 times, most recently from f2e017a to 027169c Compare February 1, 2026 05:11
@github-actions github-actions bot added the Area: Sensors Sensors issues label Feb 1, 2026
@hujun260 hujun260 force-pushed the apache_remove_csection branch 9 times, most recently from 4b4d2ba to 9bb5a7a Compare February 3, 2026 07:02
@hujun260
sched/irq/irq_csection.c: remove #undef
96bf356 
Remove unnecessary preprocessor #undef directives to improve code
clarity and reduce conditional compilation complexity. This cleanup
aligns with the refactored critical section interface.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260
arch: use nxsched_switch replace up_switch_context
4cea96f 
Consolidate architecture-specific context switching by replacing
up_switch_context with unified nxsched_switch interface, reducing
code duplication and improving scheduler integration consistency
across all architecture implementations.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260
sched: Shorten the scope of critical section protection
607b507 
Optimize critical section usage by reducing protection scope to only
cover essential operations, improving system responsiveness and
reducing interrupt latency while maintaining synchronization safety.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260
sched: The critical section is implemented based on rspinlock.
df9483a 
Refactor critical section implementation to use rspinlock_t as the
foundation, providing consistent synchronization semantics across SMP
and non-SMP configurations with improved nesting support and reduced
overhead.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260
tcb: remove unused irqcount
92a0bed 
Clean up and remove the deprecated irqcount field from task structures
as it is no longer used by the refactored critical section implementation.
This simplifies the TCB structure and reduces memory overhead.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260
sched: inline enter_critical_section
4d3c0fa 
Inline enter_critical_section function calls in performance-critical
paths to reduce function call overhead while maintaining consistent
semantics, improving overall system latency and responsiveness in
real-time scenarios.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260
critical_section: use up_irq_save/restore in non SMP
0844478 
Optimize critical section implementation for non-SMP configurations by
directly using up_irq_save/restore instead of rspinlock operations,
reducing context switch overhead while maintaining compatibility with
SMP code paths.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260 hujun260 force-pushed the apache_remove_csection branch from 9bb5a7a to e10bf58 Compare February 3, 2026 10:29
jerpelea
jerpelea requested changes Feb 3, 2026
View reviewed changes
Copy link
Contributor

@jerpelea jerpelea left a comment

Choose a reason for hiding this comment

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

please split the PR in multple PRs that can be understood and reviewed

1.Critical Section Refactoring - Standardize interface naming, remove redundant declarations, and consolidate SMP/non-SMP code paths for improved maintainability and reduced compilation complexity.

2.Performance Optimization - Optimize critical section scope by narrowing protection windows to essential operations only, reducing interrupt latency and improving system responsiveness.

3.Architecture Consolidation - Replace up_switch_context with unified nxsched_switch interface across all architecture implementations for improved consistency and reduced code duplication.

4.Cleanup and Removal - Remove deprecated irqcount field and unnecessary preprocessor directives, simplifying the TCB structure and reducing memory overhead.

@hujun260
xarch: add missing spinlock.h includes for critical section support
b94ef26 
Add #include <nuttx/spinlock.h> to source files across avr, mips,
renesas, and sparc architectures that use irqstate_t and critical
section functions but were missing the required header file.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
@hujun260 hujun260 force-pushed the apache_remove_csection branch from e10bf58 to b94ef26 Compare February 3, 2026 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anchao anchao anchao requested changes

@cederom cederom cederom requested changes

@jerpelea jerpelea jerpelea requested changes

@linguini1 linguini1 linguini1 requested changes

@xiaoxiang781216 xiaoxiang781216 xiaoxiang781216 left review comments

@Donny9 Donny9 Awaiting requested review from Donny9 Donny9 is a code owner

@GUIDINGLI GUIDINGLI Awaiting requested review from GUIDINGLI GUIDINGLI is a code owner

@pussuw pussuw Awaiting requested review from pussuw pussuw is a code owner

@masayuki2009 masayuki2009 Awaiting requested review from masayuki2009 masayuki2009 is a code owner

@davids5 davids5 Awaiting requested review from davids5 davids5 is a code owner

@yf13 yf13 Awaiting requested review from yf13 yf13 is a code owner

@yamt yamt Awaiting requested review from yamt yamt is a code owner

@pkarashchenko pkarashchenko Awaiting requested review from pkarashchenko pkarashchenko is a code owner

@gustavonihei gustavonihei Awaiting requested review from gustavonihei gustavonihei is a code owner

@fjpanag fjpanag Awaiting requested review from fjpanag fjpanag is a code owner

@Ouss4 Ouss4 Awaiting requested review from Ouss4 Ouss4 is a code owner

@raiden00pl raiden00pl Awaiting requested review from raiden00pl raiden00pl is a code owner

@simbit18 simbit18 Awaiting requested review from simbit18 simbit18 is a code owner

@acassis acassis Awaiting requested review from acassis acassis is a code owner

@michallenc michallenc Awaiting requested review from michallenc michallenc is a code owner

@hartmannathan hartmannathan Awaiting requested review from hartmannathan hartmannathan is a code owner

@btashton btashton Awaiting requested review from btashton btashton will be requested when the pull request is marked ready for review btashton is a code owner

@antmerlino antmerlino Awaiting requested review from antmerlino antmerlino will be requested when the pull request is marked ready for review antmerlino is a code owner

@johannes-nivus johannes-nivus Awaiting requested review from johannes-nivus johannes-nivus will be requested when the pull request is marked ready for review johannes-nivus is a code owner

@adamfeuer adamfeuer Awaiting requested review from adamfeuer adamfeuer will be requested when the pull request is marked ready for review adamfeuer is a code owner

@liuguo09 liuguo09 Awaiting requested review from liuguo09 liuguo09 will be requested when the pull request is marked ready for review liuguo09 is a code owner

@lupyuen lupyuen Awaiting requested review from lupyuen lupyuen will be requested when the pull request is marked ready for review lupyuen is a code owner

@fdcavalcanti fdcavalcanti Awaiting requested review from fdcavalcanti fdcavalcanti will be requested when the pull request is marked ready for review fdcavalcanti is a code owner

@tmedicci tmedicci Awaiting requested review from tmedicci tmedicci will be requested when the pull request is marked ready for review tmedicci is a code owner

@saramonteiro saramonteiro Awaiting requested review from saramonteiro saramonteiro will be requested when the pull request is marked ready for review saramonteiro is a code owner

@patacongo patacongo Awaiting requested review from patacongo patacongo will be requested when the pull request is marked ready for review patacongo is a code owner

Assignees

No one assigned

Labels

Arch: arm Issues related to ARM (32-bit) architecture Arch: arm64 Issues related to ARM64 (64-bit) architecture Arch: avr Issues related to all AVR(8-bit or 32-bit) architectures Arch: mips Issues related to the MIPS architecture Arch: renesas Issues related to the Renesas chips Arch: risc-v Issues related to the RISC-V (32-bit or 64-bit) architecture Arch: simulator Issues related to the SIMulator Arch: sparc Issues related to the SPARC architecture Arch: x86_64 Issues related to the x86_64 architecture Arch: xtensa Issues related to the Xtensa architecture Area: Audio Area: Drivers Drivers issues Area: File System File System issues Area: Networking Effects networking subsystem Area: OS Components OS Components issues Area: Sensors Sensors issues Area: Tooling Area: USB Area: Video Board: arm Board: mips Board: risc-v Board: xtensa Size: L The size of the change in this PR is large Size: M The size of the change in this PR is medium Size: XL The size of the change in this PR is very large. Consider breaking down the PR into smaller pieces.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@hujun260 @xiaoxiang781216 @cederom @linguini1 @anchao @jerpelea