| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251117184815.1027271-24-smostafa@google.com>
Date: Mon, 17 Nov 2025 18:48:10 +0000
From: Mostafa Saleh <smostafa@...gle.com>
To: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
kvmarm@...ts.linux.dev, iommu@...ts.linux.dev
Cc: catalin.marinas@....com, will@...nel.org, maz@...nel.org,
oliver.upton@...ux.dev, joey.gouly@....com, suzuki.poulose@....com,
yuzenghui@...wei.com, joro@...tes.org, jean-philippe@...aro.org, jgg@...pe.ca,
praan@...gle.com, danielmentz@...gle.com, mark.rutland@....com,
qperret@...gle.com, tabba@...gle.com, Mostafa Saleh <smostafa@...gle.com>
Subject: [PATCH v5 23/27] iommu/arm-smmu-v3-kvm: Shadow STEs
This patch adds STE emulation, this is done when the host sends the
CFGI_STE command.
In this patch we copy the STE as is to the shadow owned by the hypervisor,
in the next patch, stage-2 page table will be attached.
Signed-off-by: Mostafa Saleh <smostafa@...gle.com>
---
.../iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c | 92 +++++++++++++++++--
1 file changed, 86 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c
index 9e515a130711..fbe1e13fc15d 100644
--- a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c
@@ -22,6 +22,9 @@ struct hyp_arm_smmu_v3_device *kvm_hyp_arm_smmu_v3_smmus;
#define strtab_split(smmu) (FIELD_GET(STRTAB_BASE_CFG_SPLIT, (smmu)->host_ste_cfg))
#define strtab_l1_size(smmu) ((1 << (strtab_log2size(smmu) - strtab_split(smmu))) * \
(sizeof(struct arm_smmu_strtab_l1)))
+#define strtab_hyp_base(smmu) ((smmu)->features & ARM_SMMU_FEAT_2_LVL_STRTAB ? \
+ (u64 *)(smmu)->strtab_cfg.l2.l1tab :\
+ (u64 *)(smmu)->strtab_cfg.linear.table)
#define for_each_smmu(smmu) \
for ((smmu) = kvm_hyp_arm_smmu_v3_smmus; \
@@ -283,6 +286,80 @@ static int smmu_init_cmdq(struct hyp_arm_smmu_v3_device *smmu)
return 0;
}
+/* Get an STE for a stream table base. */
+static struct arm_smmu_ste *smmu_get_ste_ptr(struct hyp_arm_smmu_v3_device *smmu,
+ u32 sid, u64 *strtab)
+{
+ struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg;
+ struct arm_smmu_ste *table = (struct arm_smmu_ste *)strtab;
+
+ if (smmu->features & ARM_SMMU_FEAT_2_LVL_STRTAB) {
+ struct arm_smmu_strtab_l1 *l1tab = (struct arm_smmu_strtab_l1 *)strtab;
+ u32 l1_idx = arm_smmu_strtab_l1_idx(sid);
+ struct arm_smmu_strtab_l2 *l2ptr;
+
+ if (WARN_ON(l1_idx >= cfg->l2.num_l1_ents) ||
+ !(l1tab[l1_idx].l2ptr & STRTAB_L1_DESC_SPAN))
+ return NULL;
+
+ l2ptr = hyp_phys_to_virt(l1tab[l1_idx].l2ptr & STRTAB_L1_DESC_L2PTR_MASK);
+ /* Two-level walk */
+ return &l2ptr->stes[arm_smmu_strtab_l2_idx(sid)];
+ }
+ if (WARN_ON(sid >= cfg->linear.num_ents))
+ return NULL;
+ return &table[sid];
+}
+
+static int smmu_shadow_l2_strtab(struct hyp_arm_smmu_v3_device *smmu, u32 sid)
+{
+ u32 idx = arm_smmu_strtab_l1_idx(sid);
+ u64 *host_ste_base = hyp_phys_to_virt(strtab_host_base(smmu));
+ struct arm_smmu_strtab_l1 *l1_desc = &smmu->strtab_cfg.l2.l1tab[idx];
+ u64 l1_desc_host;
+ struct arm_smmu_strtab_l2 *l2table;
+
+ l2table = kvm_iommu_donate_pages(get_order(sizeof(*l2table)));
+ if (!l2table)
+ return -ENOMEM;
+
+ if (!(smmu->features & ARM_SMMU_FEAT_COHERENCY))
+ kvm_flush_dcache_to_poc(&host_ste_base[idx], sizeof(*l1_desc));
+ l1_desc_host = host_ste_base[idx];
+
+ arm_smmu_write_strtab_l1_desc(l1_desc, hyp_virt_to_phys(l2table));
+ if (!(smmu->features & ARM_SMMU_FEAT_COHERENCY))
+ kvm_flush_dcache_to_poc(l1_desc, sizeof(*l1_desc));
+
+ smmu_share_pages(l1_desc_host & STRTAB_L1_DESC_L2PTR_MASK, sizeof(*l2table));
+ return 0;
+}
+
+static void smmu_reshadow_ste(struct hyp_arm_smmu_v3_device *smmu, u32 sid, bool leaf)
+{
+ u64 *host_ste_base = hyp_phys_to_virt(strtab_host_base(smmu));
+ u64 *hyp_ste_base = strtab_hyp_base(smmu);
+ struct arm_smmu_ste *host_ste_ptr = smmu_get_ste_ptr(smmu, sid, host_ste_base);
+ struct arm_smmu_ste *hyp_ste_ptr = smmu_get_ste_ptr(smmu, sid, hyp_ste_base);
+
+ /*
+ * Linux only uses leaf = 1, when leaf is 0, we need to verify that this
+ * is a 2 level table and reshadow of l2.
+ * Also Linux never clears l1 ptr, that needs to free the old shadow.
+ */
+ if (WARN_ON(!leaf || !host_ste_ptr))
+ return;
+
+ /* If host is valid and hyp is not, means a new L1 installed. */
+ if (!hyp_ste_ptr) {
+ WARN_ON(smmu_shadow_l2_strtab(smmu, sid));
+ hyp_ste_ptr = smmu_get_ste_ptr(smmu, sid, hyp_ste_base);
+ }
+
+ smmu_copy_from_host(smmu, hyp_ste_ptr->data, host_ste_ptr->data,
+ STRTAB_STE_DWORDS << 3);
+}
+
static int smmu_init_strtab(struct hyp_arm_smmu_v3_device *smmu)
{
int ret;
@@ -402,8 +479,13 @@ static bool smmu_filter_command(struct hyp_arm_smmu_v3_device *smmu, u64 *comman
switch (type) {
case CMDQ_OP_CFGI_STE:
- /* TBD: SHADOW_STE*/
+ {
+ u32 sid = FIELD_GET(CMDQ_CFGI_0_SID, command[0]);
+ u32 leaf = FIELD_GET(CMDQ_CFGI_1_LEAF, command[1]);
+
+ smmu_reshadow_ste(smmu, sid, leaf);
break;
+ }
case CMDQ_OP_CFGI_ALL:
{
/*
@@ -576,23 +658,21 @@ static bool smmu_dabt_device(struct hyp_arm_smmu_v3_device *smmu,
regs->regs[rd] = smmu->cmdq_host.llq.cons | err;
}
goto out_ret;
- /* Passthrough the register access for bisectiblity, handled later */
case ARM_SMMU_STRTAB_BASE:
if (is_write) {
/* Must only be written when SMMU_CR0.SMMUEN == 0.*/
WARN_ON(is_smmu_enabled(smmu));
smmu->host_ste_base = val;
}
- mask = read_write;
- break;
+ goto out_ret;
case ARM_SMMU_STRTAB_BASE_CFG:
if (is_write) {
/* Must only be written when SMMU_CR0.SMMUEN == 0.*/
WARN_ON(is_smmu_enabled(smmu));
smmu->host_ste_cfg = val;
}
- mask = read_write;
- break;
+ goto out_ret;
+ /* Passthrough the register access for bisectiblity, handled later */
case ARM_SMMU_GBPA:
mask = read_write;
break;
--
2.52.0.rc1.455.g30608eb744-goog
Powered by blists - more mailing lists