From patchwork Tue Feb 25 17:29:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13990381 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFAD6195B1A; Tue, 25 Feb 2025 17:29:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740504586; cv=none; b=n3MkZ9Qv9pTJkkPdIDBDYhlyUDDwQucPcJ2/aLQHg82E610tOxKRbJ9W6taLHOX3hvmf3LOExMGl470xbatsPNzqKsuyvm6ajTEkDDXH3hJmkftZlmQBBc/uiwo2HSNGUTIqRvxnWiQxfV92EBucpDZf5LmpItZO1C67RubNO3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740504586; c=relaxed/simple; bh=0xS3fW4oZ0PtXSj9HeugpPwELnlxqhqnqF89CfNA+uk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=T71CNU+NKwXIlrG6D5YLeaipa46fquvUSjAqD2RPhAVyvOTLhtbopf71qvZzB65B58oX/RKdL44DQFznx47X6JvT/LuoaoiirXnuf1rpu8A80XaLXXaXQuYPMj+z73gCyXQAnSAKSZ6GEYVX37EzdrEMSoCxrbk1fBd08jdTuk8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NW+nen33; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NW+nen33" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3348C4CEDD; Tue, 25 Feb 2025 17:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740504585; bh=0xS3fW4oZ0PtXSj9HeugpPwELnlxqhqnqF89CfNA+uk=; h=From:To:Cc:Subject:Date:From; b=NW+nen33YMsuhW/Y7/XVUczMtZ5Z0Dv2umaRq83VrGRz2KaHzQzDTIzKVBP3K5DMO ZWehbuDV+pIAAjPOLyL3kNvJYSnSgJTQpvM5bX1w3poH1o4Fwqa2tWP/VzjjSqCx3l sEEvji4oEpJB6tFs0kNHkYx3O20X7b6Uxc7C+UAhIGRMIpXpXfKFkiCEbvGVwl8QXS fwXUlBEgIKoZ95HtmCTSxk9ylk4TF4dPgzx2wZIlLVoG//WZfaiLbJDi0oYlku0Smm cjwIegoKOO9/b0jDhXJ0XK7tWXpwRGPeo8yNEtAYeIdqNFzh9zVt2Gwx8hWHSPTtvh EONRMi8XzcPIw== 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 1tmykZ-007rKs-KN; Tue, 25 Feb 2025 17:29:43 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Andre Przywara , Eric Auger Subject: [PATCH v4 00/16] KVM: arm64: Add NV GICv3 support Date: Tue, 25 Feb 2025 17:29:14 +0000 Message-Id: <20250225172930.1850838-1-maz@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, andre.przywara@arm.com, eric.auger@redhat.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Here's a respin of the NV support for GICv3. The integration branch containing this (and the rest of the NV stack) is still at [4]. At this stage, I think this is good to go. * From v3 [3]: - Added a comment indicating the relative priority of L2->L1 IRQ handling as a request - Rebased on 6.14-rc3 * From v2 [2]: - Picked RBs from Andre, with thanks - Rebased on 6.14-rc1 * From v1 [1]: - Fix the default value for the MI INTID to PPI9, instead of something fairly random... - Fail KVM initialisation if asking for NV on HW without a virtual GICv3. [1] https://lore.kernel.org/r/20241217151331.934077-1-maz@kernel.org [2] https://lore.kernel.org/r/20250112170845.1181891-1-maz@kernel.org [3] https://lore.kernel.org/r/20250206154925.1109065-14-maz@kernel.org [4] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/nv-next Andre Przywara (1): KVM: arm64: nv: Allow userland to set VGIC maintenance IRQ Jintack Lim (1): KVM: arm64: nv: Respect virtual HCR_EL2.TWx setting Marc Zyngier (13): arm64: sysreg: Add layout for ICH_HCR_EL2 arm64: sysreg: Add layout for ICH_VTR_EL2 arm64: sysreg: Add layout for ICH_MISR_EL2 KVM: arm64: nv: Load timer before the GIC KVM: arm64: nv: Add ICH_*_EL2 registers to vpcu_sysreg KVM: arm64: nv: Plumb handling of GICv3 EL2 accesses KVM: arm64: nv: Sanitise ICH_HCR_EL2 accesses KVM: arm64: nv: Nested GICv3 emulation KVM: arm64: nv: Handle L2->L1 transition on interrupt injection KVM: arm64: nv: Add Maintenance Interrupt emulation KVM: arm64: nv: Propagate used_lrs between L1 and L0 contexts KVM: arm64: nv: Fold GICv3 host trapping requirements into guest setup KVM: arm64: nv: Fail KVM init if asking for NV without GICv3 Oliver Upton (1): KVM: arm64: nv: Request vPE doorbell upon nested ERET to L2 .../virt/kvm/devices/arm-vgic-v3.rst | 12 +- arch/arm64/include/asm/kvm_emulate.h | 13 + arch/arm64/include/asm/kvm_host.h | 45 +- arch/arm64/include/asm/kvm_hyp.h | 2 + arch/arm64/include/asm/sysreg.h | 30 -- arch/arm64/include/uapi/asm/kvm.h | 1 + arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/arm.c | 20 +- arch/arm64/kvm/emulate-nested.c | 18 +- arch/arm64/kvm/handle_exit.c | 6 +- arch/arm64/kvm/hyp/vgic-v3-sr.c | 16 +- arch/arm64/kvm/nested.c | 13 + arch/arm64/kvm/sys_regs.c | 95 +++- arch/arm64/kvm/vgic-sys-reg-v3.c | 8 +- arch/arm64/kvm/vgic/vgic-init.c | 29 ++ arch/arm64/kvm/vgic/vgic-kvm-device.c | 29 +- arch/arm64/kvm/vgic/vgic-v3-nested.c | 409 ++++++++++++++++++ arch/arm64/kvm/vgic/vgic-v3.c | 44 +- arch/arm64/kvm/vgic/vgic-v4.c | 18 +- arch/arm64/kvm/vgic/vgic.c | 38 ++ arch/arm64/kvm/vgic/vgic.h | 6 + arch/arm64/tools/sysreg | 48 ++ drivers/irqchip/irq-apple-aic.c | 8 +- include/kvm/arm_vgic.h | 10 + tools/arch/arm/include/uapi/asm/kvm.h | 1 + tools/arch/arm64/include/asm/sysreg.h | 30 -- 26 files changed, 834 insertions(+), 117 deletions(-) create mode 100644 arch/arm64/kvm/vgic/vgic-v3-nested.c