Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-09 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable interrupts when go back with UserEvent::Expcetion

Browse Source
This commit is contained in:
Yuke Peng 2023-04-03 07:01:00 -07:00 committed by Tate, Hongliang Tian
parent 9cad3d7252
commit 207bc1e4c2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/jinux-frame/src/arch/x86/cpu.rs
View File

@ -98,6 +98,7 @@ impl UserContextApiInternal for UserContext {
call_irq_callback_functions(&self.into_trap_frame()); call_irq_callback_functions(&self.into_trap_frame());
} }
crate::arch::irq::enable_interrupts();
if self.user_context.trap_num as u16 != SYSCALL_TRAPNUM { if self.user_context.trap_num as u16 != SYSCALL_TRAPNUM {
self.trap_information = TrapInformation { self.trap_information = TrapInformation {
cr2: unsafe { x86::controlregs::cr2() }, cr2: unsafe { x86::controlregs::cr2() },
@ -106,7 +107,6 @@ impl UserContextApiInternal for UserContext {
}; };
UserEvent::Exception UserEvent::Exception
} else { } else {
crate::arch::irq::enable_interrupts();
UserEvent::Syscall UserEvent::Syscall
} }
} }

12
src/services/comps/virtio/src/device/input/mod.rs
View File

@ -1,20 +1,20 @@
// Modified from input.rs in virtio-drivers project // Modified from input.rs in virtio-drivers project
// //
// MIT License // MIT License
// //
// Copyright (c) 2022-2023 Ant Group // Copyright (c) 2022-2023 Ant Group
// Copyright (c) 2019-2020 rCore Developers // Copyright (c) 2019-2020 rCore Developers
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal // of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights // in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is // copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions: // furnished to do so, subject to the following conditions:
// //
// The above copyright notice and this permission notice shall be included in all // The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software. // copies or substantial portions of the Software.
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -22,7 +22,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// //
pub mod device; pub mod device;
use jinux_pci::{capability::vendor::virtio::CapabilityVirtioData, util::BAR}; use jinux_pci::{capability::vendor::virtio::CapabilityVirtioData, util::BAR};

2
src/services/libs/jinux-std/src/process/signal/mod.rs
View File

@ -131,7 +131,7 @@ pub fn handle_user_signal(
// Set up signal stack in user stack, // Set up signal stack in user stack,
// to avoid corrupting user stack, we minus 128 first. // to avoid corrupting user stack, we minus 128 first.
let mut user_rsp = context.gp_regs.rsp() as u64; let mut user_rsp = context.rsp() as u64;
user_rsp = user_rsp - 128; user_rsp = user_rsp - 128;
// 1. write siginfo_t // 1. write siginfo_t