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 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 52289C98302 for ; Tue, 22 Sep 2026 13:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gEPQieGs38qja288Nq+x3XKvBGSW7T//30W/ZzzD6PA=; b=JOfafEjkdeg9KS9s84ktSpvcKD lJSebRfDL33p35o4egDEAe3WMBKENwh1uFXV2BmpNThHi+PkU6nm/qMSAaptIT5+9B5MNv+uMCsLL hj6ccl3Q9k0cXlebGW6clsuJrRPRwUPTP9hqr+qaq2yP95HJc2ywGiOpUnUFnOrlFMB+xa5vUWDr7 +8c7QViYE3vi9vme1UNFbHFofJLgSQLhc2T+Z0l6mol8drB7FeK9Latt8hV2c5gw4AyY9iHj5I+Jv LpqrUVo/9JreX8bZzX48JfPWlMeID/0fMon3KDcjQb6ivpVDkr4W2HDrkl/tKBM3m3OdoISq+ffsR Zvp5ShMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x90Jd-00000005SYh-3Liq; Tue, 22 Sep 2026 13:13:45 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x90J8-00000005S7t-2Mr0 for linux-arm-kernel@bombadil.infradead.org; Tue, 22 Sep 2026 13:13:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=gEPQieGs38qja288Nq+x3XKvBGSW7T//30W/ZzzD6PA=; b=kQAxzupuoeFf2uh2StyjoTowRt bwDSi91YINgimVOvm0vWUz8GOQQJsENgH8rbQBMGtyhsxzjda1eE6b0IZoyOUyAOM0Eg3i34AYxkD 8Ya8PlJZ3L7ykOSwCYFI+Jai+a3NjoZzNSSt0G6diYGlTVE62B31uQUfIOHwcWoE9Ar4dhbtu36zV rmclTfXDwBnzKcz5eQ48oytt3QeFIDjp8U6f6hhGIUzZcT5Ua7lQ0eSsPEN9E/snmDyidU2LaXabd yQ7IlGohNcKt9fkoCuG2XWO3TZousttmal5FkTXn0p30KwXFYRgQLj1bJhQOTFCF5OesbRy9u/ARm KgXS7WcQ==; Received: from mail-ed1-x548.google.com ([2a00:1450:4864:20::548]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1x90J5-0000000DbZH-2sIm for linux-arm-kernel@lists.infradead.org; Tue, 22 Sep 2026 13:13:13 +0000 Received: by mail-ed1-x548.google.com with SMTP id 4fb4d7f45d1cf-6aa5d0921fcso4880335a12.3 for ; Tue, 22 Sep 2026 06:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790082790; x=1790687590; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=gEPQieGs38qja288Nq+x3XKvBGSW7T//30W/ZzzD6PA=; b=OjA1G/aRkA5jUobzhGqZc6Nh9q2GptQaOjSBypwM32OtfKR0h0faWk1AFUtJ1rpm2+ fqLeX4iCSJhXRX5pRP+qnH27xvDeGb/in8mCQ7K8gex7r7kuI8eUSQm2WZ5gPT7+pWbY LTAcEgZ8rx/8XKWKrJFSiGR6Pqkewbf7wqMqfVV0fCJzyZ9tTtEqWX5BIz2DVKl32IOt 4MawSGQLWBfjmbNDlan26BVp+g8qKL87yZs3eLBjiEcnmjZ/cJUS8V5VDHAUmAzNALmj XpRoF3UJBJiHVbv+qxMmgDD23zZnX1U73iD7hYDKxIQ+xAwS+Y6u7HKUTIXvE0Q0CoAa yY+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790082790; x=1790687590; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=gEPQieGs38qja288Nq+x3XKvBGSW7T//30W/ZzzD6PA=; b=qLmIdxg+QNLiVVJS64h+I7dQLutAGfm3S5YZ4A45FYCFDzXOed4t/zI6qu11VwPL74 EMjm77iprAXGsE1VmZ93OASE/6iR24D+SrHhfVuQ6xnO2XTcPId+8/pmLnjjlPUrQJkV 7TqXszCXaOiKcHz/VBgtG9L22ePtmkOh3bPAemQEI8VC1yQv3FPFRmWoizug5Dzbl4Lo hf5/pNsI+ctfQ+p4EbZXxCRiku6hASkp4fMGrup+Vj/889wmbVI3KDi4TwCO6jlvEPBz Rj2E8A2k4cyyv+IiGeVblCVLOV4t1lY2xZgDTYBuEwV2M1hlfJz1AMCWFfbZz6QJsWM7 b/FQ== X-Gm-Message-State: AFuF++kao2OPFmDw3pDL1ybXEzLA25oJKNyZkqou03qPajlrZ7RErQu9 jWdLvarzhARRlTe95rhjujsWFpLgNuKS0IBaJc7Sj+2TCzeAeCYhtzTkXu9JTD7G9hhrk8NCLzv uSjd4/4DrPKIy+9d8BOBiHcK2NsP/QcRddoPAk/WqxsP+gYkegbhPbq1h53M8G82Fiwx4BFx4nU F0LV6tR8hZB/r93ik3oVerNGrEaHe/Sux86Bhq8sSkmx/3e69IcQYELLWfM1YgXY3Xnw== X-Received: from edxs13.prod.google.com ([2002:a05:6402:164d:b0:6a9:cb33:8782]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:23d0:b0:6a8:59aa:214c with SMTP id 4fb4d7f45d1cf-6aa55eee346mr10169438a12.11.1790082789756; Tue, 22 Sep 2026 06:13:09 -0700 (PDT) Date: Tue, 22 Sep 2026 13:12:39 +0000 In-Reply-To: <20260922131259.2975334-1-smostafa@google.com> Mime-Version: 1.0 References: <20260922131259.2975334-1-smostafa@google.com> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog Message-ID: <20260922131259.2975334-7-smostafa@google.com> Subject: [PATCH v8 06/25] KVM: arm64: iommu: Introduce IOMMU driver infrastructure From: Mostafa Saleh To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, iommu@lists.linux.dev Cc: catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, joro@8bytes.org, jgg@ziepe.ca, mark.rutland@arm.com, qperret@google.com, tabba@google.com, vdonnefort@google.com, sebastianene@google.com, keirf@google.com, Mostafa Saleh , Jean-Philippe Brucker Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260922_141311_921600_279B5785 X-CRM114-Status: GOOD ( 22.51 ) 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 To establish DMA isolation, KVM needs an IOMMU driver which provides ops implemented at EL2. Only one driver can be used and is registered with pkvm_iommu_register_driver() by passing pointer to the ops. This must be called before module_init() which is the point KVM initializes. Signed-off-by: Jean-Philippe Brucker Signed-off-by: Mostafa Saleh --- arch/arm64/include/asm/kvm_host.h | 5 +++++ arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/hyp/include/nvhe/iommu.h | 11 +++++++++++ arch/arm64/kvm/hyp/nvhe/Makefile | 3 ++- arch/arm64/kvm/hyp/nvhe/iommu.c | 19 +++++++++++++++++++ arch/arm64/kvm/hyp/nvhe/setup.c | 10 ++++++++++ arch/arm64/kvm/iommu.c | 25 +++++++++++++++++++++++++ 7 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/kvm/hyp/include/nvhe/iommu.h create mode 100644 arch/arm64/kvm/hyp/nvhe/iommu.c create mode 100644 arch/arm64/kvm/iommu.c diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 27fe0cd5b2d7..7ba7d384889e 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -1717,4 +1717,9 @@ static __always_inline enum fgt_group_id __fgt_reg_to_group_id(enum vcpu_sysreg long kvm_get_cap_for_kvm_ioctl(unsigned int ioctl, long *ext); +#ifndef __KVM_NVHE_HYPERVISOR__ +struct pkvm_iommu_ops; +int pkvm_iommu_register_driver(struct pkvm_iommu_ops *hyp_ops); +#endif + #endif /* __ARM64_KVM_HOST_H__ */ diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 59612d2f277c..0ddef54f7434 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -24,7 +24,7 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \ vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \ vgic/vgic-its.o vgic/vgic-debug.o vgic/vgic-v3-nested.o \ - vgic/vgic-v5.o + vgic/vgic-v5.o iommu.o kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o pmu.o kvm-$(CONFIG_ARM64_PTR_AUTH) += pauth.o diff --git a/arch/arm64/kvm/hyp/include/nvhe/iommu.h b/arch/arm64/kvm/hyp/include/nvhe/iommu.h new file mode 100644 index 000000000000..83abe1a443c6 --- /dev/null +++ b/arch/arm64/kvm/hyp/include/nvhe/iommu.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ARM64_KVM_NVHE_IOMMU_H__ +#define __ARM64_KVM_NVHE_IOMMU_H__ + +struct pkvm_iommu_ops { + int (*init)(void); +}; + +int pkvm_iommu_init(void); + +#endif /* __ARM64_KVM_NVHE_IOMMU_H__ */ diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index f57450ebcb49..7cb79db9bc47 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -24,7 +24,8 @@ CFLAGS_switch.nvhe.o += -Wno-override-init hyp-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \ hyp-main.o hyp-smp.o psci-relay.o early_alloc.o page_alloc.o \ - cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o ffa.o + cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o ffa.o \ + iommu.o hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../hyp-entry.o ../exception.o ../pgtable.o ../vgic-v5-sr.o hyp-obj-y += ../../../kernel/smccc-call.o diff --git a/arch/arm64/kvm/hyp/nvhe/iommu.c b/arch/arm64/kvm/hyp/nvhe/iommu.c new file mode 100644 index 000000000000..ef456eff42d2 --- /dev/null +++ b/arch/arm64/kvm/hyp/nvhe/iommu.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * IOMMU operations for pKVM + * + * Copyright (C) 2022 Linaro Ltd. + */ +#include + +/* Only one set of ops supported */ +struct pkvm_iommu_ops *pkvm_iommu_ops; + +int pkvm_iommu_init(void) +{ + /* Keep DMA isolation optional. */ + if (!pkvm_iommu_ops || !pkvm_iommu_ops->init) + return 0; + + return pkvm_iommu_ops->init(); +} diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 75b00c323310..9607d1b18a88 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -328,6 +329,15 @@ void __noreturn __pkvm_init_finalise(void) if (ret) goto out; + /* + * IOMMU init is done at the end, as it sets up and initializes many + * resources that would be leaked if the hypervisor fails after as there + * is no remove_iommu_driver() at the moment. + */ + ret = pkvm_iommu_init(); + if (ret) + goto out; + pkvm_hyp_vm_table_init(vm_table_base); pkvm_ownership_selftest(selftest_base); diff --git a/arch/arm64/kvm/iommu.c b/arch/arm64/kvm/iommu.c new file mode 100644 index 000000000000..30a3862e93d7 --- /dev/null +++ b/arch/arm64/kvm/iommu.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2025 Google LLC + * Author: Mostafa Saleh + */ + +#include + +extern struct pkvm_iommu_ops *kvm_nvhe_sym(pkvm_iommu_ops); + +static DEFINE_MUTEX(pkvm_iommu_reg_lock); + +int pkvm_iommu_register_driver(struct pkvm_iommu_ops *hyp_ops) +{ + guard(mutex)(&pkvm_iommu_reg_lock); + + if (!is_protected_kvm_enabled() || is_kvm_arm_initialised()) + return -EPERM; + + if (kvm_nvhe_sym(pkvm_iommu_ops)) + return -EBUSY; + + kvm_nvhe_sym(pkvm_iommu_ops) = hyp_ops; + return 0; +} -- 2.55.0.1082.g2b9226bbc0-goog