feat: POST_TRAP callback
#8
Open
+34
−8
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
AsakuraMizu
suggested changes
Jun 22, 2025
| @@ -17,6 +17,7 @@ core::arch::global_asm!( | |||
| #[unsafe(no_mangle)] | |||
| pub(super) fn x86_syscall_handler(tf: &mut TrapFrame) { | |||
| tf.rax = crate::trap::handle_syscall(tf, tf.rax as usize) as u64; | |||
| crate::trap::post_trap_callback(tf, true); | |||
There was a problem hiding this comment.
post_trap_callback will be called twice if x86_syscall_handler is called by x86_trap_handler when tf.vector is LEGACY_SYSCALL_VECTOR.
So that's why we split x86_syscall_handler into two functions like https://github.com/arceos-org/axcpu/pull/4/files#diff-dbe65d6f2e92e2037f4d33be8c0d4b5890892d94c06f707ab1faf49015b6e3d9R19.
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.
This PR is a reviewed feature from downstream oscamp/arceos.
For further information, please refer to: oscomp/arceos#34
some linker script updates in arceos-org/arceos#266
Description
This pull request introduces a mechanism to invoke post-trap callbacks across multiple architectures, refactors exception handling in the AArch64 assembly code, and enhances the
TrapSourceenum with helper functionality. These changes aim to improve modularity and consistency in trap handling across the codebase.Post-Trap Callback Mechanism:
src/trap.rs: Introduced a distributed slicePOST_TRAPfor registering callbacks to be invoked after a trap, and added apost_trap_callbackfunction to iterate through and call these callbacks. [1] [2]Various architecture-specific trap handlers (
src/loongarch64/trap.rs,src/riscv/trap.rs,src/x86_64/trap.rs,src/x86_64/syscall.rs): Updated to callpost_trap_callbackwith appropriate parameters after handling traps. [1] [2] [3] [4]AArch64 Exception Handling Refactor:
src/aarch64/trap.S: Updated macrosHANDLE_SYNCandHANDLE_IRQto accept asourceparameter, and modified their invocations inexception_vector_baseto pass the appropriate source value. This ensures that the source of the exception is explicitly tracked. [1] [2]src/aarch64/trap.rs: Updatedhandle_sync_exceptionandhandle_irq_exceptionto accept aTrapSourceparameter, and integratedpost_trap_callbackinto these functions to handle post-trap logic. [1] [2] [3]Enhancements to
TrapSource:src/aarch64/trap.rs: Added anis_from_usermethod to theTrapSourceenum to determine if a trap originated from user space. This simplifies checks for user-originated traps.Additional Notes
This is a step towards gradually merging downstream oscamp/arceos into the main branch.