From patchwork Tue Apr 3 15:00:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 10321395 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1254A602C8 for ; Tue, 3 Apr 2018 15:06:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F366A284D2 for ; Tue, 3 Apr 2018 15:06:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E67A528727; Tue, 3 Apr 2018 15:06:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 63BA6284D2 for ; Tue, 3 Apr 2018 15:06:01 +0000 (UTC) Received: from localhost ([::1]:41074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NVY-0004gs-1i for patchwork-qemu-devel@patchwork.kernel.org; Tue, 03 Apr 2018 11:06:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NR8-0000hO-5S for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3NQy-0008VG-Ol for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:01:26 -0400 Received: from mout.web.de ([212.227.15.4]:35789) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3NQy-0008Uh-GZ for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:01:16 -0400 Received: from md1f2u6c.ww002.siemens.net ([92.77.50.102]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M2dgj-1eDKdw3Em5-00sO5c; Tue, 03 Apr 2018 17:01:05 +0200 From: Jan Kiszka To: qemu-devel , Paolo Bonzini , Richard Henderson , Eduardo Habkost Date: Tue, 3 Apr 2018 17:00:54 +0200 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K0:/+YtwbY067Fi5qJLlnFIAmR8GT4qiV8KdMwCVZNdWnDldTItoyx kbsnAqkPhKTPbpvrWS/0wpxnObXqNMejP/qpD9zqiGiw88qdzoI0TqY7gbelKp1AoD2aPEa SzQeDQcwflITQR5M0b62nHsXq6RGoTs1XlsDCJ9JsDeklMhoW/qDGIlU4bxc1XPK87uJGbE GgST3pyYlkjQ1v1wm4j5Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:Awh5Nnxrc7s=:dHHWKNm2EqOXskPuVPb6oS jDmzXMUOcDjDY6jj+pqW6fqAmGUSqdoJxh4Yc8HotLie888Bj3/OTRHSU86+B8wO8DkQrKRAM 83/aY9BJCUBESqwJ9B3cBf55lxFeqkhHfm/RVz6NlOKeR4nLXZ5To3wSJH8/UF3LbDL9OlcV2 tboXS1+O0cku2Ef5qQ2NiWg2uVNvU4gt+GUQno5uko9elSLS0ELMj1zNChC3gIBRa9ZWL8KuF S4/ZZfO5Fp23PXXy4cHoaasMrDZcPO6MiURKB6EKEm18BRi1tHyyBXFpL4yDcUua8oYqJbn7o uuOMLsqWUHp9EHVF1gXfOiTHaYm/jcyzCGfm8DiFAhx/ZuHO39QTSYWJ+/ohUFInDe8F4bZPJ ygRKiUSpM5UzfNRjnIjpFuFjm99EBnROyEJ+iejECE0qYs35UnakbPMW0+KnzFaSzWzYvN6s0 OSAVI1zoLlbzgOQ2GOSaDDu0fFFizDr6KtgBba2Oc9Ne4NrM9AInr7PlXqbDchx0gpHPzoZIe U/5OxV/2gNwv/+6tHeFPGr2GoMed7i5fWFJWcKs7jS0LoHejAApjeHlHIahZSIuMwc5T0BIxc 85OwkyZUBscMuhBPxzsl+oeTNuPWnatkOWR+LhnPM9BontPMNs/Ybl1ndBhLQM/FaQSugwNnk l6SFPno+Un8a2ScScJNelJzHhNayOCfaHwzx0g6AsASethnsm/tytUCDmdLNN6AnlEfqti1pN WD1Te8cZQFgpJ2frlPSscN2AWWo/w7rz6P5cL5Gh9U6TQsbgxuxQVQbyia5nZ9CY5z/9mWv2u 73d3W1+D7iJzTTtHLEciL+L/+/2qw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.4 Subject: [Qemu-devel] [PATCH 1/4] target-i386: Add NMI interception to SVM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Valentine Sinitsyn Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Jan Kiszka Check for SVM interception prior to injecting an NMI. Tested via the Jailhouse hypervisor. Signed-off-by: Jan Kiszka --- target/i386/seg_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c index 600a4d7586..00301a0c04 100644 --- a/target/i386/seg_helper.c +++ b/target/i386/seg_helper.c @@ -1337,6 +1337,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) ret = true; } else if ((interrupt_request & CPU_INTERRUPT_NMI) && !(env->hflags2 & HF2_NMI_MASK)) { + cpu_svm_check_intercept_param(env, SVM_EXIT_NMI, 0, 0); cs->interrupt_request &= ~CPU_INTERRUPT_NMI; env->hflags2 |= HF2_NMI_MASK; do_interrupt_x86_hardirq(env, EXCP02_NMI, 1);