From patchwork Fri Apr 19 10:29:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13636189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DE676C4345F for ; Fri, 19 Apr 2024 10:30:12 +0000 (UTC) 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: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:In-Reply-To:References: List-Owner; bh=EhJqC0C3JZYs1SQmh5PMLAjwnFQxHDzfC7BAvY470V4=; b=0uORkxmRIg+ejA WIPXJohx2eOgl3LUQ4SVEezg7CkdiubKL/v2E0R5SU16uUM+AEKvLS1g8+8ENic3F6ea70LAgiZw8 Do9MiLuyWA8K41s81OCLCxM0DRqXfZc1MKU1HlaJnN3qhZ2kDojJ6O1xxuQrLeFPQxIk+slmU8cIj eyw/NRuTfMGsi6+I7fR8R0WXMFshSk7p5W0/rsRo6kqYYdQjINig2srd0z9uNklE80McbBmuA33mp MMRHVs3Se1iddjlocAHoOD5wLK0h7HycN/vVf+VCjAwTx8KmfFmeLHGcBrmRutaWLUa1tSvJwVFID Uz3brhnrhWNfthe2+VAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxlVF-00000005IsM-2Kna; Fri, 19 Apr 2024 10:29:57 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxlVB-00000005IoT-07mR for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2024 10:29:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8CA3761909; Fri, 19 Apr 2024 10:29:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33238C072AA; Fri, 19 Apr 2024 10:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713522591; bh=oZmZPctCotrCq2I+Ib+SaqvmG6TBCbnm4fEl6TGBaZg=; h=From:To:Cc:Subject:Date:From; b=Tcx94vRX5SrgH6g4MCO4oOFu46lw0gATa/u/5w8L4MmhP43hQRnsm1rslsRmWDGJC kLKyXrFf/nWV8CHrUd9KprtdI7sn+FAjW85kL/Fewv3fxIeXAqcV6FvWo15531oaWh q4s5X3F9M+nEP7ewijlq6cMZVe7C8Rzwrt4P6BMf5+CMSHWn5ruGEeov3ZtCbI3Da9 NuHUXIySz53j5xY248wMZflPOR5gcy7xl/hKJAzvAB6ELfCOeq3NnkN4qUe+2WCpz6 g9cqswOX6VtLUhbq46tMF+cReeNVVpq895Qxsheouj382jHmHAEJaKBNksXDQfCpw+ NmCQjiMTpaxvA== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rxlV6-00636W-AW; Fri, 19 Apr 2024 11:29:49 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Joey Gouly , Fuad Tabba , Mostafa Saleh , Will Deacon , Catalin Marinas Subject: [PATCH v4 00/15] KVM/arm64: Add NV support for ERET and PAuth Date: Fri, 19 Apr 2024 11:29:20 +0100 Message-Id: <20240419102935.1935571-1-maz@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, joey.gouly@arm.com, tabba@google.com, smostafa@google.com, will@kernel.org, catalin.marinas@arm.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-20240419_032953_191146_323A0265 X-CRM114-Status: GOOD ( 14.13 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is the fourth version of this series introducing ERET and PAuth support for NV guests, and now the base prefix for the NV support series. Unless someone shouts, I intend to take this in for 6.10. * From v3 [3] - Check for NV support before checking for HCR_EL2.NV on vpcu exit - Rebased on 6.9-rc1 * From v2 [2] - Enforce that both Address and Generic authentication use the same algorithm - Reduce PAuth trapping by eagerly setting the HCR_EL2.API/APK bits - Collected RBs, with thanks - Rebased on kvmarm-6.9 * From v1 [1]: - Don't repaint the ISS_ERET* definitions, but provide reasonable helpers instead - Dropped superfluous VNCR_EL2 definition - Amended comments and creative spelling [1] https://lore.kernel.org/r/20240219092014.783809-1-maz@kernel.org [2] https://lore.kernel.org/r/20240226100601.2379693-1-maz@kernel.org [3] https://lore.kernel.org/r/20240321155356.3236459-1-maz@kernel.org Marc Zyngier (15): KVM: arm64: Harden __ctxt_sys_reg() against out-of-range values KVM: arm64: Add helpers for ESR_ELx_ERET_ISS_ERET* KVM: arm64: Constraint PAuth support to consistent implementations KVM: arm64: nv: Drop VCPU_HYP_CONTEXT flag KVM: arm64: nv: Configure HCR_EL2 for FEAT_NV2 KVM: arm64: nv: Add trap forwarding for ERET and SMC KVM: arm64: nv: Fast-track 'InHost' exception returns KVM: arm64: nv: Honor HFGITR_EL2.ERET being set KVM: arm64: nv: Handle HCR_EL2.{API,APK} independently KVM: arm64: nv: Reinject PAC exceptions caused by HCR_EL2.API==0 KVM: arm64: nv: Add kvm_has_pauth() helper KVM: arm64: nv: Add emulation for ERETAx instructions KVM: arm64: nv: Handle ERETA[AB] instructions KVM: arm64: nv: Advertise support for PAuth KVM: arm64: Drop trapping of PAuth instructions/keys arch/arm64/include/asm/esr.h | 12 ++ arch/arm64/include/asm/kvm_emulate.h | 10 -- arch/arm64/include/asm/kvm_host.h | 26 +++- arch/arm64/include/asm/kvm_nested.h | 13 ++ arch/arm64/include/asm/kvm_ptrauth.h | 21 +++ arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 83 +++++++++- arch/arm64/kvm/emulate-nested.c | 66 +++++--- arch/arm64/kvm/handle_exit.c | 36 ++++- arch/arm64/kvm/hyp/include/hyp/switch.h | 62 +------- arch/arm64/kvm/hyp/nvhe/switch.c | 4 +- arch/arm64/kvm/hyp/vhe/switch.c | 96 +++++++++++- arch/arm64/kvm/nested.c | 8 +- arch/arm64/kvm/pauth.c | 196 ++++++++++++++++++++++++ 15 files changed, 514 insertions(+), 121 deletions(-) create mode 100644 arch/arm64/kvm/pauth.c Reviewed-by: Oliver Upton