1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-30 00:13:43 +02:00

CHROMIUM: avl_tool: more gracefully handle termination by SIGINT

Since interrupting the test process may be dangerous (leaving the flash
in an inconsistent state), we'll catch SIGINT and print a warning the
first time, also using it as a signal that we should stop at a
convenient time. Any following SIGINT will be handled as normal (killing
the process).

BUG=b:143251344
TEST=Run tool and verify it exits after a test with a single ^C, exits
     immediately given two.
BRANCH=None

Original-Cq-Depend: chromium:2059548
Original-Change-Id: Ib8a7799cba6dbca57dc7f1d3c87521f132c21818
Original-Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2050050
Original-Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Original-Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>

Change-Id: If43aea0580fcc7e698daad2ffe085a3c9da5bc41
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/49915
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Peter Marheine 2020-02-12 15:37:28 +11:00 committed by Edward O'Callaghan
parent 4e31838eb1
commit 32aa933b1d
4 changed files with 51 additions and 1 deletions

View File

@ -19,6 +19,7 @@ chrono = { version = "0.4", optional = true }
clap = { version = "2.33", default-features = false, optional = true }
flashrom = { path = "flashrom/" }
log = { version = "0.4", features = ["std"] }
nix = "0.14.1"
rand = "0.6.4"
serde_json = "1"
sys-info = "0.5.7"

View File

@ -42,6 +42,7 @@ use clap::{App, Arg};
use flashrom::FlashChip;
use flashrom_tester::{tester, tests};
use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
pub mod built_info {
include!(concat!(env!("OUT_DIR"), "/built.rs"));
@ -136,8 +137,45 @@ fn main() {
print_layout,
output_format,
test_names,
Some(handle_sigint()),
) {
eprintln!("Failed to run tests: {:?}", e);
std::process::exit(1);
}
}
/// Catch exactly one SIGINT, printing a message in response and setting a flag.
///
/// The returned value is false by default, becoming true after a SIGINT is
/// trapped.
///
/// Once a signal is trapped, the default behavior is restored (terminating
/// the process) for future signals.
fn handle_sigint() -> &'static AtomicBool {
use nix::libc::c_int;
use nix::sys::signal::{self, SigHandler, Signal};
use std::sync::atomic::Ordering;
unsafe {
let _ = signal::signal(Signal::SIGINT, SigHandler::Handler(sigint_handler));
}
static TERMINATE_FLAG: AtomicBool = AtomicBool::new(false);
extern "C" fn sigint_handler(_: c_int) {
const STDERR_FILENO: c_int = 2;
static MESSAGE: &[u8] = b"
WARNING: terminating tests prematurely may leave Flash in an inconsistent state,
rendering your machine unbootable. Testing will end on completion of the current
test, or press ^C again to exit immediately (possibly bricking your machine).
";
// Use raw write() because signal-safety is a very hard problem
let _ = nix::unistd::write(STDERR_FILENO, MESSAGE);
unsafe {
let _ = signal::signal(Signal::SIGINT, SigHandler::SigDfl);
}
TERMINATE_FLAG.store(true, Ordering::Release);
}
&TERMINATE_FLAG
}

View File

@ -39,6 +39,7 @@ use super::utils::{self, LayoutSizes};
use flashrom::{FlashChip, Flashrom, FlashromCmd};
use serde_json::json;
use std::mem::MaybeUninit;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Mutex;
// type-signature comes from the return type of lib.rs workers.
@ -480,6 +481,7 @@ pub fn run_all_tests<T, TS>(
chip: FlashChip,
cmd: &FlashromCmd,
ts: TS,
terminate_flag: Option<&AtomicBool>,
) -> Vec<(String, (TestConclusion, Option<TestError>))>
where
T: TestCase + Copy,
@ -489,6 +491,13 @@ where
let mut results = Vec::new();
for t in ts {
if terminate_flag
.map(|b| b.load(Ordering::Acquire))
.unwrap_or(false)
{
break;
}
let result = decode_test_result(env.run_test(t), t.expected_result());
results.push((t.get_name().into(), result));
}

View File

@ -40,6 +40,7 @@ use flashrom::{FlashChip, Flashrom, FlashromCmd};
use std::collections::{HashMap, HashSet};
use std::fs::File;
use std::io::{BufRead, Write};
use std::sync::atomic::AtomicBool;
const LAYOUT_FILE: &'static str = "/tmp/layout.file";
@ -82,6 +83,7 @@ pub fn generic<'a, TN: Iterator<Item = &'a str>>(
print_layout: bool,
output_format: OutputFormat,
test_names: Option<TN>,
terminate_flag: Option<&AtomicBool>,
) -> Result<(), Box<dyn std::error::Error>> {
let p = path.to_string();
let cmd = FlashromCmd { path: p, fc };
@ -142,7 +144,7 @@ pub fn generic<'a, TN: Iterator<Item = &'a str>>(
// ------------------------.
// Run all the tests and collate the findings:
let results = tester::run_all_tests(fc, &cmd, tests);
let results = tester::run_all_tests(fc, &cmd, tests, terminate_flag);
// Any leftover filtered names were specified to be run but don't exist
for leftover in filter_names.iter().flatten() {