From patchwork Fri Apr 7 15:50:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9669723 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 6874160365 for ; Fri, 7 Apr 2017 15:53:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5AB8228535 for ; Fri, 7 Apr 2017 15:53:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F70528610; Fri, 7 Apr 2017 15:53:05 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5731128535 for ; Fri, 7 Apr 2017 15:53:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwWA6-0003xi-Ie; Fri, 07 Apr 2017 15:50:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwWA5-0003xZ-4p for xen-devel@lists.xen.org; Fri, 07 Apr 2017 15:50:57 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 41/1F-05091-065B7E85; Fri, 07 Apr 2017 15:50:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpG781uc RBlcf21gs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBn7V61nK7jFXvH1gWUD4wK2LkZODgkBf4k5 rVPYQWw2AX2J3S8+MYHYIgLqEqc7LrJ2MXJxMAtsZZS4teMIM0hCWCBQ4lHHVlYQm0VARWLZj JVgcV4BT4nru3YxQwyVkzh//CeYzSngJdHd8hRsqBBQza09J9ggbDWJa/2X2CF6BSVOznzCAm IzC0hIHHzxgnkCI+8sJKlZSFILGJlWMWoUpxaVpRbpGhrrJRVlpmeU5CZm5ugaGhjr5aYWFye mp+YkJhXrJefnbmIEBg8DEOxg3Lbd8xCjJAeTkiivgs+TCCG+pPyUyozE4oz4otKc1OJDjDIc HEoSvOc3P48QEixKTU+tSMvMAYYxTFqCg0dJhFcNJM1bXJCYW5yZDpE6xajLMefe1/dMQix5+ XmpUuK8cluAigRAijJK8+BGwGLqEqOslDAvI9BRQjwFqUW5mSWo8q8YxTkYlYR5F4Ks4snMK4 Hb9AroCCagI3xuPQU5oiQRISXVwKhTt+X20Q2uN19e0XqYUnLmN8OcUw/UzJatOrA0ff7cOj3 7a5cPFXML67XGn2PW35/b0nL1e7b2kRsv6ibucHH5efd4nvyFOfFGy6+fzOz75a05t3jXzUUM bkeWVD68HCRa8HR/+5Ftp0u2lwT8+3oyw4Bx52Y+D/nKPTdkHwQnzpV+5eOqt1lEiaU4I9FQi 7moOBEAnWqmpqQCAAA= X-Env-Sender: prvs=2637cee0f=Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1491580254!94795786!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33793 invoked from network); 7 Apr 2017 15:50:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 7 Apr 2017 15:50:55 -0000 X-IronPort-AV: E=Sophos;i="5.37,166,1488844800"; d="scan'208";a="417927667" From: Andrew Cooper To: Xen-devel Date: Fri, 7 Apr 2017 16:50:46 +0100 Message-ID: <1491580247-25837-2-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1491580247-25837-1-git-send-email-andrew.cooper3@citrix.com> References: <1491580247-25837-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Boris Ostrovsky , Suravee Suthikulpanit , Jan Beulich Subject: [Xen-devel] [PATCH 2/2] x86/svm: Correct event injection check in svm_vmcb_restore() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP SVM's maximum valid event type is 4. This appears to be a straigth copy and paste error in c/s e94e3f210a62, as VT-x's maximum is 6. Signed-off-by: Andrew Cooper Reviewed-by: Boris Ostrovsky --- CC: Jan Beulich CC: Boris Ostrovsky CC: Suravee Suthikulpanit --- xen/arch/x86/hvm/svm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 1f8aca6..531c64f 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -271,7 +271,7 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c) if ( c->pending_valid ) { - if ( (c->pending_type == 1) || (c->pending_type > 6) || + if ( (c->pending_type == 1) || (c->pending_type > 4) || (c->pending_reserved != 0) ) { dprintk(XENLOG_ERR, "%pv: Invalid pending event %#"PRIx32"\n",