From patchwork Mon Mar 18 11:20:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 10857399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F0DB1390 for ; Mon, 18 Mar 2019 11:23:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24A592937E for ; Mon, 18 Mar 2019 11:23:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 193A129380; Mon, 18 Mar 2019 11:23:07 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 982422937F for ; Mon, 18 Mar 2019 11:23:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h5qKL-0004Fa-1H; Mon, 18 Mar 2019 11:21:09 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h5qKK-0004F3-0x for xen-devel@lists.xenproject.org; Mon, 18 Mar 2019 11:21:08 +0000 X-Inumbo-ID: ec87794d-496f-11e9-bc90-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id ec87794d-496f-11e9-bc90-bc764e045a96; Mon, 18 Mar 2019 11:21:07 +0000 (UTC) IronPort-Data: A9a23:bdVh7K0B8Y9KcpNqHPbDix16xV27qk9dZSB6A8VEDSB0RE9Odbcrpx KurzSVy6cG28CNQrZC0tmqA8YeK8IiABxOslxLRWRNh/vHDTueqv/g41JfkmkfiBsCCVYHMj gImn77Bkrrn1tqiru17ky6EVmIAahhn7ZDQhRn6wj7gOODiG4YS0DtmKCnIF3+scsfB4YwmB ECB+wlGLUClFrn9oeIHacOuWSkrY7F/3+2f+3kd7dYe6vrWwmytHZbHvozBhaor+O0Ads5U6 NG8oAobf+NGhg04FgSQURqu3MgAFRKRyXeo1ZcpzpEc+qdXKsOnr8n0qmT1I/JsXBwM1ylRv r6lMqYZ9MNqyXc+wz/7O+pNWJeWN5nKqDAGaB/3HQo6zx32Onh0oGapltnUAL8ymzmfcNpM1 OwmrNNO9GlscUVc5vQCQOiDtNhAdmdC3iT5Z955+SsSum+0LaEBOfj6FBIJCnY0oJ/uY+aII y6hgwKtmLT5qC4h56SReF4oF6v9IZCZMTA/BrYJGO2Ktkmhu/NC/54qld2cg7Nc1WnnSuXqd RfyiyX3MszFdPyiXR5Mo8hIAchdeFKIZi3r4O62XT2HtwsU8tsJBuQIyJNuKTVfBX9NLjhwo ZMCKMuQ5FoX6/G/vRs7fiTK1DH8Nt5YAhGkBhTt7dW8w3CBxM+gvABpKy1QWpm6e32KXFz5H E2hSo7E19BiYLZCcGMp9WLEBH8kRdnF7k2MMVzi+mWZObuSZgXNKh7yFbokldj8nJ7CSog0M RBf+fNHjO8KksgxhrsAQ90DCZ5abba3ILrgSWAC6oJERFMOpBOUAkmHCsebQ33enYqiPh/jO wcKBslSWmJhjO33spHOtu9hkQbDc4/ejvuPnIXkPTvxi1hN8pCgop/e2yUVKRr+esyC82sGY qTDbQh4iC1MVgBt9Ftv7zBz/PhNwD2UpYnuyWJMr3fIlJfJIcJzBeYLfmx08qEv2fn9C14lv YMfMOdwyOSjInansOTVwkjvMUaD9OWWm74c/ncv5xQ0BKteTruhd6TeuzePmfQa2xEQvB1Gs GxGPmPk07jOjs1JWr4lM4rhEdRhc+hbgAa1mQsGHb6gaiQa6F2PPxpSlgfANvOBWXj/3mviu ltHwbOZPJQ6avuTndPRfiEQubKgfQmQ8IgBgQ6baFvPNC8cQ9s7ZsD/o+PioTtB3AtSCi1fV zGK3k3OU85WqoIjIzq1/FL/UqMf5TMRiArmaVCyLZfb2ATM468XM0KaMyzV3al8m1EJ64qQd ZN0XpJut+Ux7+KVnI+Ht5AWSjY7IulewElddx4AaDRidVHZf01cpDSpyi9i+nrhy+QTwQSIM Im6CHLLRxshDcSjhwAc3rvutRfbi3vwd1UhSIqfZErWTwpiszQsxOU7Jnn63/vNR9uGWT11z /Xa/YuxzrtKm2fO2XERD7Q27pkdoxz4C81nu/SpcQ8xnOQ3ZsH3PAtHsgA4tvLSRIPJXyqM5 WkL0gfVzLxMSlyR7eWapKiPrUQrGN5jp9EYfuiNCluDEBj48Lshvv4uINd2eVxIjbl88H5mS o20MhCqSpojnmcBaP1NAlDgMrCHM+TzOysuMCu/0zVtuUuM66KwBmc3Ji6tEIizko8ppB89A HNlgqc8jjeStVSpjOz0q/qy3kp+FGuTu9Vm9fxI8o9zp3S02pjaKhFZHa8kovgpq7Ggfd0tq gWMJrcNuhBZtnSo8mEs9SPjiQCU43oVnl2fVJnM2Vn5pE1Dr70XlsWOO8pQfWhZH2CkOdreE 357wQxh0QEIONaBSGm5+UNbKvNHHb6hHuRKaMKcINJ4w5SGGJ6YYvODQI= X-IronPort-AV: E=Sophos;i="5.58,493,1544486400"; d="scan'208";a="80850937" From: Paul Durrant To: Date: Mon, 18 Mar 2019 11:20:54 +0000 Message-ID: <20190318112059.21910-7-paul.durrant@citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318112059.21910-1-paul.durrant@citrix.com> References: <20190318112059.21910-1-paul.durrant@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v8 06/11] viridian: add missing context save helpers into synic and time modules X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Paul Durrant , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently the time module lacks vcpu context save helpers and the synic module lacks domain context save helpers. These helpers are not yet required but subsequent patches will require at least some of them so this patch completes the set to avoid introducing them in an ad-hoc way. Signed-off-by: Paul Durrant Reviewed-by: Wei Liu --- Cc: Jan Beulich Cc: Andrew Cooper Cc: "Roger Pau Monné" v3: - Add missing callers so that they are not added in an ad-hoc way --- xen/arch/x86/hvm/viridian/private.h | 10 ++++++++++ xen/arch/x86/hvm/viridian/synic.c | 10 ++++++++++ xen/arch/x86/hvm/viridian/time.c | 10 ++++++++++ xen/arch/x86/hvm/viridian/viridian.c | 4 ++++ 4 files changed, 34 insertions(+) diff --git a/xen/arch/x86/hvm/viridian/private.h b/xen/arch/x86/hvm/viridian/private.h index 8c029f62c6..5078b2d2ab 100644 --- a/xen/arch/x86/hvm/viridian/private.h +++ b/xen/arch/x86/hvm/viridian/private.h @@ -85,6 +85,11 @@ void viridian_synic_save_vcpu_ctxt(const struct vcpu *v, void viridian_synic_load_vcpu_ctxt( struct vcpu *v, const struct hvm_viridian_vcpu_context *ctxt); +void viridian_synic_save_domain_ctxt( + const struct domain *d, struct hvm_viridian_domain_context *ctxt); +void viridian_synic_load_domain_ctxt( + struct domain *d, const struct hvm_viridian_domain_context *ctxt); + int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val); int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val); @@ -94,6 +99,11 @@ int viridian_time_domain_init(const struct domain *d); void viridian_time_vcpu_deinit(const struct vcpu *v); void viridian_time_domain_deinit(const struct domain *d); +void viridian_time_save_vcpu_ctxt( + const struct vcpu *v, struct hvm_viridian_vcpu_context *ctxt); +void viridian_time_load_vcpu_ctxt( + struct vcpu *v, const struct hvm_viridian_vcpu_context *ctxt); + void viridian_time_save_domain_ctxt( const struct domain *d, struct hvm_viridian_domain_context *ctxt); void viridian_time_load_domain_ctxt( diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c index 4b00dbe1b3..b8dab4b246 100644 --- a/xen/arch/x86/hvm/viridian/synic.c +++ b/xen/arch/x86/hvm/viridian/synic.c @@ -186,6 +186,16 @@ void viridian_synic_load_vcpu_ctxt( vv->apic_assist_pending = ctxt->apic_assist_pending; } +void viridian_synic_save_domain_ctxt( + const struct domain *d, struct hvm_viridian_domain_context *ctxt) +{ +} + +void viridian_synic_load_domain_ctxt( + struct domain *d, const struct hvm_viridian_domain_context *ctxt) +{ +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/hvm/viridian/time.c b/xen/arch/x86/hvm/viridian/time.c index 48aca7e0ab..4399e62f54 100644 --- a/xen/arch/x86/hvm/viridian/time.c +++ b/xen/arch/x86/hvm/viridian/time.c @@ -233,6 +233,16 @@ void viridian_time_domain_deinit(const struct domain *d) { } +void viridian_time_save_vcpu_ctxt( + const struct vcpu *v, struct hvm_viridian_vcpu_context *ctxt) +{ +} + +void viridian_time_load_vcpu_ctxt( + struct vcpu *v, const struct hvm_viridian_vcpu_context *ctxt) +{ +} + void viridian_time_save_domain_ctxt( const struct domain *d, struct hvm_viridian_domain_context *ctxt) { diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index f9a509d918..742a988252 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -707,6 +707,7 @@ static int viridian_save_domain_ctxt(struct vcpu *v, return 0; viridian_time_save_domain_ctxt(d, &ctxt); + viridian_synic_save_domain_ctxt(d, &ctxt); return (hvm_save_entry(VIRIDIAN_DOMAIN, 0, h, &ctxt) != 0); } @@ -723,6 +724,7 @@ static int viridian_load_domain_ctxt(struct domain *d, vd->hypercall_gpa.raw = ctxt.hypercall_gpa; vd->guest_os_id.raw = ctxt.guest_os_id; + viridian_synic_load_domain_ctxt(d, &ctxt); viridian_time_load_domain_ctxt(d, &ctxt); return 0; @@ -738,6 +740,7 @@ static int viridian_save_vcpu_ctxt(struct vcpu *v, hvm_domain_context_t *h) if ( !is_viridian_vcpu(v) ) return 0; + viridian_time_save_vcpu_ctxt(v, &ctxt); viridian_synic_save_vcpu_ctxt(v, &ctxt); return hvm_save_entry(VIRIDIAN_VCPU, v->vcpu_id, h, &ctxt); @@ -764,6 +767,7 @@ static int viridian_load_vcpu_ctxt(struct domain *d, return -EINVAL; viridian_synic_load_vcpu_ctxt(v, &ctxt); + viridian_time_load_vcpu_ctxt(v, &ctxt); return 0; }