Skip to contentSkip to conversation

dma-coherent: use KiB in DMA allocation logs

RFC PATCH Superseded Vova Sharaienko 2 participants 2 messages Jun 24 DMA mapping helpers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 dma-coherent: use KiB in DMA allocation logs

We are proposing to update DMA reserved memory pool allocation log messages to display sizes in KiB instead of MiB. Using MiB caused allocations less than 1 MiB to be logged as 0 MiB due to integer truncation. KiB provides better precision for smaller memory regions specified in the Device Tree.

This is currently marked as an RFC because we would like feedback on a KiB unit change.

---
 kernel/dma/coherent.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/dma/coherent.c +4 -4
index 480dd1766ece..3ede8da395ce 100644
@@ -69,8 +69,8 @@ static struct dma_coherent_mem *dma_init_coherent_memory(phys_addr_t phys_addr,
 	kfree(dma_mem);
 out_unmap_membase:
 	memunmap(mem_base);
-	pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %zd MiB\n",
-		&phys_addr, size / SZ_1M);
+	pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %lu KiB\n",
+		&phys_addr, (unsigned long)(size / SZ_1K));
 	return ERR_PTR(-ENOMEM);
 }
 
@@ -384,8 +384,8 @@ static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *rmem)
 	}
 #endif
 
-	pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n",
-		&rmem->base, (unsigned long)rmem->size / SZ_1M);
+	pr_info("Reserved memory: created DMA memory pool at %pa, size %lu KiB\n",
+		&rmem->base, (unsigned long)(rmem->size / SZ_1K));
 	return 0;
 }
 
Signature · 1 line
2.55.0.rc0.799.gd6f94ed593-goog
#1 lore raw
Quoted 19 lines · Vova Sharaienko

We are proposing to update DMA reserved memory pool allocation log messages to display sizes in KiB instead of MiB. Using MiB caused allocations less than 1 MiB to be logged as 0 MiB due to integer truncation. KiB provides better precision for smaller memory regions specified in the Device Tree.

This is currently marked as an RFC because we would like feedback on a KiB unit change.

---
 kernel/dma/coherent.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/dma/coherent.c +0 -0
index 480dd1766ece..3ede8da395ce 100644

kernel/dma/coherent.c static struct dma_coherent_mem *dma_init_coherent_memory(phys_addr_t phys_addr, · line 73

Quoted 7 lines
kernel/dma/coherent.c +2 -2
@@ -69,8 +69,8 @@ static struct dma_coherent_mem *dma_init_coherent_memory(phys_addr_t phys_addr,
 	kfree(dma_mem);
 out_unmap_membase:
 	memunmap(mem_base);
-	pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %zd MiB\n",
-		&phys_addr, size / SZ_1M);
+	pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %lu KiB\n",
+		&phys_addr, (unsigned long)(size / SZ_1K));

'size' here is a size_t, so the portable specifier is %zu, which also lets you drop the cast.

kernel/dma/coherent.c static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *rmem) · line 388

Quoted 11 lines
kernel/dma/coherent.c +2 -2
 	return ERR_PTR(-ENOMEM);
 }
 
@@ -384,8 +384,8 @@ static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *rmem)
 	}
 #endif
 
-	pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n",
-		&rmem->base, (unsigned long)rmem->size / SZ_1M);
+	pr_info("Reserved memory: created DMA memory pool at %pa, size %lu KiB\n",
+		&rmem->base, (unsigned long)(rmem->size / SZ_1K));

rmem->size is a phys_addr_t, which can be 64-bit on a 32-bit kernel. Casting to unsigned long may truncate. It's an unlikely corner case, but casting to the widest(%llu) type can avoid it.

-Ankit

Quoted 6 lines
kernel/dma/coherent.c +0 -0
 	return 0;
 }
 
Signature · 1 line
2.55.0.rc0.799.gd6f94ed593-goog