From nobody Tue Dec 2 02:59:08 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 B70232D193F for ; Mon, 17 Nov 2025 18:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405336; cv=none; b=TRfh/89Wfq3MJq3wxxZQkOq6sRw5Dk3ZKnpG/EpgfO0stAhbAJiC91mOpOs5g3YhA4Zg3VwGrhwTf8fCjeSJq1DG8kbfQ/5cCRcw154YJjsWRIOV4X/GkVDdxHv3t2Vvp4NegsWP97/BbIlvI6mieMCaPlBZIf2vRR5foAQrwVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405336; c=relaxed/simple; bh=OIllo30ZkV3wRlt33j6CE/EE04FNRPaHVxJuJzubPrY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iUlV5pWSs6ZgVGRWzPfjSpxZUXGyEed+3raL+iM9LA4u4W/hEMy3xs6kkgsik6DAkOirw7w/ZpbTVUoRRawNeYF7tMXh9k3E7PjDNWGdMdwQyG7yd0C03w/4fG3X7Z3VZPW/O7zQrOIghRATkMLuSZad2opErR2km+8SFd/r7TQ= 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=pri/duwk; arc=none smtp.client-ip=209.85.128.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="pri/duwk" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-477771366cbso28638155e9.0 for ; Mon, 17 Nov 2025 10:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763405331; x=1764010131; 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=2e8AJ/3qpxCOMqh4v7dKF/r5F0keF6BFA14sDMtgseA=; b=pri/duwk4FW/n6KIJs+Nc/j0EPeU2XwR3tN4xCMChwEtGBqrrCKyJ0UI4+4lon8RiH Irr16D5gu0dpFdLkIhboKPLyaeaOgU3Xf56rjUSHOGb29rp3aj/0dKqoRTm5j0c5AKyM EerpzzZ+prrz74Z0DuEgSIvhsqaFG0cyY0aznE1eEOyx9VmUtDTMr67X7mOe7Qqwe7Oy A5fmJqPmFaVQbKBh6mz7vpXUJ2nomsy0HXnO0B/YZBFqDjVKOUY/f2OwndL7b6d69YSB 85Ca0QRL0xolqbQwCm+brqKX5L9X9kvCoIXasrZoxOkHdNnnspyTiM09JTYB4uMIRxI+ l68w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763405331; x=1764010131; 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=2e8AJ/3qpxCOMqh4v7dKF/r5F0keF6BFA14sDMtgseA=; b=Z/c5DTdY3YmbYb6+QWz+074vEt7RHFW+Y7MvfiyKVXL8HgdbPfmw4PKhjYcJFXu78a qhpRfyNNGgRO7rbEsPVpTAxPZtJ9MTEWFIlf5H7aHKTqOZEjtlzD0746iddO2BalWJsh TjFfN9MJZvohtSu5vNyg2cwC81mO3DXSfEU34HsBzsmjRvI64RvAjxyHPZdzvPoMTUSv a6y3dG15FqwhM01o490UEdO+Y43Yb9ZDLcFkzyh+bA0fFl4UqwTZKkJgvHnCK81fV3cz lPW4LFnBtr/UnQZeyFXoM834ODiU5+cawa8CxgTCoMSqpmXJdRImI1zwKWXZHzYJzxt/ fLAQ== X-Forwarded-Encrypted: i=1; AJvYcCWv7dk0hoY3h9FoPvUvDTtbijFKtIn64e4P/Sv/YvMTVJzcn0rWfNJ0VybbfW+8r6o6qvMjQP/9udBQK8E=@vger.kernel.org X-Gm-Message-State: AOJu0YzSSozc4V52HLSAKBObrjGXJ4mUzu1VYlU1C1UuqhYVpa6YHwj/ +5gUktOkRswMWqGEmLNy4FcfUru0aVIFBWZDLDou+pEa3n4uX5NPiK9Gs7DN8p7vKKOpJc4r3/T ey7mtsZAnBy0AKA== X-Google-Smtp-Source: AGHT+IFYxGMytoDZZlTDHtwywr4/Pi+/xR6UqlI0u6DlCyyeGT+QjWCV1nogGfL6thKzA2YoXGlkE2OMke9X7g== X-Received: from wrqa7.prod.google.com ([2002:adf:f7c7:0:b0:42b:33e5:eba1]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:240d:b0:3ea:80ec:8552 with SMTP id ffacd0b85a97d-42b59387fbfmr14696008f8f.57.1763405331039; Mon, 17 Nov 2025 10:48:51 -0800 (PST) Date: Mon, 17 Nov 2025 18:48:12 +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-26-smostafa@google.com> Subject: [PATCH v5 25/27] iommu/arm-smmu-v3-kvm: Support io-pgtable 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" Add hooks needed to support io-pgtable-arm, mostly about memory allocation. Also add a function to allocate s2 64 bit page table. Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/nvhe/Makefile | 4 +- .../arm/arm-smmu-v3/pkvm/io-pgtable-arm-hyp.c | 68 +++++++++++++++++++ drivers/iommu/io-pgtable-arm.c | 2 +- drivers/iommu/io-pgtable-arm.h | 11 +++ 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 drivers/iommu/arm/arm-smmu-v3/pkvm/io-pgtable-arm-hyp.c diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index 197685817546..99c2ce941146 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -35,7 +35,9 @@ hyp-obj-y +=3D $(lib-objs) HYP_SMMU_V3_DRV_PATH =3D ../../../../../drivers/iommu/arm/arm-smmu-v3 =20 hyp-obj-$(CONFIG_ARM_SMMU_V3_PKVM) +=3D $(HYP_SMMU_V3_DRV_PATH)/pkvm/arm-s= mmu-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)/pkvm/io-pgtable-arm-hyp.o \ + $(HYP_SMMU_V3_DRV_PATH)/../../io-pgtable-arm.o =20 ## ## Build rules for compiling nVHE hyp code diff --git a/drivers/iommu/arm/arm-smmu-v3/pkvm/io-pgtable-arm-hyp.c b/driv= ers/iommu/arm/arm-smmu-v3/pkvm/io-pgtable-arm-hyp.c new file mode 100644 index 000000000000..fc2006dc0b82 --- /dev/null +++ b/drivers/iommu/arm/arm-smmu-v3/pkvm/io-pgtable-arm-hyp.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2022 Arm Ltd. + */ +#include + +#include +#include "../../../io-pgtable-arm.h" + +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 !=3D ARM_64_LPAE_S2) + return NULL; + + iop =3D arm_64_lpae_alloc_pgtable_s2(cfg, cookie); + if (!iop) + return NULL; + + iop->fmt =3D fmt; + iop->cookie =3D cookie; + iop->cfg =3D *cfg; + + return &iop->ops; +} + +void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, + struct io_pgtable_cfg *cfg, void *cookie) +{ + void *addr; + + addr =3D kvm_iommu_donate_pages(get_order(size)); + + if (addr && !cfg->coherent_walk) + kvm_flush_dcache_to_poc(addr, size); + + return addr; +} + +void __arm_lpae_free_pages(void *addr, size_t size, struct io_pgtable_cfg = *cfg, + void *cookie) +{ + if (!cfg->coherent_walk) + kvm_flush_dcache_to_poc(addr, size); + + kvm_iommu_reclaim_pages(addr); +} + +void __arm_lpae_sync_pte(arm_lpae_iopte *ptep, int num_entries, + struct io_pgtable_cfg *cfg) +{ + if (!cfg->coherent_walk) + kvm_flush_dcache_to_poc(ptep, sizeof(*ptep) * num_entries); +} + +/* At the moment this is only used once, so rounding up to a page is not r= eally a problem. */ +void *__arm_lpae_alloc_data(size_t size, gfp_t gfp) +{ + return kvm_iommu_donate_pages(get_order(size)); +} + +void __arm_lpae_free_data(void *p) +{ + return kvm_iommu_reclaim_pages(p); +} diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 377c15bc8350..dbb1a58a5ce6 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -980,7 +980,7 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg *cfg= , void *cookie) return NULL; } =20 -static struct io_pgtable * +struct io_pgtable * arm_64_lpae_alloc_pgtable_s2(struct io_pgtable_cfg *cfg, void *cookie) { u64 sl; diff --git a/drivers/iommu/io-pgtable-arm.h b/drivers/iommu/io-pgtable-arm.h index 62d127dae1c2..742a6ed9ae3c 100644 --- a/drivers/iommu/io-pgtable-arm.h +++ b/drivers/iommu/io-pgtable-arm.h @@ -41,9 +41,20 @@ void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, void *cookie); void *__arm_lpae_alloc_data(size_t size, gfp_t gfp); void __arm_lpae_free_data(void *p); +struct io_pgtable * +arm_64_lpae_alloc_pgtable_s2(struct io_pgtable_cfg *cfg, void *cookie); #ifndef __KVM_NVHE_HYPERVISOR__ #define __arm_lpae_virt_to_phys __pa #define __arm_lpae_phys_to_virt __va +#else +#include +#define __arm_lpae_virt_to_phys hyp_virt_to_phys +#define __arm_lpae_phys_to_virt hyp_phys_to_virt +#undef WARN_ONCE +#define WARN_ONCE(condition, format...) WARN_ON(1) +struct io_pgtable_ops *kvm_alloc_io_pgtable_ops(enum io_pgtable_fmt fmt, + struct io_pgtable_cfg *cfg, + void *cookie); #endif /* !__KVM_NVHE_HYPERVISOR__ */ =20 #endif /* IO_PGTABLE_ARM_H_ */ --=20 2.52.0.rc1.455.g30608eb744-goog