From nobody Tue Dec 2 03:00:10 2025 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (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 B6DB132E6AD for ; Mon, 17 Nov 2025 18:48:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405314; cv=none; b=NaD48T9gwAJm5RuTfJ3/DWFhbB6xpa45hG/FT8eIHEha6jjlTGm3yPOL3ZBeaUJr3vwenjws+GuFuUJNegz8Z688W1inqerK4DwVlowhntlD+ERRv3Xa9T2SKy3K2m72b14WZqK24AyM25LVU3F3g7DCO0XvA9w5qzNk6OIYL1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405314; c=relaxed/simple; bh=vQaTJ6UbtFrpH+abzCIlTBUfgMGn+5ViTneidf9fDrA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dCI4zPNwmmSH5sS/F2PRK48Swq3e/cU8TrQs84Uoh+i+1BPkWVA01ANO+lP6IZ0CZn7EgBoct51ZvI+4Y+jNgmEdpbq5SBe53CMcQqSu+eAM791gQC+8qOw9zWr9TQctTDlDGkaIAgNvvMGdgfpFAiMK/ZRP1MHCPbG5ImPApo8= 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=CdIHFon9; arc=none smtp.client-ip=209.85.221.74 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="CdIHFon9" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-429c95fdba8so237248f8f.0 for ; Mon, 17 Nov 2025 10:48:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763405310; x=1764010110; 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=pa06yX889DYuT+oZK4r6IpdtcQ56yZdpVOQD3ivoTx4=; b=CdIHFon9ACNfknbH8swjqSionJuYdPU6ECiDZybO8M1NB5c0aAK+iCWXick4nTa9Mh puvZfksHUGyDTgiY/9quu82bOWXkbOlRXT86Ce/MEDbpGJXfc2gLdh1R4A6VzSg73L9a MqhvLMPi/h2M7J/EaOJcgDMiBJtP12NX7hJp31YbA6urD6orU2wtAropoOqVwt6r6+Yl bGAn84Kn9yAsih8S10sNkQYS0iVuB8+vjo5CXIS2OrdZ4se1g4O965n74uBLi3PmFIny EskXf0LzIVg11r6NSAd+Xc5t1vQIqGUa97JRKBlBoGfAR4hiF5RAMmq4LALUgMTO2bIH sn6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763405310; x=1764010110; 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=pa06yX889DYuT+oZK4r6IpdtcQ56yZdpVOQD3ivoTx4=; b=Vk+t92h+Rz5JHoYOVKgW1pkHswY5Bvxucs+2QMsEc0yxDmBnghanf8q/a3yGQZGF0E 3GkhQk8JH1DkcZRMyJAsNoNj0sfwxlnzHNQbZ5wfZ+C3guqhmxqrmKc151xaEzXj8Djr SNNCQAqWbTcdN3Dds08/VtAwJXMtKiPUq5iRXmR9mezkMbdP92LNi63lS6D+IlR3uvWQ DBf5jfqzswncMtzA9oXnCE9qGMgX+kSjO0lcXuJe+VM+meE+zTZULpb9CEtPUi8mxIdB A5qyi81/64O9v8qwR00xVyTB+Dxu/YIXbKmvyT2MDBEzimqmYW/k0NTXyksfRiCH2i6u rZvg== X-Forwarded-Encrypted: i=1; AJvYcCXkGy6MiSV4crP/M18Z1ZE2vo3yBXveefzXc7f4OQqSwCMIu/dGeWVqKx4ZrZmu7jKCK/uTxXJvTwCCxQg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg88iqcVebXstH9DbOtwMrhwTIkHER7E7s9jCf2mKq20YQH3Sr 9em177AHBRTn7pcNbbw9Wbwxc+tjRxzED491iMVVENHHwOivbJwEPi7C1rwYuEAK3i8dk9dY3Sl 8O1L4iqRT5owpNA== X-Google-Smtp-Source: AGHT+IEpCDIon+7uG37hSzh8xEnVSPrSqapIC6AAiKmu0f1Bo4efhhsle4hTqBMXTR+Cl+gfspw5gNrrIxHwpg== X-Received: from wrao26.prod.google.com ([2002:adf:8b9a:0:b0:42b:4c63:868a]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:3108:b0:42b:30d4:e3f0 with SMTP id ffacd0b85a97d-42b5933b5c7mr14452962f8f.22.1763405309761; Mon, 17 Nov 2025 10:48:29 -0800 (PST) Date: Mon, 17 Nov 2025 18:47:51 +0000 In-Reply-To: <20251117184815.1027271-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: <20251117184815.1027271-1-smostafa@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251117184815.1027271-5-smostafa@google.com> Subject: [PATCH v5 04/27] iommu/io-pgtable-arm: Factor kernel specific code out 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, praan@google.com, danielmentz@google.com, mark.rutland@arm.com, qperret@google.com, tabba@google.com, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some of the used APIs are only part of the kernel and are not available in the hypervisor, factor those out: - alloc/free memory - CMOs - virt/phys conversions Which are implemented by the kernel in io-pgtable-arm-kernel.c and similarly for the hypervisor later in this series. va/pa conversion kept as macros. Signed-off-by: Mostafa Saleh --- drivers/iommu/Makefile | 2 +- drivers/iommu/io-pgtable-arm-kernel.c | 103 ++++++++++++++++++++++++++ drivers/iommu/io-pgtable-arm.c | 101 +++---------------------- drivers/iommu/io-pgtable-arm.h | 19 +++++ 4 files changed, 133 insertions(+), 92 deletions(-) create mode 100644 drivers/iommu/io-pgtable-arm-kernel.c diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 8e8843316c4b..439431fd4bc5 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_IOMMU_DEBUGFS) +=3D iommu-debugfs.o obj-$(CONFIG_IOMMU_DMA) +=3D dma-iommu.o obj-$(CONFIG_IOMMU_IO_PGTABLE) +=3D io-pgtable.o obj-$(CONFIG_IOMMU_IO_PGTABLE_ARMV7S) +=3D io-pgtable-arm-v7s.o -obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) +=3D io-pgtable-arm.o +obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) +=3D io-pgtable-arm.o io-pgtable-arm-k= ernel.o obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE_KUNIT_TEST) +=3D io-pgtable-arm-selftes= ts.o obj-$(CONFIG_IOMMU_IO_PGTABLE_DART) +=3D io-pgtable-dart.o obj-$(CONFIG_IOMMU_IOVA) +=3D iova.o diff --git a/drivers/iommu/io-pgtable-arm-kernel.c b/drivers/iommu/io-pgtab= le-arm-kernel.c new file mode 100644 index 000000000000..d025f7c180f9 --- /dev/null +++ b/drivers/iommu/io-pgtable-arm-kernel.c @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * CPU-agnostic ARM page table allocator. + * + * Copyright (C) 2014 ARM Limited + * + * Author: Will Deacon + */ +#include + +#include +#include +#include + +#include "io-pgtable-arm.h" +#include "iommu-pages.h" + +static dma_addr_t __arm_lpae_dma_addr(void *pages) +{ + return (dma_addr_t)virt_to_phys(pages); +} + +void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, + struct io_pgtable_cfg *cfg, + void *cookie) +{ + struct device *dev =3D cfg->iommu_dev; + size_t alloc_size; + dma_addr_t dma; + void *pages; + + /* + * For very small starting-level translation tables the HW requires a + * minimum alignment of at least 64 to cover all cases. + */ + alloc_size =3D max(size, 64); + if (cfg->alloc) + pages =3D cfg->alloc(cookie, alloc_size, gfp); + else + pages =3D iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, + alloc_size); + + if (!pages) + return NULL; + + if (!cfg->coherent_walk) { + dma =3D dma_map_single(dev, pages, size, DMA_TO_DEVICE); + if (dma_mapping_error(dev, dma)) + goto out_free; + /* + * We depend on the IOMMU being able to work with any physical + * address directly, so if the DMA layer suggests otherwise by + * translating or truncating them, that bodes very badly... + */ + if (dma !=3D virt_to_phys(pages)) + goto out_unmap; + } + + return pages; + +out_unmap: + dev_err(dev, "Cannot accommodate DMA translation for IOMMU page tables\n"= ); + dma_unmap_single(dev, dma, size, DMA_TO_DEVICE); + +out_free: + if (cfg->free) + cfg->free(cookie, pages, size); + else + iommu_free_pages(pages); + + return NULL; +} + +void __arm_lpae_free_pages(void *pages, size_t size, + struct io_pgtable_cfg *cfg, + void *cookie) +{ + if (!cfg->coherent_walk) + dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), + size, DMA_TO_DEVICE); + + if (cfg->free) + cfg->free(cookie, pages, size); + else + iommu_free_pages(pages); +} + +void __arm_lpae_sync_pte(arm_lpae_iopte *ptep, int num_entries, + struct io_pgtable_cfg *cfg) +{ + dma_sync_single_for_device(cfg->iommu_dev, __arm_lpae_dma_addr(ptep), + sizeof(*ptep) * num_entries, DMA_TO_DEVICE); +} + +void *__arm_lpae_alloc_data(size_t size, gfp_t gfp) +{ + return kmalloc(size, gfp); +} + +void __arm_lpae_free_data(void *p) +{ + return kfree(p); +} diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index e6626004b323..377c15bc8350 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -15,12 +15,10 @@ #include #include #include -#include =20 #include =20 #include "io-pgtable-arm.h" -#include "iommu-pages.h" =20 #define ARM_LPAE_MAX_ADDR_BITS 52 #define ARM_LPAE_S2_MAX_CONCAT_PAGES 16 @@ -143,7 +141,7 @@ #define ARM_MALI_LPAE_MEMATTR_WRITE_ALLOC 0x8DULL =20 /* IOPTE accessors */ -#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d)) +#define iopte_deref(pte,d) __arm_lpae_phys_to_virt(iopte_to_paddr(pte, d)) =20 #define iopte_type(pte) \ (((pte) >> ARM_LPAE_PTE_TYPE_SHIFT) & ARM_LPAE_PTE_TYPE_MASK) @@ -164,8 +162,6 @@ struct arm_lpae_io_pgtable { void *pgd; }; =20 -typedef u64 arm_lpae_iopte; - static inline bool iopte_leaf(arm_lpae_iopte pte, int lvl, enum io_pgtable_fmt fmt) { @@ -243,83 +239,6 @@ static inline bool arm_lpae_concat_mandatory(struct io= _pgtable_cfg *cfg, (data->start_level =3D=3D 1) && (oas =3D=3D 40); } =20 -static dma_addr_t __arm_lpae_dma_addr(void *pages) -{ - return (dma_addr_t)virt_to_phys(pages); -} - -static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, - struct io_pgtable_cfg *cfg, - void *cookie) -{ - struct device *dev =3D cfg->iommu_dev; - size_t alloc_size; - dma_addr_t dma; - void *pages; - - /* - * For very small starting-level translation tables the HW requires a - * minimum alignment of at least 64 to cover all cases. - */ - alloc_size =3D max(size, 64); - if (cfg->alloc) - pages =3D cfg->alloc(cookie, alloc_size, gfp); - else - pages =3D iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, - alloc_size); - - if (!pages) - return NULL; - - if (!cfg->coherent_walk) { - dma =3D dma_map_single(dev, pages, size, DMA_TO_DEVICE); - if (dma_mapping_error(dev, dma)) - goto out_free; - /* - * We depend on the IOMMU being able to work with any physical - * address directly, so if the DMA layer suggests otherwise by - * translating or truncating them, that bodes very badly... - */ - if (dma !=3D virt_to_phys(pages)) - goto out_unmap; - } - - return pages; - -out_unmap: - dev_err(dev, "Cannot accommodate DMA translation for IOMMU page tables\n"= ); - dma_unmap_single(dev, dma, size, DMA_TO_DEVICE); - -out_free: - if (cfg->free) - cfg->free(cookie, pages, size); - else - iommu_free_pages(pages); - - return NULL; -} - -static void __arm_lpae_free_pages(void *pages, size_t size, - struct io_pgtable_cfg *cfg, - void *cookie) -{ - if (!cfg->coherent_walk) - dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), - size, DMA_TO_DEVICE); - - if (cfg->free) - cfg->free(cookie, pages, size); - else - iommu_free_pages(pages); -} - -static void __arm_lpae_sync_pte(arm_lpae_iopte *ptep, int num_entries, - struct io_pgtable_cfg *cfg) -{ - dma_sync_single_for_device(cfg->iommu_dev, __arm_lpae_dma_addr(ptep), - sizeof(*ptep) * num_entries, DMA_TO_DEVICE); -} - static void __arm_lpae_clear_pte(arm_lpae_iopte *ptep, struct io_pgtable_c= fg *cfg, int num_entries) { for (int i =3D 0; i < num_entries; i++) @@ -395,7 +314,7 @@ static arm_lpae_iopte arm_lpae_install_table(arm_lpae_i= opte *table, arm_lpae_iopte old, new; struct io_pgtable_cfg *cfg =3D &data->iop.cfg; =20 - new =3D paddr_to_iopte(__pa(table), data) | ARM_LPAE_PTE_TYPE_TABLE; + new =3D paddr_to_iopte(__arm_lpae_virt_to_phys(table), data) | ARM_LPAE_P= TE_TYPE_TABLE; if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS) new |=3D ARM_LPAE_PTE_NSTABLE; =20 @@ -616,7 +535,7 @@ static void arm_lpae_free_pgtable(struct io_pgtable *io= p) struct arm_lpae_io_pgtable *data =3D io_pgtable_to_data(iop); =20 __arm_lpae_free_pgtable(data, data->start_level, data->pgd); - kfree(data); + __arm_lpae_free_data(data); } =20 static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, @@ -930,7 +849,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg) if (cfg->oas > ARM_LPAE_MAX_ADDR_BITS) return NULL; =20 - data =3D kmalloc(sizeof(*data), GFP_KERNEL); + data =3D __arm_lpae_alloc_data(sizeof(*data), GFP_KERNEL); if (!data) return NULL; =20 @@ -1053,11 +972,11 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *= cfg, void *cookie) wmb(); =20 /* TTBR */ - cfg->arm_lpae_s1_cfg.ttbr =3D virt_to_phys(data->pgd); + cfg->arm_lpae_s1_cfg.ttbr =3D __arm_lpae_virt_to_phys(data->pgd); return &data->iop; =20 out_free_data: - kfree(data); + __arm_lpae_free_data(data); return NULL; } =20 @@ -1149,11 +1068,11 @@ arm_64_lpae_alloc_pgtable_s2(struct io_pgtable_cfg = *cfg, void *cookie) wmb(); =20 /* VTTBR */ - cfg->arm_lpae_s2_cfg.vttbr =3D virt_to_phys(data->pgd); + cfg->arm_lpae_s2_cfg.vttbr =3D __arm_lpae_virt_to_phys(data->pgd); return &data->iop; =20 out_free_data: - kfree(data); + __arm_lpae_free_data(data); return NULL; } =20 @@ -1223,7 +1142,7 @@ arm_mali_lpae_alloc_pgtable(struct io_pgtable_cfg *cf= g, void *cookie) /* Ensure the empty pgd is visible before TRANSTAB can be written */ wmb(); =20 - cfg->arm_mali_lpae_cfg.transtab =3D virt_to_phys(data->pgd) | + cfg->arm_mali_lpae_cfg.transtab =3D __arm_lpae_virt_to_phys(data->pgd) | ARM_MALI_LPAE_TTBR_READ_INNER | ARM_MALI_LPAE_TTBR_ADRMODE_TABLE; if (cfg->coherent_walk) @@ -1232,7 +1151,7 @@ arm_mali_lpae_alloc_pgtable(struct io_pgtable_cfg *cf= g, void *cookie) return &data->iop; =20 out_free_data: - kfree(data); + __arm_lpae_free_data(data); return NULL; } =20 diff --git a/drivers/iommu/io-pgtable-arm.h b/drivers/iommu/io-pgtable-arm.h index ba7cfdf7afa0..62d127dae1c2 100644 --- a/drivers/iommu/io-pgtable-arm.h +++ b/drivers/iommu/io-pgtable-arm.h @@ -2,6 +2,8 @@ #ifndef IO_PGTABLE_ARM_H_ #define IO_PGTABLE_ARM_H_ =20 +#include + #define ARM_LPAE_TCR_TG0_4K 0 #define ARM_LPAE_TCR_TG0_64K 1 #define ARM_LPAE_TCR_TG0_16K 2 @@ -27,4 +29,21 @@ #define ARM_LPAE_TCR_PS_48_BIT 0x5ULL #define ARM_LPAE_TCR_PS_52_BIT 0x6ULL =20 +typedef u64 arm_lpae_iopte; + +void __arm_lpae_sync_pte(arm_lpae_iopte *ptep, int num_entries, + struct io_pgtable_cfg *cfg); +void __arm_lpae_free_pages(void *pages, size_t size, + struct io_pgtable_cfg *cfg, + void *cookie); +void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, + struct io_pgtable_cfg *cfg, + void *cookie); +void *__arm_lpae_alloc_data(size_t size, gfp_t gfp); +void __arm_lpae_free_data(void *p); +#ifndef __KVM_NVHE_HYPERVISOR__ +#define __arm_lpae_virt_to_phys __pa +#define __arm_lpae_phys_to_virt __va +#endif /* !__KVM_NVHE_HYPERVISOR__ */ + #endif /* IO_PGTABLE_ARM_H_ */ --=20 2.52.0.rc1.455.g30608eb744-goog