Skip to content

software_interrupt: Add additional testing #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2021
Merged

software_interrupt: Add additional testing #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[[test]]
name = "breakpoint_exception"
name = "interrupt_handling"
harness = false

[[test]]
Expand Down
39 changes: 34 additions & 5 deletions testing/tests/breakpoint_exception.rs → testing/tests/interrupt_handling.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ use core::sync::atomic::{AtomicUsize, Ordering};
use lazy_static::lazy_static;
use testing::{exit_qemu, serial_print, serial_println, QemuExitCode};

use x86_64::instructions::interrupts;

static BREAKPOINT_HANDLER_CALLED: AtomicUsize = AtomicUsize::new(0);
static INTERRUPT_HANDLER_CALLED: AtomicUsize = AtomicUsize::new(0);

#[no_mangle]
pub extern "C" fn _start() -> ! {
Expand All @@ -16,13 +19,10 @@ pub extern "C" fn _start() -> ! {
init_test_idt();

// invoke a breakpoint exception
x86_64::instructions::interrupts::int3();
interrupts::int3();

match BREAKPOINT_HANDLER_CALLED.load(Ordering::SeqCst) {
1 => {
serial_println!("[ok]");
exit_qemu(QemuExitCode::Success);
}
1 => {}
0 => {
serial_println!("[failed]");
serial_println!(" Breakpoint handler was not called.");
Expand All @@ -35,6 +35,29 @@ pub extern "C" fn _start() -> ! {
}
}

serial_print!("interrupt 42... ");
unsafe { interrupts::software_interrupt::<42>() };
serial_print!("interrupt 77... ");
unsafe { interrupts::software_interrupt::<77>() };
serial_print!("interrupt 42... ");
unsafe { interrupts::software_interrupt::<42>() };

match INTERRUPT_HANDLER_CALLED.load(Ordering::SeqCst) {
3 => {}
0 => {
serial_println!("[failed]");
serial_println!(" Interrupt handler was not called.");
exit_qemu(QemuExitCode::Failed);
}
other => {
serial_println!("[failed]");
serial_println!(" Interrupt handler was called {} times", other);
exit_qemu(QemuExitCode::Failed);
}
}

serial_println!("[ok]");
exit_qemu(QemuExitCode::Success);
loop {}
}

Expand All @@ -49,6 +72,8 @@ lazy_static! {
static ref TEST_IDT: InterruptDescriptorTable = {
let mut idt = InterruptDescriptorTable::new();
idt.breakpoint.set_handler_fn(breakpoint_handler);
idt[42].set_handler_fn(interrupt_handler);
idt[77].set_handler_fn(interrupt_handler);
idt
};
}
Expand All @@ -60,3 +85,7 @@ pub fn init_test_idt() {
extern "x86-interrupt" fn breakpoint_handler(_stack_frame: InterruptStackFrame) {
BREAKPOINT_HANDLER_CALLED.fetch_add(1, Ordering::SeqCst);
}

extern "x86-interrupt" fn interrupt_handler(_stack_frame: InterruptStackFrame) {
INTERRUPT_HANDLER_CALLED.fetch_add(1, Ordering::SeqCst);
}