From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D739C3A4F34 for ; Fri, 1 May 2026 11:20:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634433; cv=none; b=l/JFzT81q0n7cOh8YIVhboKB7JyOpNZ/pPbLP2aI1Ovj/hCVaJ3DKgVx46qG9rzKb01PcNrubzv9KdxkizF7UJx9KVvp+w1D+U7EHO1L/ECNWRuCp7DofHee6Ngex0jeuMzU1FJWMHUodgtb4zo/tWeBGn3htcnBoQbBxtpvUp8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634433; c=relaxed/simple; bh=/cJ7AkplAzft5yBV8ZxNUAFnFWochsKTITaa04WSWs4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nj8sCWFQlWIeNYZbYBHsiV0GFaEchkojsk+RqH8Rjhiqzx7a2xpQLDuuKNPM/Ub8c70XhZBI6Bbenbk/0uliUIdWKl1QSTBn6a2/+nY3J0ekF4HG4OqD27+t2A4boG3k14a/spbUasq1LLD8rCHrjAYpXnXD2XK5EFrak6iX/u4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=e6S/a2jr; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="e6S/a2jr" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-43d780757eeso1296490f8f.1 for ; Fri, 01 May 2026 04:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777634430; x=1778239230; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=yTbFP/vzGSoWzHV54z7Mcha0ge1NRm8j7joYQ/l7s4Q=; b=e6S/a2jrNORQmjX2uPQ3cQ4gFUfr3D6gJZa2PHEMTfRS+oN2Jgji35VQEqqA/XvdV4 Ys/jTlEVC5LQkj9g8jAL/iRs48v8X2JQf4VPccDIbd6owBAOgvNtiJGsr8Ne8ECsfIfb GdioLrw9Nc3ANvgLrCeyEVnc2JL82D+srwiYS6hgcOFLao5dl9F/UXiKttWc0zKC0Scn 24GJMdqqmO6q8gSu++PnitCVSZV8xVesVr/h4jyXPSeaEcNGX8I3yWpPVPfTr7MGzquE gbasTZ6tZTnoIw3cdxFAIAire6b9Ul5kR/OBtry5RLyQyk+zOtjXzLafW9hygAChHY+a hzJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777634430; x=1778239230; h=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; bh=yTbFP/vzGSoWzHV54z7Mcha0ge1NRm8j7joYQ/l7s4Q=; b=SKF58HO+hwCd923amudB/UohrBGvpQNnbUP/eHerjCATfKKx8vObgaPO/kFtKzcDja M2hp+xkwI624ymLXEI86ps9d9Epwf7oaQVTxqsrhwbbCeKUFeTn5UUncmnrWpicEik0J 8ySXbaZHzh7t/CA1iAAv5joP5oHDe4oP8MFaQYxxWRqByOkkXz5iR1TINOemPWGdsDmu IG/Png9s7COPRsA4SE8NquOV5kT9r7iSTzP5RAwVj0uvR/NPaigZorQSOdcyw7G78pXZ wKJAbQ6ZJr/BEXqR2zWAIZhWaPOXuwKf/RUYC3yccFHostasIqSNUPraOoau5oHqgTAn ufvA== X-Forwarded-Encrypted: i=1; AFNElJ9c3N9SNX27EfZmO1w+KeXu3GJiDbBK1BY8ZE2hdlS7LXm+7TDS2e1lzzDCItds4Ts4s18nYDq/lFjFQ34=@vger.kernel.org X-Gm-Message-State: AOJu0YzQwkqk6cFeVMIfeZTb99nMe9ORabOByLPc3jjVimROxXYap9hQ DIID4GxOiWw5uMoSMfDYZiTGBZE9RCE7g/Ru4pcOACa1xWE3KvY7DeOVwaXhNIo+Z+4WsjIgqNd l0qJeSd2XaKGOxg== X-Received: from wrxp8.prod.google.com ([2002:a05:6000:188:b0:449:9a82:a60d]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1862:b0:43d:779e:afa8 with SMTP id ffacd0b85a97d-4494f9a1430mr11063527f8f.16.1777634430023; Fri, 01 May 2026 04:20:30 -0700 (PDT) Date: Fri, 1 May 2026 11:19:24 +0000 In-Reply-To: <20260501111928.259252-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260501111928.259252-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260501111928.259252-23-smostafa@google.com> Subject: [PATCH v6 22/25] iommu/io-pgtable-arm: Support io-pgtable-arm in the hypervisor 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, jean-philippe@linaro.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 Content-Type: text/plain; charset="UTF-8" To support DMA isolation in pKVM through SMMUv3 nested trap and emulate, io-pgtable-arm needs to be compiled for the hypervisor to create the SMMUs page tables. Instead of factoring out the kernel-specific code and providing parallel implementations for the hypervisor, we directly utilize and abstract the differences within the iommu-pages API. This introduces a set of hypervisor-specific wrappers in iommu-pages.h when compiled under __KVM_NVHE_HYPERVISOR__, routing allocations, frees, virt/phys conversions, and DMA API mapping to the appropriate pKVM hypervisor functions (kvm_iommu_donate_pages, etc). The generic kernel definitions are now appropriately excluded in this case. It also introduces kvm_alloc_io_pgtable_ops at the end of io-pgtable-arm.c to instantiate the page table for pKVM and adds the io-pgtable-arm.o object to the hypervisor Makefile. Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/nvhe/Makefile | 3 +- drivers/iommu/io-pgtable-arm.c | 31 +++++++++++++++- drivers/iommu/io-pgtable-arm.h | 6 +++ drivers/iommu/iommu-pages.h | 63 ++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 8a75739db947..4e9e0f1ed2b5 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -36,7 +36,8 @@ hyp-obj-y += $(lib-objs) HYP_SMMU_V3_DRV_PATH = ../../../../../drivers/iommu/arm/arm-smmu-v3 hyp-obj-$(CONFIG_ARM_SMMU_V3_PKVM) += $(HYP_SMMU_V3_DRV_PATH)/pkvm/arm-smmu-v3.o \ - $(HYP_SMMU_V3_DRV_PATH)/arm-smmu-v3-common-lib.o + $(HYP_SMMU_V3_DRV_PATH)/arm-smmu-v3-common-lib.o \ + $(HYP_SMMU_V3_DRV_PATH)/../../io-pgtable-arm.o # Path to simple_ring_buffer.c CFLAGS_trace.nvhe.o += -I$(srctree)/kernel/trace/ diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index e765021308f9..8a0ffea3ae2c 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -252,10 +252,14 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, void *cookie) { struct device *dev = cfg->iommu_dev; + int nid = NUMA_NO_NODE; size_t alloc_size; dma_addr_t dma; void *pages; + if (dev) + nid = dev_to_node(dev); + /* * For very small starting-level translation tables the HW requires a * minimum alignment of at least 64 to cover all cases. @@ -264,8 +268,7 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, if (cfg->alloc) pages = cfg->alloc(cookie, alloc_size, gfp); else - pages = iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, - alloc_size); + pages = iommu_alloc_pages_node_sz(nid, gfp, alloc_size); if (!pages) return NULL; @@ -1262,3 +1265,27 @@ struct io_pgtable_init_fns io_pgtable_arm_mali_lpae_init_fns = { .alloc = arm_mali_lpae_alloc_pgtable, .free = arm_lpae_free_pgtable, }; + +#ifdef __KVM_NVHE_HYPERVISOR__ +#include + +struct io_pgtable_ops *kvm_alloc_io_pgtable_ops(enum io_pgtable_fmt fmt, + struct io_pgtable_cfg *cfg, + void *cookie) +{ + struct io_pgtable *iop; + + if (fmt != ARM_64_LPAE_S2) + return NULL; + + iop = arm_64_lpae_alloc_pgtable_s2(cfg, cookie); + if (!iop) + return NULL; + + iop->fmt = fmt; + iop->cookie = cookie; + iop->cfg = *cfg; + + return &iop->ops; +} +#endif diff --git a/drivers/iommu/io-pgtable-arm.h b/drivers/iommu/io-pgtable-arm.h index ba7cfdf7afa0..af3a3f1e765e 100644 --- a/drivers/iommu/io-pgtable-arm.h +++ b/drivers/iommu/io-pgtable-arm.h @@ -27,4 +27,10 @@ #define ARM_LPAE_TCR_PS_48_BIT 0x5ULL #define ARM_LPAE_TCR_PS_52_BIT 0x6ULL +#ifdef __KVM_NVHE_HYPERVISOR__ +struct io_pgtable_ops *kvm_alloc_io_pgtable_ops(enum io_pgtable_fmt fmt, + struct io_pgtable_cfg *cfg, + void *cookie); +#endif + #endif /* IO_PGTABLE_ARM_H_ */ diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h index e1945193ad7f..749f0f4f870c 100644 --- a/drivers/iommu/iommu-pages.h +++ b/drivers/iommu/iommu-pages.h @@ -10,6 +10,7 @@ #include #include +#ifndef __KVM_NVHE_HYPERVISOR__ /** * struct ioptdesc - Memory descriptor for IOMMU page tables * @iopt_freelist_elm: List element for a struct iommu_pages_list @@ -181,4 +182,66 @@ static inline void iommu_pages_dma_unmap(struct device *dev, dma_addr_t dma, siz dma_unmap_single(dev, dma, size, DMA_TO_DEVICE); } +#else /* __KVM_NVHE_HYPERVISOR__ */ + +#include +#include + +static inline void *iommu_alloc_pages_node_sz(int nid, gfp_t gfp, size_t size) +{ + return kvm_iommu_donate_pages(get_order(size)); +} + +static inline void iommu_free_pages(void *virt) +{ + kvm_iommu_reclaim_pages(virt); +} + +static inline void *iommu_alloc_data(size_t size, gfp_t gfp) +{ + return kvm_iommu_donate_pages(get_order(size)); +} + +static inline void iommu_free_data(void *p) +{ + kvm_iommu_reclaim_pages(p); +} + +#undef WARN_ONCE +#define WARN_ONCE(condition, format...) WARN_ON(condition) + +static inline phys_addr_t iommu_virt_to_phys(void *virt) +{ + return hyp_virt_to_phys(virt); +} + +static inline void *iommu_phys_to_virt(phys_addr_t phys) +{ + return hyp_phys_to_virt(phys); +} + +static inline void iommu_pages_flush_incoherent(struct device *dma_dev, + void *virt, size_t offset, + size_t len) +{ + kvm_flush_dcache_to_poc(virt + offset, len); +} + +static inline dma_addr_t iommu_pages_dma_map(struct device *dev, void *virt, size_t size) +{ + kvm_flush_dcache_to_poc(virt, size); + return (dma_addr_t)hyp_virt_to_phys(virt); +} + +static inline int iommu_pages_dma_mapping_error(struct device *dev, dma_addr_t dma) +{ + return 0; +} + +static inline void iommu_pages_dma_unmap(struct device *dev, dma_addr_t dma, size_t size) +{ +} + +#endif /* __KVM_NVHE_HYPERVISOR__ */ + #endif /* __IOMMU_PAGES_H */ -- 2.54.0.545.g6539524ca2-goog