Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbdIKKyW (ORCPT ); Mon, 11 Sep 2017 06:54:22 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:6022 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751036AbdIKKyV (ORCPT ); Mon, 11 Sep 2017 06:54:21 -0400 From: Dongjiu Geng To: , , , CC: , , Subject: [PATCH] arm64: KVM: Skip PSTATE.PAN reest at EL2 in non-VHE Date: Mon, 11 Sep 2017 19:16:52 +0800 Message-ID: <1505128612-13819-1-git-send-email-gengdongjiu@huawei.com> X-Mailer: git-send-email 1.7.7 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.187.203] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0B0205.59B66B45.006B,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8ad280bc8523f6cd2dc01798fb7b8dc3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1001 Lines: 30 PSTATE.PAN disables reading and/or writing to a userspace virtual address from EL1 in non-VHE or from EL2 in VHE. In non-VHE, there is no any userspace mapping at EL2, so no need to reest the PSTATE.PAN. Signed-off-by: Dongjiu Geng Signed-off-by: Haibin Zhang --- arch/arm64/kvm/hyp/entry.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 12ee62d6d410..86a7549b1b4c 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -96,8 +96,12 @@ ENTRY(__guest_exit) add x1, x1, #VCPU_CONTEXT - ALTERNATIVE(nop, SET_PSTATE_PAN(1), ARM64_HAS_PAN, CONFIG_ARM64_PAN) +alternative_if_not ARM64_HAS_VIRT_HOST_EXTN + b 2f // skip PAN at EL2 in non-VHE +alternative_else_nop_endif + ALTERNATIVE(nop, SET_PSTATE_PAN(1), ARM64_HAS_PAN, CONFIG_ARM64_PAN) +2: // Store the guest regs x2 and x3 stp x2, x3, [x1, #CPU_XREG_OFFSET(2)] -- 2.14.1