From patchwork Mon Jun 22 08:06:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11617169 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 6A10D913 for ; Mon, 22 Jun 2020 08:06:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4612920C09 for ; Mon, 22 Jun 2020 08:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592813216; bh=0gZJhb39igS0hzVb6zMN/tZFT8C1rNqIbw7RukeMKqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xyJcW/IViABF/qXUaen5nrCR0nXbskDsJMsOOiHoDfER3gd6UDB3NhNXtdSfkJBXX TiXvkP6dQ3/1rPU/YHCddDoy/6LJp/Bsi1gkxASTIwRgZT3axbFxr/th9yFUIgZFj0 l9DPq5Z/QnJWTn4WiMQlxJfKfHf0QSw+unPjRlcg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725925AbgFVIGz (ORCPT ); Mon, 22 Jun 2020 04:06:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:42076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725820AbgFVIGy (ORCPT ); Mon, 22 Jun 2020 04:06:54 -0400 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 80B7A207F5; Mon, 22 Jun 2020 08:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592813213; bh=0gZJhb39igS0hzVb6zMN/tZFT8C1rNqIbw7RukeMKqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FK0x9M3Xz92zroB0HDA8eCvUmbWChlJfvuB2LSTzLrPtpLgywvtwHIMmpCTfRWChr lQMeCDv05vV+0B15CS5sjekcrtbN8YqkNOYVEXteRaa6lT/KMNew8PNFiOe1FOZgwq EpyuN/Fbgq6P34uvJM88tie1bAHO2yjFlTF/LsHI= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jnHTg-005FG8-0v; Mon, 22 Jun 2020 09:06:52 +0100 From: Marc Zyngier To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: James Morse , Julien Thierry , Suzuki K Poulose , Mark Rutland , Andrew Scull , Dave Martin , kernel-team@android.com Subject: [PATCH v2 1/5] KVM: arm64: Enable Address Authentication at EL2 if available Date: Mon, 22 Jun 2020 09:06:39 +0100 Message-Id: <20200622080643.171651-2-maz@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200622080643.171651-1-maz@kernel.org> References: <20200622080643.171651-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, mark.rutland@arm.com, ascull@google.com, Dave.Martin@arm.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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org While initializing EL2, enable Address Authentication if detected from EL1. We still use the EL1-provided keys though. Acked-by: Andrew Scull Signed-off-by: Marc Zyngier Acked-by: Mark Rutland --- arch/arm64/kvm/hyp-init.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S index 6e6ed5581eed..1587d146726a 100644 --- a/arch/arm64/kvm/hyp-init.S +++ b/arch/arm64/kvm/hyp-init.S @@ -104,6 +104,11 @@ alternative_else_nop_endif */ mov_q x4, (SCTLR_EL2_RES1 | (SCTLR_ELx_FLAGS & ~SCTLR_ELx_A)) CPU_BE( orr x4, x4, #SCTLR_ELx_EE) +alternative_if ARM64_HAS_ADDRESS_AUTH + mov_q x5, (SCTLR_ELx_ENIA | SCTLR_ELx_ENIB | \ + SCTLR_ELx_ENDA | SCTLR_ELx_ENDB) + orr x4, x4, x5 +alternative_else_nop_endif msr sctlr_el2, x4 isb