From patchwork Mon May 9 18:27:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9048941 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B0B09BF29F for ; Mon, 9 May 2016 18:31:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5F7A2012D for ; Mon, 9 May 2016 18:31:18 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id ED2272012B for ; Mon, 9 May 2016 18:31:16 +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 1azpuc-0007it-SE; Mon, 09 May 2016 18:28:10 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azpuc-0007iK-3b for xen-devel@lists.xen.org; Mon, 09 May 2016 18:28:10 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 79/10-09532-9B6D0375; Mon, 09 May 2016 18:28:09 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHRDpO7Oawb hBnO6VS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oz2I1IFD3gq5ly/z9LAeJGri5GTQ0LAX+Lt jy5mEJtNQF9i94tPTCC2iIC6xOmOi6wgNrNAqcSSq3dZQGxhgXiJjd1NYHEWARWJc7cvM4LYv AKeEu8PP2CFmCkncf74T7CZnAJeEhO+/ATrFQKqWXb/IRuErSZxrf8SO0SvoMTJmU9YIHZJSB x88QKolwNoDrfE3277CYx8s5BUzUJStYCRaRWjenFqUVlqka6xXlJRZnpGSW5iZo6uoYGZXm5 qcXFiempOYlKxXnJ+7iZGYDgxAMEOxo5/TocYJTmYlER5XRn1woX4kvJTKjMSizPii0pzUosP McpwcChJ8NpdNQgXEixKTU+tSMvMAQY2TFqCg0dJhNcJJM1bXJCYW5yZDpE6xajLsW7ujbVMQ ix5+XmpUuK8ASBFAiBFGaV5cCNgUXaJUVZKmJcR6CghnoLUotzMElT5V4ziHIxKwrwnrwBN4c nMK4Hb9AroCCagI+TY9EGOKElESEk1MOpFTO8tVZE8cbL9b7ThDkW3C+5TjwmtqhBc9Vb9qp7 Zl0/zjU4d2sfucWePm5XhlKNFInqy4VfDIvZueni3Ls2wZdbMj4Y1p7rsbHdPF/02d0GpdeOe uyVcCz6EfE4rs9/v5HfhS4TUOdH3j87Fn9nv4n79r/Q+E9MLzec2vXsqa7rvObMWL7MSS3FGo qEWc1FxIgDK+c7TrQIAAA== X-Env-Sender: prvs=930ada366=Andrew.Cooper3@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1462818486!13439203!2 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: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24690 invoked from network); 9 May 2016 18:28:09 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 9 May 2016 18:28:09 -0000 X-IronPort-AV: E=Sophos;i="5.24,601,1454976000"; d="scan'208";a="352565957" From: Andrew Cooper To: Xen-devel Date: Mon, 9 May 2016 19:27:49 +0100 Message-ID: <1462818472-14225-3-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462818472-14225-1-git-send-email-andrew.cooper3@citrix.com> References: <1462818472-14225-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Paul Durrant , Wei Liu Subject: [Xen-devel] [PATCH v2 for-4.7 2/5] x86/hvm: Raise #SS faults for %ss-based segmentation violations 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Raising #GP under such circumstances is architecturally wrong. (Refer to the Intel or AMD manuals describing the conditions under which the Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- CC: Paul Durrant CC: Wei Liu v2: * Clarified the commit message. --- xen/arch/x86/hvm/emulate.c | 3 ++- xen/arch/x86/mm/shadow/common.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index be1e7c2..ee5cf1f 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -566,7 +566,8 @@ static int hvmemul_virtual_to_linear( /* This is a singleton operation: fail it with an exception. */ hvmemul_ctxt->exn_pending = 1; - hvmemul_ctxt->trap.vector = TRAP_gp_fault; + hvmemul_ctxt->trap.vector = + (seg == x86_seg_ss) ? TRAP_stack_error : TRAP_gp_fault; hvmemul_ctxt->trap.type = X86_EVENTTYPE_HW_EXCEPTION; hvmemul_ctxt->trap.error_code = 0; hvmemul_ctxt->trap.insn_len = 0; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 559d4a4..226e32d 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -148,7 +148,8 @@ static int hvm_translate_linear_addr( if ( !okay ) { - hvm_inject_hw_exception(TRAP_gp_fault, 0); + hvm_inject_hw_exception( + (seg == x86_seg_ss) ? TRAP_stack_error : TRAP_gp_fault, 0); return X86EMUL_EXCEPTION; }