From patchwork Mon Jul 11 07:51:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 963682 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6B7n92S026253 for ; Mon, 11 Jul 2011 07:49:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757329Ab1GKHst (ORCPT ); Mon, 11 Jul 2011 03:48:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17036 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757327Ab1GKHss (ORCPT ); Mon, 11 Jul 2011 03:48:48 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6B7mlaJ001823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 Jul 2011 03:48:47 -0400 Received: from [127.0.0.1] (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p6B7misN001327; Mon, 11 Jul 2011 03:48:45 -0400 Subject: [PATCH] KVM test: Add subtest nmi_watchdog To: autotest@test.kernel.org From: Amos Kong Cc: lmr@redhat.com, fyang@redhat.com, kvm@vger.kernel.org Date: Mon, 11 Jul 2011 15:51:09 +0800 Message-ID: <20110711075109.23463.75602.stgit@t> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 11 Jul 2011 07:49:09 +0000 (UTC) Uses kernel supported nmi_watchdog to test the nmi support of kvm, check the nmi count in Linux platform through /proc/interrupts. Signed-off-by: Amos Kong --- client/tests/kvm/tests/nmi_watchdog.py | 57 ++++++++++++++++++++++++++++++++ client/tests/kvm/tests_base.cfg.sample | 7 ++++ 2 files changed, 64 insertions(+), 0 deletions(-) create mode 100644 client/tests/kvm/tests/nmi_watchdog.py -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/client/tests/kvm/tests/nmi_watchdog.py b/client/tests/kvm/tests/nmi_watchdog.py new file mode 100644 index 0000000..3895ab7 --- /dev/null +++ b/client/tests/kvm/tests/nmi_watchdog.py @@ -0,0 +1,57 @@ +import time, logging +from autotest_lib.client.common_lib import error + + +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) + + logging.info("Add 'nmi_watchdog=%d' to guest kernel cmdline and reboot" + % nmi_watchdog_type) + if session.get_command_status(update_kernel_cmd) != 0: + raise error.TestError("Fail to modify the kernel cmdline") + time.sleep(int(params.get("sleep_before_reset", 10))) + session = vm.reboot(session, method='shell', timeout=timeout) + try: + s, guest_cpu_num = session.get_command_status_output( + params.get("cpu_chk_cmd")) + if s != 0: + raise error.TestError("Fail to get cpu number of guest") + + logging.info("Checking the nmi interrupt") + s, o = session.get_command_status_output(get_nmi_cmd) + if s != 0: + raise error.TestError("Fail to get guest's NMI counter") + nmi_counter1 = o.split()[1:] + + time.sleep(60) + s, o = session.get_command_status_output(get_nmi_cmd) + if s != 0: + raise error.TestError("Fail to get guest's NMI counter") + nmi_counter2 = o.split()[1:] + + 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("The counter doesn't increase") + finally: + session.close() diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 5d6227b..4e07b5e 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -1112,6 +1112,13 @@ variants: post_command = rm -rf /tmp/kvm_autotest_root/orig.iso /tmp/kvm_autotest_root/new.iso orig new only Linux + - 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: