From patchwork Thu Aug 20 10:34:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Scull X-Patchwork-Id: 11726037 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC31C1575 for ; Thu, 20 Aug 2020 10:37:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79D5B20639 for ; Thu, 20 Aug 2020 10:37:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OOfnHXfQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="PuNNLjYO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79D5B20639 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VJu4DMpJvYhiAKdzqCyUCSyUE4iUWnZlKD0nYtM5V4w=; b=OOfnHXfQWudJK1/9A/gPlMNXs MBuZTorziVTyGp0MoovwpELk1XePXdLG3GMXIM6Om98WmAVLCfV2BdClylyCW9okEEBebpkpMxTGn M7dNS/uCSlKFtnZhqzhkiuTxaKC3Kb+pTTR7GJOA+WoIaQl/IsudczVXocUjuyr4jjPZyLpm6V5Gb FyRijUs/1P4y76L8QTRNk8PDvzrLAaaqbHIkfiXWXijnu40qpYLUoWTFSNsjP5s+mvaYW5M+mlhwU 6v0ZKC0s4oUB03TLa4jKW/D8MLm31cxVu25y3aTN6kzCck0fJw3ezYTneeVOP3tZbZdAb2RhItJVM dU5J55hFA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8hwf-0002g9-GW; Thu, 20 Aug 2020 10:37:21 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8hv9-00023w-AZ for linux-arm-kernel@lists.infradead.org; Thu, 20 Aug 2020 10:35:48 +0000 Received: by mail-wr1-x449.google.com with SMTP id z1so504282wrn.18 for ; Thu, 20 Aug 2020 03:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=RRUDLQ30J3nDHv605QtnFqERH+SevOS80YqWgmQFnRQ=; b=PuNNLjYO2m6kcfgatgkfzfu8KbNu/7W94jO41l7ayWj/6/LM7fdeLea4tzkvUkCCxz Qq4CqdLVmWVkCx0WTBPTzigccnrYEqphjJ8drnlWmOyKjPq7agHbj239WVyJEFfMY3rD 4vunlIsHn9I5pubvgn0V9tJIRxg8U3gnX1DOCtpcwgT8Ka0QSq2rrHjTn3pWgHAM4RpQ 5mTrVj7ol5AK+BaU96m0DTwtiN1p/nN8L/UKEJ3ZIEfDfX+nRCIDs6H51NUAoDVKCzKs 2RCp5g4G+WudScL3VKtvaQT8gIvqIc0O1vVQqughEkdKfvt+vDeM4k13LnArofetvQ1T U2NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=RRUDLQ30J3nDHv605QtnFqERH+SevOS80YqWgmQFnRQ=; b=Xp7adkPmSmajZ34ZMvRnjvLoq7MC45ZmqnG7TyQfmE2E7kmOV1ZOc6/L8q4qGD6nBD xtKLH8MZsx4yqdAZaGEhl8xmF+asfFbiHGlljaMVfHuNDVwNYVrWkt0zq9vlD2YjDCJV g/Uy3jrTo1AZF4+ThHg7Qjcv29fslPTgUL54KJIhu3/69q+o2SwA1F/XxjqHtnXPUo74 p4wWip2oivISi7DNyI5TxizVf1V6vO4QICi4k2lheWg0SyOlIGPEik2b8PG4hxSxymUu 8+kqa+IOOMBWt0nc3lygUaD5lEgGco9xEROZzbo5sevfxMxbwBKb8SDmf8ng3VYXQwCi LFxw== X-Gm-Message-State: AOAM5302q3yQLELp4P34Ix4miWmSOGzimbyjAdlMHC8sKj39aPbRcloQ ZNCAwcVlDE1oMnGoDO735Dk7ReT6rg8= X-Google-Smtp-Source: ABdhPJx3iaCJXYdyOkNUaDW3ih429EiBupZLfTd5sWs8MnkLgLWgBjzD/EH4FdnyeCa6CoE30TE48gC24T0= X-Received: from ascull.lon.corp.google.com ([2a00:79e0:d:109:4a0f:cfff:fe4a:6363]) (user=ascull job=sendgmr) by 2002:a1c:7f17:: with SMTP id a23mr2796360wmd.28.1597919744411; Thu, 20 Aug 2020 03:35:44 -0700 (PDT) Date: Thu, 20 Aug 2020 11:34:37 +0100 In-Reply-To: <20200820103446.959000-1-ascull@google.com> Message-Id: <20200820103446.959000-12-ascull@google.com> Mime-Version: 1.0 References: <20200820103446.959000-1-ascull@google.com> X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH v2 11/20] KVM: arm64: Restore hyp when panicking in guest context From: Andrew Scull To: kvmarm@lists.cs.columbia.edu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200820_063547_459233_E2D1C9A7 X-CRM114-Status: GOOD ( 17.65 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:449 listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, kernel-team@android.com, suzuki.poulose@arm.com, maz@kernel.org, Sudeep Holla , james.morse@arm.com, Andrew Scull , catalin.marinas@arm.com, will@kernel.org, julien.thierry.kdev@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If the guest context is loaded when a panic is triggered, restore the hyp context so e.g. the shadow call stack works when hyp_panic() is called and SP_EL0 is valid when the host's panic() is called. Use the hyp context's __hyp_running_vcpu field to track when hyp transitions to and from the guest vcpu so the exception handlers know whether the context needs to be restored. Signed-off-by: Andrew Scull --- arch/arm64/include/asm/kvm_asm.h | 10 ++++++++++ arch/arm64/kvm/hyp/entry.S | 24 ++++++++++++++++++++++++ arch/arm64/kvm/hyp/hyp-entry.S | 12 +++++------- arch/arm64/kvm/hyp/nvhe/host.S | 5 +++++ 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 81f29a2c361a..106279a6d027 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -198,6 +198,16 @@ extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ]; ldr \vcpu, [\ctxt, #HOST_CONTEXT_VCPU] .endm +.macro get_loaded_vcpu vcpu, ctxt + hyp_adr_this_cpu \ctxt, kvm_hyp_ctxt, \vcpu + ldr \vcpu, [\ctxt, #HOST_CONTEXT_VCPU] +.endm + +.macro set_loaded_vcpu vcpu, ctxt, tmp + hyp_adr_this_cpu \ctxt, kvm_hyp_ctxt, \tmp + str \vcpu, [\ctxt, #HOST_CONTEXT_VCPU] +.endm + #endif #endif /* __ARM_KVM_ASM_H__ */ diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index e95cd7f2ff86..872ac89ffc1e 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -86,6 +86,8 @@ alternative_else_nop_endif ret 1: + set_loaded_vcpu x0, x1, x2 + add x29, x0, #VCPU_CONTEXT // Macro ptrauth_switch_to_guest format: @@ -116,6 +118,26 @@ alternative_else_nop_endif eret sb +SYM_INNER_LABEL(__guest_exit_panic, SYM_L_GLOBAL) + // x2-x29,lr: vcpu regs + // vcpu x0-x1 on the stack + + // If the hyp context is loaded, go straight to hyp_panic + get_loaded_vcpu x0, x1 + cbz x0, hyp_panic + + // The hyp context is saved so make sure it is restored to allow + // hyp_panic to run at hyp and, subsequently, panic to run in the host. + // This makes use of __guest_exit to avoid duplication but sets the + // return address to tail call into hyp_panic. As a side effect, the + // current state is saved to the guest context but it will only be + // accurate if the guest had been completely restored. + hyp_adr_this_cpu x0, kvm_hyp_ctxt, x1 + adr x1, hyp_panic + str x1, [x0, #CPU_XREG_OFFSET(30)] + + get_vcpu_ptr x1, x0 + SYM_INNER_LABEL(__guest_exit, SYM_L_GLOBAL) // x0: return code // x1: vcpu @@ -163,6 +185,8 @@ SYM_INNER_LABEL(__guest_exit, SYM_L_GLOBAL) // Now restore the hyp regs restore_callee_saved_regs x2 + set_loaded_vcpu xzr, x1, x2 + alternative_if ARM64_HAS_RAS_EXTN // If we have the RAS extensions we can consume a pending error // without an unmask-SError and isb. The ESB-instruction consumed any diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 6e14873680a8..b7a1ea221f6e 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -96,7 +96,7 @@ el2_sync: /* if this was something else, then panic! */ tst x0, #PSR_IL_BIT - b.eq hyp_panic + b.eq __guest_exit_panic /* Let's attempt a recovery from the illegal exception return */ get_vcpu_ptr x1, x0 @@ -105,8 +105,6 @@ el2_sync: el2_error: - ldp x0, x1, [sp], #16 - /* * Only two possibilities: * 1) Either we come from the exit path, having just unmasked @@ -124,12 +122,13 @@ el2_error: cmp x0, x1 adr x1, abort_guest_exit_end ccmp x0, x1, #4, ne - b.ne hyp_panic + b.ne __guest_exit_panic + ldp x0, x1, [sp], #16 mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) eret sb -.macro invalid_vector label, target = hyp_panic +.macro invalid_vector label, target = __guest_exit_panic .align 2 SYM_CODE_START(\label) b \target @@ -170,10 +169,9 @@ check_preamble_length 661b, 662b .macro invalid_vect target .align 7 661: - b \target nop + stp x0, x1, [sp, #-16]! 662: - ldp x0, x1, [sp], #16 b \target check_preamble_length 661b, 662b diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index 5a7380c342c8..d4e8b8084020 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -72,6 +72,11 @@ SYM_FUNC_END(__hyp_do_panic) .macro invalid_host_vect .align 7 + /* If a guest is loaded, panic out of it. */ + stp x0, x1, [sp, #-16]! + get_loaded_vcpu x0, x1 + cbnz x0, __guest_exit_panic + add sp, sp, #16 b hyp_panic .endm