On 07/26/2011 03:25 PM, Lucas Meneghel Rodrigues wrote: > From: Amos Kong<[email protected]> > > Uses kernel supported nmi_watchdog to test the nmi support of kvm, > check the nmi count in Linux platform through /proc/interrupts.
Hi Amos, applied your test, thanks! > Changes from v2: > * Updated the test to use more current KVM autotest API > > Signed-off-by: Amos Kong<[email protected]> > --- > client/tests/kvm/tests/nmi_watchdog.py | 60 > ++++++++++++++++++++++++++++++++ > client/tests/kvm/tests_base.cfg.sample | 7 ++++ > 2 files changed, 67 insertions(+), 0 deletions(-) > create mode 100644 client/tests/kvm/tests/nmi_watchdog.py > > diff --git a/client/tests/kvm/tests/nmi_watchdog.py > b/client/tests/kvm/tests/nmi_watchdog.py > new file mode 100644 > index 0000000..a4b2349 > --- /dev/null > +++ b/client/tests/kvm/tests/nmi_watchdog.py > @@ -0,0 +1,60 @@ > +import time, logging > +from autotest_lib.client.common_lib import error > + > + > [email protected]_aware > +def run_nmi_watchdog(test, params, env): > + """ > + Test the function of nmi injection and verify the response of guest > + > + 1) Log in the guest > + 2) Add 'watchdog=1' to boot option > + 2) Check if guest's NMI counter augment after injecting nmi > + > + @param test: kvm test object > + @param params: Dictionary with the test parameters. > + @param env: Dictionary with test environment. > + """ > + vm = env.get_vm(params["main_vm"]) > + vm.verify_alive() > + timeout=int(params.get("login_timeout", 360)) > + session = vm.wait_for_login(timeout=timeout) > + get_nmi_cmd= params.get("get_nmi_cmd") > + kernel_version = session.get_command_output("uname -r").strip() > + nmi_watchdog_type = int(params.get("nmi_watchdog_type")) > + update_kernel_cmd = ("grubby --update-kernel=/boot/vmlinuz-%s " > + "--args='nmi_watchdog=%d'" % > + (kernel_version, nmi_watchdog_type)) > + > + error.context("Add 'nmi_watchdog=%d' to guest kernel cmdline and reboot" > + % nmi_watchdog_type) > + session.cmd(update_kernel_cmd) > + time.sleep(int(params.get("sleep_before_reset", 10))) > + session = vm.reboot(session, method='shell', timeout=timeout) > + try: > + error.context("Getting guest's number of vcpus") > + guest_cpu_num = session.cmd(params.get("cpu_chk_cmd")) > + > + error.context("Getting guest's NMI counter") > + output = session.cmd(get_nmi_cmd) > + logging.debug(output.strip()) > + nmi_counter1 = output.split()[1:] > + > + logging.info("Waiting 60 seconds to see if guest's NMI counter " > + "increases") > + time.sleep(60) > + > + error.context("Getting guest's NMI counter 2nd time") > + output = session.cmd(get_nmi_cmd) > + logging.debug(output.strip()) > + nmi_counter2 = output.split()[1:] > + > + error.context("") > + for i in range(int(guest_cpu_num)): > + logging.info("vcpu: %s, nmi_counter1: %s, nmi_counter2: %s" % > + (i, nmi_counter1[i], nmi_counter2[i])) > + if int(nmi_counter2[i])<= int(nmi_counter1[i]): > + raise error.TestFail("Guest's NMI counter did not increase " > + "after 60 seconds") > + finally: > + session.close() > diff --git a/client/tests/kvm/tests_base.cfg.sample > b/client/tests/kvm/tests_base.cfg.sample > index b7342bd..d597b52 100644 > --- a/client/tests/kvm/tests_base.cfg.sample > +++ b/client/tests/kvm/tests_base.cfg.sample > @@ -1108,6 +1108,13 @@ variants: > cdrom_cd1 = orig.iso > max_times = 20 > > + - nmi_watchdog: install setup image_copy unattended_install.cdrom > + type = nmi_watchdog > + get_nmi_cmd = grep NMI /proc/interrupts > + nmi_watchdog_type = 1 > + image_snapshot = yes > + only Linux > + > > # NICs > variants: _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
