From patchwork Wed Jul 19 13:27:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9852021 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 9B73F60392 for ; Wed, 19 Jul 2017 13:30:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 893D728618 for ; Wed, 19 Jul 2017 13:30:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D74128660; Wed, 19 Jul 2017 13:30:28 +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 7EBE128618 for ; Wed, 19 Jul 2017 13:30:27 +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 1dXp1Q-0006fJ-Nl; Wed, 19 Jul 2017 13:28:12 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXp1P-0006fD-ND for xen-devel@lists.xen.org; Wed, 19 Jul 2017 13:28:11 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 29/73-03937-B6E5F695; Wed, 19 Jul 2017 13:28:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDvW5WXH6 kwZH1ChZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bnAw3sBaeEK1buP8PSwLiAv4uRk0NCwF/i 0bsZrCA2m4C+xO4Xn5hAbBEBdYnTHReB4lwczAJNTBIPT7xl72Lk4BAWcJd48KcIpIZFQFVi5 a5PLCA2r4CHxKPzExghZspJnD/+kxkiLihxcuYTsBpmAU2J1u2/2SFseYnmrbPBaoQE1CSu9V 9in8DIMwtJyywkLbOQtCxgZF7FqFGcWlSWWqRrZKCXVJSZnlGSm5iZo2toYKaXm1pcnJiempO YVKyXnJ+7iREYPAxAsIPx17KAQ4ySHExKorxzePMjhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw 5sUC5QSLUtNTK9Iyc4BhDJOW4OBREuHtA0nzFhck5hZnpkOkTjHqcrya8P8bkxBLXn5eqpQ4r zpIkQBIUUZpHtwIWExdYpSVEuZlBDpKiKcgtSg3swRV/hWjOAejkjBvFsgUnsy8ErhNr4COYA I6Qtg3B+SIkkSElFQDo7XMnYj1684fOWhXsL4i8fjWgD89irf19xaUR85TVIjZm1k1p/aS1tL yW3+5Xs+5PvvIhZWK7SLnunwSHxzvqv0cxe2xbeer+SX7q++KOs8o4ypccmvxxt+Tjof9mPml 7vKks2F/DHIn7LJv+Nhl/PyMho/Ggvr2AzE3qm5+MONbF3lNYolN3jQlluKMREMt5qLiRAAWp rdGpAIAAA== X-Env-Sender: prvs=366acc0af=Andrew.Cooper3@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1500470889!97623656!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63839 invoked from network); 19 Jul 2017 13:28:10 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 19 Jul 2017 13:28:10 -0000 X-IronPort-AV: E=Sophos;i="5.40,381,1496102400"; d="scan'208";a="440464399" From: Andrew Cooper To: Xen-devel Date: Wed, 19 Jul 2017 14:27:31 +0100 Message-ID: <1500470851-6262-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Wei Liu , George Dunlap , Andrew Cooper , Paul Durrant , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH] x86/hvm: Drop more remains of the PVHv1 implementation 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 These functions don't need is_hvm_{vcpu,domain}() predicates. hvmop_set_evtchn_upcall_vector() does need the predicate to prevent a PV caller accessing the hvm union, but swap the copy_from_guest() and is_hvm_domain() predicate to avoid reading the hypercall parameter if we not going to use it. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Wei Liu Reviewed-by: Roger Pau Monné --- CC: George Dunlap CC: Jan Beulich CC: Wei Liu CC: Paul Durrant CC: Roger Pau Monné --- xen/arch/x86/hvm/hvm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8145385..4fef616 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -506,8 +506,7 @@ void hvm_do_resume(struct vcpu *v) { check_wakeup_from_wait(); - if ( is_hvm_domain(v->domain) ) - pt_restore_timer(v); + pt_restore_timer(v); if ( !handle_hvm_io_completion(v) ) return; @@ -1544,8 +1543,7 @@ void hvm_vcpu_destroy(struct vcpu *v) tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet); hvm_funcs.vcpu_destroy(v); - if ( is_hvm_vcpu(v) ) - vlapic_destroy(v); + vlapic_destroy(v); hvm_vcpu_cacheattr_destroy(v); } @@ -1711,7 +1709,6 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * - newer Windows (like Server 2012) for HPET accesses. */ if ( !nestedhvm_vcpu_in_guestmode(curr) - && is_hvm_domain(currd) && hvm_mmio_internal(gpa) ) { if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) @@ -3139,7 +3136,7 @@ static enum hvm_copy_result __hvm_copy( * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, * - newer Windows (like Server 2012) for HPET accesses. */ - if ( v == current && is_hvm_vcpu(v) + if ( v == current && !nestedhvm_vcpu_in_guestmode(v) && hvm_mmio_internal(gpa) ) return HVMCOPY_bad_gfn_to_mfn; @@ -3971,12 +3968,12 @@ static int hvmop_set_evtchn_upcall_vector( struct domain *d = current->domain; struct vcpu *v; - if ( copy_from_guest(&op, uop, 1) ) - return -EFAULT; - if ( !is_hvm_domain(d) ) return -EINVAL; + if ( copy_from_guest(&op, uop, 1) ) + return -EFAULT; + if ( op.vector < 0x10 ) return -EINVAL;