From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7A0DC432BE for ; Thu, 12 Aug 2021 19:05:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 89E97610A4 for ; Thu, 12 Aug 2021 19:05:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 89E97610A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1twug1jYLb1cy/RCzNPkFO2nh40rXtd8MZLOw9C5FbA=; b=xwrSEvKhaw40WX UEqwJpECDqLcsXNRm1HUdCTnSOQwmecvMQNBK8ZtKO2Cz9lRp+Ax/bBEMlQE0jAMrTgDEb0qE6bgQ pql7CzG+I5e0dbXI/TyM7aj7cHwqlBeQxGKnSsOmJd6TjsYT/vwuEln1Rk+RARSTqKRqCvKtGzKBL ImqCFQUzb8WOYJ4Xyy60395X0tz84HKaUVxRfUdO+a9RrMDbWVrbAQSo7GwipmJf9b0YU3eLrchWL +vmPW24Gpg2FghQEguUp9rK3aZxMpHLoVxZlCeFGuqeXbxZF6KsZos1IZtb/kUN5A20Vuk3D2OZDw PzwyCL0TPz3Ua44nPZrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEFz8-00AxlR-GC; Thu, 12 Aug 2021 19:03:22 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEFyM-00AxYC-Iu for linux-arm-kernel@lists.infradead.org; Thu, 12 Aug 2021 19:02:38 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 37728610CC; Thu, 12 Aug 2021 19:02:34 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mEFyK-004c9r-JU; Thu, 12 Aug 2021 20:02:32 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Will Deacon , Catalin Marinas , Mark Rutland , Ard Biesheuvel , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, kernel-team@android.com Subject: [PATCH 2/5] arm64: Handle UNDEF in the EL2 stub vectors Date: Thu, 12 Aug 2021 20:02:10 +0100 Message-Id: <20210812190213.2601506-3-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210812190213.2601506-1-maz@kernel.org> References: <20210812190213.2601506-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, zajec5@gmail.com, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, ardb@kernel.org, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210812_120234_698940_01048CEA X-CRM114-Status: GOOD ( 14.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As we want to handle the silly case where HVC has been disabled from EL3, augment our ability to handle exception at EL2. Check for unknown exceptions (usually UNDEF) coming from EL2, and treat them as a failing HVC call into the stubs. While this isn't great and obviously doesn't catter for the gigantic range of possible exceptions, it isn't any worse than what we have today. Just don't try and use it for anything else. Signed-off-by: Marc Zyngier --- arch/arm64/kernel/hyp-stub.S | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S index 43d212618834..026a34515b21 100644 --- a/arch/arm64/kernel/hyp-stub.S +++ b/arch/arm64/kernel/hyp-stub.S @@ -46,7 +46,16 @@ SYM_CODE_END(__hyp_stub_vectors) .align 11 SYM_CODE_START_LOCAL(elx_sync) - cmp x0, #HVC_SET_VECTORS + mrs x4, spsr_el2 + and x4, x4, #PSR_MODE_MASK + orr x4, x4, #1 + cmp x4, #PSR_MODE_EL2h + b.ne 0f + mrs x4, esr_el2 + eor x4, x4, #ESR_ELx_IL + cbz x4, el2_undef + +0: cmp x0, #HVC_SET_VECTORS b.ne 1f msr vbar_el2, x1 b 9f @@ -71,6 +80,14 @@ SYM_CODE_START_LOCAL(elx_sync) 9: mov x0, xzr eret + +el2_undef: + // Assumes this was a HVC that went really wrong... + mrs x0, elr_el2 + add x0, x0, #4 + msr elr_el2, x0 + mov_q x0, HVC_STUB_ERR + eret SYM_CODE_END(elx_sync) // nVHE? No way! Give me the real thing! -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel