system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-23 02:55:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Kernel/aarch64: Set correct ExecutionMode of PageFault

Browse source 
Adds a helper to aarch64/Registers.h to factor out the exception class
encoding.
This commit is contained in:
Timon Kruiper 2023-01-30 10:28:17 +01:00 committed by Linus Groh
parent ecf45e191e
commit 7be7324287
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Kernel/Arch/aarch64/Interrupts.cpp
View file

@ -70,8 +70,7 @@ static PageFault page_fault_from_exception_syndrome_register(VirtualAddress faul
fault.set_access((esr_el1.ISS & (1 << 6)) == (1 << 6) ? PageFault::Access::Write : PageFault::Access::Read);
// FIXME: Set correct mode
fault.set_mode(ExecutionMode::Kernel);
fault.set_mode(Aarch64::exception_class_is_data_or_instruction_abort_from_lower_exception_level(esr_el1.EC) ? ExecutionMode::User : ExecutionMode::Kernel);
if (Aarch64::exception_class_is_instruction_abort(esr_el1.EC))
fault.set_instruction_fetch(true);

5
Kernel/Arch/aarch64/Registers.h
View file

@ -1167,6 +1167,11 @@ static inline bool exception_class_is_instruction_abort(u8 exception_class)
return exception_class == 0x20 || exception_class == 0x21;
}
static inline bool exception_class_is_data_or_instruction_abort_from_lower_exception_level(u8 exception_class)
{
return exception_class == 0x20 || exception_class == 0x24;
}
// D17.2.37 ESR_EL1, Exception Syndrome Register (EL1)
// ISS encoding for an exception from a Data Abort
// DFSC, bits [5:0]