iommu/rockchip: fix page table allocation flags for v2 IOMMU
Subsystems (3)
PATCH 1/1 iommu/rockchip: fix page table allocation flags for v2 IOMMU
commit 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removed GFP_DMA32 from iommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.
On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing GFP_DMA32 causes two distinct failure modes:
1. Direct allocation above 4 GB: iommu_alloc_pages_sz() may return memory above 0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.
2. SWIOTLB bounce-buffer poisoning: without GFP_DMA32, page tables land above the SWIOTLB window. dma_map_single() with DMA_BIT_MASK(32) then bounces them into a buffer below 4 GB. rk_dte_get_page_table() returns phys_to_virt() of the bounce buffer address; PTEs are written there; the next dma_sync_single_for_device(DMA_TO_DEVICE) copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.
Restore GFP_DMA32 (and DMA_BIT_MASK(32)) for iommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.
Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference results
--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/rockchip-iommu.c +2 -2
@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, };static const struct of_device_id rk_iommu_dt_ids[] = {
Signature · 1 line
2.30.2
+ Simon
Quoted 54 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may return memory above0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()returnsphys_to_virt()of the bounce buffer address; PTEs are written there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2")Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, };static const struct of_device_id rk_iommu_dt_ids[] = {
Hi Midgy,
Quoted 44 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may return memory above0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()returnsphys_to_virt()of the bounce buffer address; PTEs are written there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2")Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +0
-0
drivers/iommu/rockchip-iommu.c static struct rk_iommu_ops iommu_data_ops_v2 = { · line 1362
Quoted 7 lines
drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32,
This change is wrong because this struct describe the RK IOMMU v2 that is capable of 40-bit addressing, used with e.g. RK3568 VOP2 MMU and MMUs in other RK35xx SoCs.
What you have discovered is most likely that some IP blocks, e.g. NPU on RK3568, is not capable of >32-bit addressing, and/or that such IP blocks are still using IOMMU v1 blocks, or some variant with 32-bit limitation.
However, the RK IOMMU driver is currently not capable of supporting different IOMMU revisions, if I recall correctly there may have been a patch trying to address that already on ML.
Have you seen this issue with a variant of the rockit driver that add support for RK3568 or a variant of the downstream rknpu driver forward ported to mainline?
If your findings are correct it is likely that the NPU MMU needs to use a different compatible, since rockchip,rk3568-iommu describe the IOMMUv2 that is capable of 40-bit addressing and is also used by other RK35xx SoCs.
Regards,
Jonas
drivers/iommu/rockchip-iommu.c static struct rk_iommu_ops iommu_data_ops_v2 = { · line 1365
Quoted 3 lines
drivers/iommu/rockchip-iommu.c +0
-0};static const struct of_device_id rk_iommu_dt_ids[] = {
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Hi Midgy,
Quoted 7 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.
Quoted 7 lines
On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may return memory above0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.
Which IP block is hitting this? We'd like to take a look on our end.
Quoted 7 lines
2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()returnsphys_to_virt()of the bounce buffer address; PTEs are written there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.
This probably need a separate patch. One way to fix it would be to track the original L2 page table base addresses in struct rk_iommu_domain, then have rk_dte_get_page_table() return the tracked address instead of deriving it from the DTE.
Quoted 31 lines
Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2")Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, };static const struct of_device_id rk_iommu_dt_ids[] = {
Hi Simon,
Quoted 13 lines · Simon
Hi Midgy,
Quoted 10 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:
Quoted 6 lines
Quoted 4 lines
1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may return memory above0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.Which IP block is hitting this? We'd like to take a look on our end.
I have seen reports that the NPU MMU on RK3568/RK3566 is having some issue using DTE/PTE with >32-bit addresses, maybe it uses a different MMU hw revision or has some hw errata?
From my own testing at least the VOP2 MMU on RK3568 (and RK3588) was able to handle 40-bit addressable DTE/PTE, hence the original commit 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2").
As also mentioned in my reply at [1], maybe the NPU MMU has some hw limitation or errata and may need to use a different compatible.
[1] https://lore.kernel.org/r/[email protected]/
Regards,
Jonas
Quoted 44 lines
Quoted 8 lines
2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()returnsphys_to_virt()of the bounce buffer address; PTEs are written there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.This probably need a separate patch. One way to fix it would be to track the original L2 page table base addresses in struct
rk_iommu_domain, then haverk_dte_get_page_table()return the tracked address instead of deriving it from the DTE.Quoted 30 lines
Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2")Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, };
Quoted 1 line
drivers/iommu/rockchip-iommu.c static struct rk_iommu_ops iommu_data_ops_v2 = { · line 1365
Quoted 1 line
drivers/iommu/rockchip-iommu.c +0
-0static const struct of_device_id rk_iommu_dt_ids[] = {
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Hi Jonas,
Quoted 25 lines · Jonas Karlman
Hi Simon,
Quoted 10 lines · Simon
Hi Midgy,
Quoted 7 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.Quoted 8 lines
Quoted 7 lines
On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may return memory above0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.Which IP block is hitting this? We'd like to take a look on our end.
I have seen reports that the NPU MMU on RK3568/RK3566 is having some issue using DTE/PTE with >32-bit addresses, maybe it uses a different MMU hw revision or has some hw errata?
Quoted 7 lines
From my own testing at least the VOP2 MMU on RK3568 (and RK3588) was
able to handle 40-bit addressable DTE/PTE, hence the original commit2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2").As also mentioned in my reply at [1], maybe the NPU MMU has some hw limitation or errata and may need to use a different compatible.
Yes, We are checking internally whether different IOMMU versions integrated.
I will share what we find once we have results.
Quoted 49 lines
[1] https://lore.kernel.org/r/[email protected]/
Regards,
JonasQuoted 43 lines
Quoted 7 lines
2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()returnsphys_to_virt()of the bounce buffer address; PTEs are written there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.This probably need a separate patch. One way to fix it would be to track the original L2 page table base addresses in struct
rk_iommu_domain, then haverk_dte_get_page_table()return the tracked address instead of deriving it from the DTE.Quoted 31 lines
Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2")Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, };static const struct of_device_id rk_iommu_dt_ids[] = {
Quoted 33 lines · Simon Xue
Hi Jonas,
Quoted 30 lines · Jonas Karlman
Hi Simon,
Quoted 10 lines · Simon
Hi Midgy,
Quoted 7 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.Quoted 8 lines
Quoted 7 lines
On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may return memory above 0x100000000. The hardware page-table walker issues a bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.Which IP block is hitting this? We'd like to take a look on our end.
I have seen reports that the NPU MMU on RK3568/RK3566 is having some issue using DTE/PTE with >32-bit addresses, maybe it uses a different MMU hw revision or has some hw errata?
From my own testing at least the VOP2 MMU on RK3568 (and RK3588) was able to handle 40-bit addressable DTE/PTE, hence the original commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2").
Quoted 7 lines
Quoted 2 lines
As also mentioned in my reply at [1], maybe the NPU MMU has some hw limitation or errata and may need to use a different compatible.
Yes, We are checking internally whether different IOMMU versions integrated.
I will share what we find once we have results.
We internally checked that the RK356x SoCs integrate two different IOMMU versions (v1.0 and v2.0), like NPU and ISP use the v1.0 IOMMU.
Both versions can map 40-bit physical pages, but v1.0 does not support placing the first-level page table above 4 GB.
To fix this, I think we need to land this patch first: https://lore.kernel.org/all/[email protected]/
Then on top of that, we can add a new compatible string to distinguish the IOMMU versions.
Quoted 48 lines
Quoted 48 lines
[1] https://lore.kernel.org/r/[email protected]/
Regards,
JonasQuoted 42 lines
Quoted 7 lines
2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()returnsphys_to_virt()of the bounce buffer address; PTEs are written there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)copies the original (zero) data back over the bounce buffer, silently erasing the freshly written PTEs. The IOMMU faults because every PTE reads as zero.This probably need a separate patch. One way to fix it would be to track the original L2 page table base addresses in struct
rk_iommu_domain, then haverk_dte_get_page_table()return the tracked address instead of deriving it from the DTE.Quoted 30 lines
Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from all available memory for IOMMU v2")Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>---
drivers/iommu/rockchip-iommu.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, }; static const struct of_device_id rk_iommu_dt_ids[] = {
From: Midgy BALON <[email protected]>
To: Simon Xue <[email protected]>
Cc: Jonas Karlman <[email protected]>, [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
In-Reply-To: <[email protected]>
References: <[email protected]>
<[email protected]> <[email protected]> <[email protected]> <[email protected]>
Subject: Re: [PATCH] iommu/rockchip: fix page table allocation flags
for v2 IOMMU
Quoted 11 lines · Simon Xue
We internally checked that the RK356x SoCs integrate two different IOMMU versions (v1.0 and v2.0), like NPU and ISP use the v1.0 IOMMU.
Both versions can map 40-bit physical pages, but v1.0 does not support placing the first-level page table above 4 GB.
To fix this, I think we need to land this patch first:
https://lore.kernel.org/all/[email protected]/Then on top of that, we can add a new compatible string to distinguish the IOMMU versions.
Thank you Simon and Jonas for the internal investigation. This explains exactly what I observed.
To answer Simon's earlier question: the IP block hitting both failure modes is the NPU IOMMU (rknpu_mmu, at 0xfde4b000), currently bound to "rockchip,rk3568-iommu" in rk356x-base.dtsi. Both the downstream rknpu driver and the upstream Rocket accel driver (drivers/accel/rocket/) use this IOMMU.
The v1.0 first-level page table constraint explains both failure modes. On boards with more than 4 GB of RAM the DTE table can be allocated above 0x100000000, and the v1.0 hardware silently truncates or errors on that address. The SWIOTLB bounce-buffer path is a consequence of the same root cause: with DMA_BIT_MASK(32) on the NPU device, bounce buffers land below 4 GB, phys_to_virt() of the bounce address is then used as the PTE write target, and the subsequent dma_sync_single_for_device(DMA_TO_DEVICE) overwrites those PTEs with zeros from the original buffer.
Please consider my original patch withdrawn. Modifying iommu_data_ops_v2 was too broad and would have incorrectly constrained VOP2 MMU and all other v2 IOMMU users.
I agree fully with the two-step approach. On top of your per-device-ops patch [1], I plan to send:
[1/2] iommu/rockchip: Add "rockchip,rk3568-iommu-v1" compatible
for IOMMU v1.0 blocks (NPU, ISP/VICAP) on RK3568 — ops with .gfp_flags = GFP_DMA32,
.dma_bit_mask = DMA_BIT_MASK(40)
(v1.0 can still map 40-bit physical pages; only the DTE table base must be below 4 GB)
[2/2] arm64: dts: rockchip: rk356x: Use "rockchip,rk3568-iommu-v1"
for rknpu_mmu (0xfde4b000) and vicap_mmu (0xfdfe0800)
One note on the SWIOTLB issue: with GFP_DMA32 in the new ops, page table allocations never reach SWIOTLB, so the "track L2 base addresses" approach you suggested should not be necessary — GFP_DMA32 prevents the bounce-buffer poisoning at the source. Happy to be corrected if there is another path where it is still needed.
I am happy to add Tested-by to your per-device-ops patch [1].
[1] https://lore.kernel.org/all/[email protected]/
Regards,
Midgy BALON
Quoted 116 lines · Simon Xue
Quoted 35 lines · Simon Xue
Hi Jonas,
Quoted 32 lines · Jonas Karlman
Hi Simon,
Quoted 14 lines · Simon
Hi Midgy,
Quoted 11 lines · Midgy BALON
commit
2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2") removedGFP_DMA32fromiommu_data_ops_v2, reasoning that RK356x and RK3588 IOMMU v2 hardware supports up to 40-bit physical addresses for page tables. However, the RK3568 IOMMU page-table walker uses a 32-bit AXI bus: it cannot access physical addresses above 4 GB regardless of the address encoding range.On boards with more than 4 GB of RAM (e.g. 8 GB LPDDR4X), removing
GFP_DMA32causes two distinct failure modes:Quoted 6 lines
Quoted 5 lines
1. Direct allocation above 4 GB:
iommu_alloc_pages_sz()may returnmemory above 0x100000000. The hardware page-table walkerissues a
bus error trying to dereference those addresses, causing an IOMMU fault on the first DMA transaction.Which IP block is hitting this? We'd like to take a look on our end.
I have seen reports that the NPU MMU on RK3568/RK3566 is having some issue using DTE/PTE with >32-bit addresses, maybe it uses a different MMU hw revision or has some hw errata?
From my own testing at least the VOP2 MMU on RK3568 (and RK3588) was
able to handle 40-bit addressable DTE/PTE, hence the original commit2a7e6400f72b("iommu: rockchip: Allocate tables from all available memory for IOMMU v2").Quoted 8 lines
Quoted 2 lines
As also mentioned in my reply at [1], maybe the NPU MMU has some hw limitation or errata and may need to use a different compatible.
Yes, We are checking internally whether different IOMMU versions integrated.
I will share what we find once we have results.
We internally checked that the RK356x SoCs integrate two different IOMMU versions (v1.0 and v2.0), like NPU and ISP use the v1.0 IOMMU.
Both versions can map 40-bit physical pages, but v1.0 does not support placing the first-level page table above 4 GB.
To fix this, I think we need to land this patch first:
https://lore.kernel.org/all/[email protected]/Then on top of that, we can add a new compatible string to distinguish the IOMMU versions.
Quoted 58 lines
Quoted 58 lines
[1]
https://lore.kernel.org/r/[email protected]/Regards,
JonasQuoted 51 lines
Quoted 5 lines
2. SWIOTLB bounce-buffer poisoning: without
GFP_DMA32, page tables land
above the SWIOTLB window.dma_map_single()withDMA_BIT_MASK(32)then bounces them into a buffer below 4 GB.rk_dte_get_page_table()Quoted 8 lines
returns
phys_to_virt()of the bounce buffer address; PTEs are
written
there; the nextdma_sync_single_for_device(DMA_TO_DEVICE)
copies the
original (zero) data back over the bounce buffer, silently
erasing the
freshly written PTEs. The IOMMU faults because every PTE
reads as zero.This probably need a separate patch. One way to fix it would be to track the
original L2 page table base addresses in structrk_iommu_domain, then haverk_dte_get_page_table()return the tracked address instead of deriving it from the DTE.Quoted 32 lines
Restore
GFP_DMA32(andDMA_BIT_MASK(32)) foriommu_data_ops_v2, which currently only serves "rockchip,rk3568-iommu" in mainline.Tested on Radxa ROCK 3B (RK3568, 8 GB LPDDR4X):
- MobileNetV1 via RKNN: 5.8 ms/inference (IOMMU mode)
- YOLOv5s 640x640 via RKNN: ~57 ms/inference (IOMMU mode)
- No IOMMU faults, correct inference resultsFixes 2a7e6400f72b ("iommu: rockchip: Allocate tables from allavailable memory for IOMMU v2")
Cc Jonas Karlman <[email protected]>Signed-off-by Midgy BALON <[email protected]>--- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/rockchip-iommu.c +2
-2@@ -1358,8 +1358,8 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dma_bit_mask = DMA_BIT_MASK(40), - .gfp_flags = 0, + .dma_bit_mask = DMA_BIT_MASK(32), + .gfp_flags = GFP_DMA32, };static const struct of_device_id rk_iommu_dt_ids[] = {