Support nested interrupts on AArch32 (non-Cortex-M) #23636

stephanosio · 2020-03-20T13:43:32Z

arch: arm: aarch32: Rework non-Cortex-M context preservation 

The current context preservation implementation saves the spsr and
lr_irq registers, which contain the cpsr and pc register values of the
interrupted context, in the thread callee-saved block and this prevents
nesting of interrupts because these values are required to be part of
the exception stack frame to preserve the nested interrupt context.

This commit reworks the AArch32 non-Cortex-M context preservation
implementation to save the spsr and lr_irq registers in the exception
stack frame to allow preservation of the nested interrupt context as
well as the interrupted thread context.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

Includes the commits from #23518 and #23614.

Closes #22670.

zephyrbot · 2020-03-20T13:46:22Z

All checks passed.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

stephanosio · 2020-03-20T13:55:23Z

tests/kernel/interrupt:test_nested_isr Test Output

starting test - test_nested_isr
Triggering irq : 14
isr0: Enter
Triggering irq : 15
isr1: Enter
isr1: Leave
isr0: Leave
PASS - test_nested_isr

stephanosio · 2020-03-20T16:50:38Z

I just realised I have a more recent (and advanced) version of this in one of my private branches ... (it's been a while since I worked on this and my memory is failing ...). I will push that version tomorrow.

stephanosio · 2020-03-22T05:29:05Z

Shippable fails because tests/arch/arm/arm_irq_vector_table/arch.interrupt.arm.irq_vector_table is failing, but this test is not supposed to be run for qemu_cortex_r5 because its testcase.yaml has filter: CONFIG_ARMV6_M_ARMV8_M_BASELINE or CONFIG_ARMV7_M_ARMV8_M_MAINLINE.

~~It looks like we have a bug in sanitycheck?~~

cc @nashif @SebastianBoe @ulfalizer

p.s. ~~It seems only the tests that have Kconfig of their own are affected by this (tests/arch/arm/arm_irq_vector_table does).~~ Even without its own Kconfig, CMake fails.
p.s. 2. probably a CMake-related thing, not sanitycheck since it's the CMake run that is failing
p.s. 3. The direct cause is $<TARGET_FILE:zephyr_final> in

zephyr/boards/arm/qemu_cortex_r5/board.cmake

Line 17 in 0095dae

"-device;loader,file=$<TARGET_FILE:zephyr_final>,cpu-num=4"

p.s. 4. CONFIG_GEN_ISR_TABLES=n in prj.conf seems to be causing this.

~~For now, I have just changed CONFIG_GEN_ISR_TABLES=n to CONFIG_GEN_IRQ_VECTOR_TABLE=n since that achieves the same thing and does not cause a build failure.~~ Nope, that causes gen_isr_tables.py to fail on other platforms ... It seems we will need a proper fix for this.

stephanosio · 2020-03-26T10:35:54Z

Rebased

stephanosio · 2020-03-28T12:45:15Z

Rebased

The current context preservation implementation saves the spsr and lr_irq registers, which contain the cpsr and pc register values of the interrupted context, in the thread callee-saved block and this prevents nesting of interrupts because these values are required to be part of the exception stack frame to preserve the nested interrupt context. This commit reworks the AArch32 non-Cortex-M context preservation implementation to save the spsr and lr_irq registers in the exception stack frame to allow preservation of the nested interrupt context as well as the interrupted thread context. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

This commit enables nested interrupt test for the Cortex-R platforms that use the ARM Generic Interrupt Controller (GIC). Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

This commit removes the ignore tags for the tests that work after the changes in the PR zephyrproject-rtos#23636. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

stephanosio · 2020-04-01T02:16:41Z

Rebased

This commit allows the `QEMU_KERNEL_OPTION` variable, which can be overridden by the `board.cmake`, to contain references to the variables that are not available at the time of `board.cmake` inclusion, by expanding its escpaed variable references in `cmake/emu/qemu.cmake` which is included nearby the end of the root `CMakeLists.txt`. With this change, the `board.cmake` can escape variable references as follows and allow them to be expanded later: set(QEMU_KERNEL_OPTION "-device;loader,file=\$<TARGET_FILE:$\{...}>") Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

arch/arm/core/aarch32/exc_exit.S

ioannisg

Looks good - just a small questions around a scratch register

ioannisg · 2020-04-01T14:10:56Z

cc @bbolen

ioannisg · 2020-04-01T14:19:20Z

@carlocaione pls, review

This commit removes the ignore tags for the tests that work after the changes in the PR #23636. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

This commit removes the ignore tags for the tests that work after the changes in the PR zephyrproject-rtos#23636. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

stephanosio requested review from andrewboie, andyross, galak, ioannisg, MaureenHelm, nashif and wjliang as code owners March 20, 2020 13:43

stephanosio force-pushed the cortex_r_nested_irq branch from fa81128 to b7c5188 Compare March 20, 2020 13:45

zephyrbot added area: Devicetree area: Timer Timer area: Boards area: ARM ARM (32-bit) Architecture area: API Changes to public APIs area: Tests Issues related to a particular existing or missing test area: Kernel labels Mar 20, 2020

stephanosio mentioned this pull request Mar 20, 2020

Cortex-R Improvement #20594

Closed

25 tasks

stephanosio added the area: Architectures label Mar 20, 2020

stephanosio added this to the v2.3.0 milestone Mar 20, 2020

stephanosio added the DNM This PR should not be merged (Do Not Merge) label Mar 20, 2020

stephanosio force-pushed the cortex_r_nested_irq branch from b7c5188 to 5d561cd Compare March 21, 2020 15:11

stephanosio removed the DNM This PR should not be merged (Do Not Merge) label Mar 21, 2020

stephanosio force-pushed the cortex_r_nested_irq branch 2 times, most recently from 10da529 to 6690691 Compare March 22, 2020 10:29

stephanosio mentioned this pull request Mar 26, 2020

[RFC] interrupts: Do not assert on IRQ enable status when installing ISR #23518

Closed

ioannisg mentioned this pull request Mar 26, 2020

ARM: Core Stack Improvements/Bug fixes for 2.3 release #23366

Closed

17 tasks

stephanosio force-pushed the cortex_r_nested_irq branch from 932ee2e to dfe0c1c Compare March 28, 2020 12:44

stephanosio added the Release Notes To be mentioned in the release notes label Mar 30, 2020

stephanosio added 3 commits April 1, 2020 11:14

tests: kernel: interrupt: Enable nested interrupt test for Cortex-R

9d76de5

This commit enables nested interrupt test for the Cortex-R platforms that use the ARM Generic Interrupt Controller (GIC). Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

boards: qemu_cortex_r5: Remove ignore tags for working tests

d82356b

This commit removes the ignore tags for the tests that work after the changes in the PR zephyrproject-rtos#23636. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

stephanosio force-pushed the cortex_r_nested_irq branch from dfe0c1c to 2166e0e Compare April 1, 2020 02:16

stephanosio requested a review from tejlmand as a code owner April 1, 2020 02:16

stephanosio closed this Apr 1, 2020

stephanosio reopened this Apr 1, 2020

stephanosio force-pushed the cortex_r_nested_irq branch from 2166e0e to e77b825 Compare April 1, 2020 02:18

ioannisg requested a review from carlocaione April 1, 2020 07:50

ioannisg reviewed Apr 1, 2020

View reviewed changes

arch/arm/core/aarch32/exc_exit.S Show resolved Hide resolved

ioannisg reviewed Apr 1, 2020

View reviewed changes

carlocaione approved these changes Apr 1, 2020

View reviewed changes

ioannisg approved these changes Apr 1, 2020

View reviewed changes

ioannisg requested a review from SebastianBoe April 1, 2020 16:05

ioannisg self-assigned this Apr 1, 2020

ioannisg merged commit 19965f8 into zephyrproject-rtos:master Apr 2, 2020

ioannisg pushed a commit that referenced this pull request Apr 2, 2020

boards: qemu_cortex_r5: Remove ignore tags for working tests

95bdbe3

This commit removes the ignore tags for the tests that work after the changes in the PR #23636. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

stephanosio deleted the cortex_r_nested_irq branch April 23, 2020 06:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support nested interrupts on AArch32 (non-Cortex-M) #23636

Support nested interrupts on AArch32 (non-Cortex-M) #23636

stephanosio commented Mar 20, 2020 •

edited

Loading

zephyrbot commented Mar 20, 2020 •

edited

Loading

stephanosio commented Mar 20, 2020

stephanosio commented Mar 20, 2020

stephanosio commented Mar 22, 2020 •

edited

Loading

stephanosio commented Mar 26, 2020

stephanosio commented Mar 28, 2020

stephanosio commented Apr 1, 2020

ioannisg left a comment

ioannisg commented Apr 1, 2020

ioannisg commented Apr 1, 2020

Support nested interrupts on AArch32 (non-Cortex-M) #23636

Support nested interrupts on AArch32 (non-Cortex-M) #23636

Conversation

stephanosio commented Mar 20, 2020 • edited Loading

zephyrbot commented Mar 20, 2020 • edited Loading

stephanosio commented Mar 20, 2020

stephanosio commented Mar 20, 2020

stephanosio commented Mar 22, 2020 • edited Loading

stephanosio commented Mar 26, 2020

stephanosio commented Mar 28, 2020

stephanosio commented Apr 1, 2020

ioannisg left a comment

Choose a reason for hiding this comment

ioannisg commented Apr 1, 2020

ioannisg commented Apr 1, 2020

stephanosio commented Mar 20, 2020 •

edited

Loading

zephyrbot commented Mar 20, 2020 •

edited

Loading

stephanosio commented Mar 22, 2020 •

edited

Loading