From patchwork Sun Jul 9 08:09:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Huang X-Patchwork-Id: 9831689 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 33E1760318 for ; Sun, 9 Jul 2017 08:11:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276C2237A5 for ; Sun, 9 Jul 2017 08:11:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 188F527F82; Sun, 9 Jul 2017 08:11:57 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 8A4F0237A5 for ; Sun, 9 Jul 2017 08:11:56 +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 1dU7Hq-0004m5-5r; Sun, 09 Jul 2017 08:09:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dU7Ho-0004kq-SO for xen-devel@lists.xen.org; Sun, 09 Jul 2017 08:09:48 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id AB/57-22472-CC4E1695; Sun, 09 Jul 2017 08:09:48 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRWlGSWpSXmKPExsVyMfTAQd3TTxI jDT48kbNY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDNmPHnCUrBIoOLl4j72BsalvF2MXBxCApMY JaZ8WsgM4rAIdLFKzOtaCeZICCxjlTi2dwFjFyMnkBMnMeXlT3YIu0LiSc9/FhBbSEBZouvbU XaIUYuYJM6v7wNLsAmoSWxd0s4C0WArseDcF2YQW0RAWuLa58tgQ5kFPCQ+flwKZHNwCAu4SC zcJgISZhFQlZh97hfYLl6BeIlFj2dBjZGX2NV2kRWknFMgQaL5QgTECfESvy7+ZAOxOYE2fdm /gBkibiPx69h6pgmMwgsYGVYxahSnFpWlFukamuolFWWmZ5TkJmbm6BoaGOvlphYXJ6an5iQm Fesl5+duYgQGKAMQ7GBcs93zEKMkB5OSKK9Yb0KkEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQney Y8TI4UEi1LTUyvSMnOAsQKTluDgURLhdZ4OlOYtLkjMLc5Mh0idYrTkuHJl3RcmjikHtgPJVx P+f2MSYsnLz0uVEudNBZknANKQUZoHNw4Wz5cYZaWEeRmBDhTiKUgtys0sQZV/xSjOwagkzBs IMoUnM68EbusroIOYgA5iq0sAOagkESEl1cDIx7S38lTcUr3Xdjvark0+cUvady8jZ/AWBy5h 3Qlvjivwbno4ofKbybXgNrfG5w7pOycdyYvueCxuv9knat6sqS9ZzS7pvpX+l71a3o1tt8zF0 PPO/ltWnWD+c3Hpu2N8u/a8eCn0of3qdC3HBC7nhcaXI043e6pYv7rWvKDn3uvPLle2HxCboM RSnJFoqMVcVJwIACKtolTiAgAA X-Env-Sender: kaih.linux@gmail.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1499587786!87780345!1 X-Originating-IP: [209.85.192.193] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32001 invoked from network); 9 Jul 2017 08:09:47 -0000 Received: from mail-pf0-f193.google.com (HELO mail-pf0-f193.google.com) (209.85.192.193) by server-12.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 9 Jul 2017 08:09:47 -0000 Received: by mail-pf0-f193.google.com with SMTP id c24so10349433pfe.1 for ; Sun, 09 Jul 2017 01:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=HcNCndjCvOVRjXUPphqacPZlYkoJuVMG+cUXxqVMAUY=; b=B+2+EOM2XTOdJB7J4RRc7olTZx7qVxRlMQ/5X1Yj0Z7kcfmdWZ4MJu+OkSckk6gbOH iHCrdY3fnAmdpZWjpu7HGGAr0ojGcv9NSspUpBh+uC7xQneEDzK/BUuVmxgKDk0ETges QzmtYm5WQEhjyP6DTXp8uqz+gXYAFejCW+yzEtH5MDF7Kvwoz9E029b7rycuVM3qOT51 a/WIQdyx90629qbbacoAq7xTvMOui4gYJkOZanW5ucvyLU0BPJiwiBhGb2yjzoOi0O5W ksMluty06tDyUH6u4/NnYMxnNDm11C6o1bNWqp4PQCWRLco/fxR7WbpFjbWtckTBqYaK FrUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=HcNCndjCvOVRjXUPphqacPZlYkoJuVMG+cUXxqVMAUY=; b=Gc57kIa7p/+EyPWFe2BNalqyTbrLe5w5GostxA+SbPP5EYhMDqposujlqEA9s4rKRh W8pnjVWxZqJuEDsRDIKId1pGSSipQiQG5Cl5/VCilHVpcsqeqCRHibGZeWuEQcFvol4e OSADbN9ALvC1tTOB2DKRfHEGQcnaxDuzlHiN8up8fUjy8wIHha4aV4KvY90r5OOoDGua k6EhwGKAJOjAO2Vl4iHe+tqbIdeoujxzBA3NrP1Pq7B4h+GnpWmE6em9GWVvN7EunVdU EJrrVfiXPESngcAjsStwjuJPcVFW6zfc/JiXIn/Y+wNB8XIvni5gQaDIMf+EnrmNzPBj 2wYg== X-Gm-Message-State: AIVw110CmJ8WdIDCujjzkkYNIe3jzDytDfDCrOBMZjCxeOQjTOQwLceT 2V/GKtHKBWlOrb5N X-Received: by 10.99.96.85 with SMTP id u82mr9352012pgb.214.1499587785710; Sun, 09 Jul 2017 01:09:45 -0700 (PDT) Received: from localhost.localdomain (118-92-234-57.dsl.dyn.ihug.co.nz. [118.92.234.57]) by smtp.gmail.com with ESMTPSA id d70sm22148172pga.49.2017.07.09.01.09.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jul 2017 01:09:45 -0700 (PDT) From: Kai Huang X-Google-Original-From: Kai Huang To: xen-devel@lists.xen.org Date: Sun, 9 Jul 2017 20:09:10 +1200 Message-Id: <4018c2ad65440b65b4e9a59e02d08bbb1a60b313.1499586046.git.kai.huang@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <4b8baf9779038897e6ba2ed4ac0a3e9663db2756.1499586046.git.kai.huang@linux.intel.com> References: <4b8baf9779038897e6ba2ed4ac0a3e9663db2756.1499586046.git.kai.huang@linux.intel.com> In-Reply-To: References: Cc: andrew.cooper3@citrix.com, kevin.tian@intel.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH 12/15] xen: x86: reset EPC when guest got suspended. 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP EPC is destroyed when power state goes to S3-S5. Emulate this behavior. A new function s3_suspend is added to hvm_function_table for this purpose. Signed-off-by: Kai Huang --- xen/arch/x86/hvm/hvm.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 7 +++++++ xen/include/asm-x86/hvm/hvm.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 70ddc81d44..1021cd7307 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3858,6 +3858,9 @@ static void hvm_s3_suspend(struct domain *d) hvm_vcpu_reset_state(d->vcpu[0], 0xf000, 0xfff0); + if ( hvm_funcs.s3_suspend ) + hvm_funcs.s3_suspend(d); + domain_unlock(d); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d0c43ea0c8..98c346178e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2290,6 +2290,12 @@ static bool vmx_get_pending_event(struct vcpu *v, struct x86_event *info) return true; } +static void vmx_s3_suspend(struct domain *d) +{ + if ( domain_has_sgx(d) ) + hvm_reset_epc(d, false); +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -2360,6 +2366,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .max_ratio = VMX_TSC_MULTIPLIER_MAX, .setup = vmx_setup_tsc_scaling, }, + .s3_suspend = vmx_s3_suspend, }; /* Handle VT-d posted-interrupt when VCPU is blocked. */ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index b687e03dce..244b6566f2 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -226,6 +226,9 @@ struct hvm_function_table { /* Architecture function to setup TSC scaling ratio */ void (*setup)(struct vcpu *v); } tsc_scaling; + + /* Domain S3 suspend */ + void (*s3_suspend)(struct domain *d); }; extern struct hvm_function_table hvm_funcs;