From patchwork Thu Feb 15 21:03:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10223675 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 3ACAE602CB for ; Thu, 15 Feb 2018 21:20:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 281CC2953B for ; Thu, 15 Feb 2018 21:20:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B0FE2953F; Thu, 15 Feb 2018 21:20:48 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 95E6A2953B for ; Thu, 15 Feb 2018 21:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RhZ4IPlwqix7Hkm+5jQAbop+ujXOiHDxAsfmDz6SRSY=; b=ClF8nuTvrnKVJEx/4RaRvi4LsP FuiiXtWAMQ0JLemRkmma5UdQbcZXBKK0Ku+8AUxsLNjoQHZyC7lpxgfDfvpqc5J7MmY7sBlPzvONN MTVUTrXz9o5HeZmRfwT8tZQCS84/J6WK64NUxZlk5UOiSKA/KfD+f/1AEkCX5b3z09Hmo9IVcuDP3 3zJ3EvmU/wXrTTBBaoyaO6YCcIM1i/2hcGfaP0PiFCRKm41vbAB4XgDgjvh0EBzAlFn2jXAwbX2GR hp+Bq0nwFJh+3ivijiHOvEiP3XG70NLJ2rt8oUaK/l/p/wifmErAngFD7haDLFtJuJhKYPhiO+KQo 6luZlzWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1emQxA-0006Sx-0j; Thu, 15 Feb 2018 21:20:28 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1emQhZ-0008VN-2u for linux-arm-kernel@lists.infradead.org; Thu, 15 Feb 2018 21:05:05 +0000 Received: by mail-wm0-x241.google.com with SMTP id 141so3307316wme.3 for ; Thu, 15 Feb 2018 13:04:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h69kfhm0Zr7Dz3nSnNQzuoxWFT87CE6Px8ZvK9fY7Og=; b=B6r6djq04gnhfvR5/+rLM8dEsEYrtPHrBbpF5xIaHbd0mglymtT2QSY8hrOs6MZDh5 wx/2m3JbOTJAcllVALRassRpCyWk4IPXX9f5YVgEbaQKgBoGM7p7ptO5suZBlDDqOpl5 J3wG/nXvQ2Xzc0fJLBkbkAaGobN/N1LHC0QUs= 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; bh=h69kfhm0Zr7Dz3nSnNQzuoxWFT87CE6Px8ZvK9fY7Og=; b=gLtExqpe6W8KTvmjjVLD4ak6zU7RBgdx6NcGEwtag704tACqSuyotn8CPOle9vDgWE w4LZi/w+GQAZ/ZOBVCeQ19l02g8n1SOnap472C5Qx+R/AnZA30FgkI+hJ+Wu3ElEmpVS v8zHQXwIGuMwOvNdhcq013zTMjFslp2Ai+6erLrBEZ6rJUAYipiApQV8IZMG7Q1eOfeW 2Q+g3/QGGcOzw00Y/0aG6cWtsQmIrzggYihFCndBI10poLzvCqr37ysfKzMZsJt3aYAU kyE1NYlQJZNaAylIC0mnqg7MEF/XaDSjyF36eEcXerf3HArmQxT1CYT3HbEvT6AvUNik 6UGg== X-Gm-Message-State: APf1xPAnYYZNsrt9wx/VMrUJpMggFf7+zWMVfrMCXbsbo57mpGI0Dszp MtAIPwbKNEbGZ+CckMtCEGlx8Q== X-Google-Smtp-Source: AH8x224CqRa5N/rhllgB6JG6eAevNgOY0eCcYVZCkb7kUKHxzUkOH6wjb9XqehiXkpHL8QJn2X41/A== X-Received: by 10.80.145.150 with SMTP id g22mr4904664eda.162.1518728649511; Thu, 15 Feb 2018 13:04:09 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id p55sm8220030edc.15.2018.02.15.13.04.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Feb 2018 13:04:08 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 15/40] KVM: arm64: Don't deactivate VM on VHE systems Date: Thu, 15 Feb 2018 22:03:07 +0100 Message-Id: <20180215210332.8648-16-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180215210332.8648-1-christoffer.dall@linaro.org> References: <20180215210332.8648-1-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180215_130421_362877_46B2C397 X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , kvm@vger.kernel.org, Marc Zyngier , Tomasz Nowicki , Julien Grall , Yury Norov , Christoffer Dall , Dave Martin , Shih-Wei Li MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There is no need to reset the VTTBR to zero when exiting the guest on VHE systems. VHE systems don't use stage 2 translations for the EL2&0 translation regime used by the host. Reviewed-by: Andrew Jones Acked-by: Marc Zyngier Signed-off-by: Christoffer Dall --- Notes: Changes since v1: - Changed __activate_vm to take a kvm pointer - No longer adding inline attributes to functions arch/arm64/kvm/hyp/switch.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 85dae7b94a0f..734dac7f808f 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -156,9 +156,8 @@ static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu) write_sysreg(0, pmuserenr_el0); } -static void __hyp_text __activate_vm(struct kvm_vcpu *vcpu) +static void __hyp_text __activate_vm(struct kvm *kvm) { - struct kvm *kvm = kern_hyp_va(vcpu->kvm); write_sysreg(kvm->arch.vttbr, vttbr_el2); } @@ -377,7 +376,7 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) __sysreg_save_host_state(host_ctxt); __activate_traps(vcpu); - __activate_vm(vcpu); + __activate_vm(vcpu->kvm); __vgic_restore_state(vcpu); __timer_enable_traps(vcpu); @@ -405,7 +404,6 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) __vgic_save_state(vcpu); __deactivate_traps(vcpu); - __deactivate_vm(vcpu); __sysreg_restore_host_state(host_ctxt); @@ -440,7 +438,7 @@ int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu) __sysreg_save_host_state(host_ctxt); __activate_traps(vcpu); - __activate_vm(vcpu); + __activate_vm(kern_hyp_va(vcpu->kvm)); __vgic_restore_state(vcpu); __timer_enable_traps(vcpu);