[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2] arm/smmuv3: clean stream tables for non-coherent hardware


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Mykola Kvach <Mykola_Kvach@xxxxxxxx>
  • Date: Mon, 16 Nov 2026 11:47:18 +0000
  • Accept-language: en-US, uk-UA
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=immTEYJfnBn+7IOnXmZVu5RbPG4A0hrE9HawrdLUGCg=; b=uYn3eCwTVw3EIGQc/wuR19J58gCM7l2QOVbDrN8jdPxuwoNJyIkJ0dQ245Jdm4/fN5DOhQBHm3nhaxGv5i8cwydziITQOdlvtZekFp283kp5hj9GDfX5wAKRRKOVFKFwB0nVbMCaJDotgWRslbnngufngFyIZEkT3Z/SaLKdygwO9S/pL4GNpRaK2NdXoGO78j/OuDEf5vpg1oM3mk5sGIush/yQKuL2igb3evPhpLPfQcqALpS+6bVt9pV3TXPZZbKjqzznI6Iw/zq/AJdOJrMktoN4S5+LVnIEumjt6W8B3uw37CjOi798czTloqGB3WUWC3HIPHFr5xRKXyVPqg==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ofb6WerZKheaw37IZ3SdJORRnkCGu56O4/FyrtRYvMCNP7RMOqAHf7RnEfzTGjibxzwLJrsrt4bz9zAdgRZ10kE/sq97kj+xieMXWuqnwEi+62J4CkGkUpsXokYTPjGascc5aRvnNkBdQljfy7hXxGmDWHajkpGTeDLKKN13xRKSzC+tlOCoPzvu1T/WuDtLsEqEendRHW6EFF7G9hQ33f+BELx3reQTtHoydXV5FxUZFw6KkKktRJQC4ilBEJQGa/84gs8AuyJgIGsbMK+LNZDEwJgsvByyJZy4CPc6s2FcA5ZBiK5hUSQD1BjGIvxxgiGQ76o1Thao0PRS3MjC9A==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=epam.com header.i="@epam.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:x-ms-exchange-senderadcheck"
  • Authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com;
  • Cc: Bertrand Marquis <bertrand.marquis@xxxxxxx>, Rahul Singh <rahul.singh@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Volodymyr Babchuk <Volodymyr_Babchuk@xxxxxxxx>
  • Delivery-date: Mon, 16 Nov 2026 11:47:29 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Thread-index: AQHddcA7KSg86rXuDUWg7Tm+9FjlvA==
  • Thread-topic: [PATCH v2] arm/smmuv3: clean stream tables for non-coherent hardware

Xen's dmam_alloc_coherent() returns cacheable memory. A non-coherent
SMMU cannot see writes that remain in the CPU cache.

On Orange Pi 5 (RK3588S), NVMe initialization failed with C_BAD_STREAMID
for SID 0x4100 while the CPU saw a populated L1 descriptor.

Clean new stream tables before use. Clean updated STE data in
arm_smmu_sync_ste_for_sid() before issuing CFGI_STE and CMD_SYNC.
Keep both sync points around the dst[0] update.

Clean the L2 table before writing its L1 pointer, then clean the pointer.
Skip these cache operations on coherent SMMUs.

See Arm IHI 0070G.b, sections 3.15 and 3.21.3.1.

Fixes: 452ddbe3592b ("xen/arm: smmuv3: Add support for SMMUv3 driver")
Assisted-by: Codex:GPT-6.1
Signed-off-by: Mykola Kvach <mykola_kvach@xxxxxxxx>
---
Changes in v2:
- Rename arm_smmu_clean_strtab() to arm_smmu_clean_dcache().
- Pass the STE pointer and clean size to arm_smmu_sync_ste_for_sid().
  Clean the given range there before CFGI_STE and CMD_SYNC. Keep the
  original clean ranges, both sync points around dst[0], and the
  explicit cleaning during table initialisation.
---
 xen/drivers/passthrough/arm/smmu-v3.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/xen/drivers/passthrough/arm/smmu-v3.c 
b/xen/drivers/passthrough/arm/smmu-v3.c
index 232df2421c..945a18a7a1 100644
--- a/xen/drivers/passthrough/arm/smmu-v3.c
+++ b/xen/drivers/passthrough/arm/smmu-v3.c
@@ -637,6 +637,14 @@ static int arm_smmu_cmdq_issue_sync(struct arm_smmu_device 
*smmu)
 }
 
 /* Stream table manipulation functions */
+static void arm_smmu_clean_dcache(struct arm_smmu_device *smmu,
+                               const void *ptr, size_t size)
+{
+       /* Xen's dmam_alloc_coherent() returns cacheable memory. */
+       if (!(smmu->features & ARM_SMMU_FEAT_COHERENCY))
+               (void)clean_dcache_va_range(ptr, size);
+}
+
 static void
 arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc 
*desc)
 {
@@ -649,7 +657,8 @@ arm_smmu_write_strtab_l1_desc(__le64 *dst, struct 
arm_smmu_strtab_l1_desc *desc)
        write_atomic(dst, cpu_to_le64(val));
 }
 
-static void arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid)
+static void arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid,
+                                     const __le64 *dst, size_t size)
 {
        struct arm_smmu_cmdq_ent cmd = {
                .opcode = CMDQ_OP_CFGI_STE,
@@ -659,6 +668,7 @@ static void arm_smmu_sync_ste_for_sid(struct 
arm_smmu_device *smmu, u32 sid)
                },
        };
 
+       arm_smmu_clean_dcache(smmu, dst, size);
        arm_smmu_cmdq_issue_cmd(smmu, &cmd);
        arm_smmu_cmdq_issue_sync(smmu);
 }
@@ -736,7 +746,8 @@ static void arm_smmu_write_strtab_ent(struct 
arm_smmu_master *master, u32 sid,
                 * the STE regardless of whether the old value was live.
                 */
                if (smmu)
-                       arm_smmu_sync_ste_for_sid(smmu, sid);
+                       arm_smmu_sync_ste_for_sid(smmu, sid, dst,
+                                                 STRTAB_STE_DWORDS << 3);
                return;
        }
 
@@ -762,9 +773,9 @@ static void arm_smmu_write_strtab_ent(struct 
arm_smmu_master *master, u32 sid,
                dst[1] |= cpu_to_le64(FIELD_PREP(STRTAB_STE_1_EATS,
                                                 STRTAB_STE_1_EATS_TRANS));
 
-       arm_smmu_sync_ste_for_sid(smmu, sid);
+       arm_smmu_sync_ste_for_sid(smmu, sid, dst, STRTAB_STE_DWORDS << 3);
        write_atomic(&dst[0], cpu_to_le64(val));
-       arm_smmu_sync_ste_for_sid(smmu, sid);
+       arm_smmu_sync_ste_for_sid(smmu, sid, dst, sizeof(*dst));
 
        /* It's likely that we'll want to use the new STE soon */
        if (!(smmu->options & ARM_SMMU_OPT_SKIP_PREFETCH))
@@ -805,7 +816,10 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device 
*smmu, u32 sid)
        }
 
        arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT);
+       /* Clean the L2 table before writing the L1 pointer. */
+       arm_smmu_clean_dcache(smmu, desc->l2ptr, size);
        arm_smmu_write_strtab_l1_desc(strtab, desc);
+       arm_smmu_clean_dcache(smmu, strtab, STRTAB_L1_DESC_DWORDS << 3);
        return 0;
 }
 
@@ -1744,6 +1758,7 @@ static int __init arm_smmu_init_queues(struct 
arm_smmu_device *smmu)
 static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu)
 {
        unsigned int i;
+       size_t size;
        struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg;
        void *strtab = smmu->strtab_cfg.strtab;
 
@@ -1757,6 +1772,9 @@ static int arm_smmu_init_l1_strtab(struct arm_smmu_device 
*smmu)
                strtab += STRTAB_L1_DESC_DWORDS << 3;
        }
 
+       size = cfg->num_l1_ents * (STRTAB_L1_DESC_DWORDS << 3);
+       arm_smmu_clean_dcache(smmu, cfg->strtab, size);
+
        return 0;
 }
 
@@ -1823,6 +1841,7 @@ static int arm_smmu_init_strtab_linear(struct 
arm_smmu_device *smmu)
        cfg->strtab_base_cfg = reg;
 
        arm_smmu_init_bypass_stes(strtab, cfg->num_l1_ents);
+       arm_smmu_clean_dcache(smmu, strtab, size);
        return 0;
 }
 
-- 
2.53.0

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.