Skip to contentSkip to conversation

of: unittest: fix warning on PowerPC frame size warning

PATCH Superseded Jim Quinlan 2 participants 2 messages Dec 10, 2021 Device tree

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of: unittest: fix warning on PowerPC frame size warning

The struct device variable "dev_bogus" was triggering this warning on a PowerPC build:

drivers/of/unittest.c: In function 'of_unittest_dma_ranges_one.constprop':
[...] >> The frame size of 1424 bytes is larger than 1024 bytes
[-Wframe-larger-than=]

This variable is now dynamically allocated.

Fixes e0d072782c734 ("dma-mapping: introduce DMA range map, supplanting dma_pfn_offset")
---
 drivers/of/unittest.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/of/unittest.c +11 -4
index 481ba8682ebf..945cda299a63 100644
@@ -911,11 +911,18 @@ static void __init of_unittest_dma_ranges_one(const char *path,
 	if (!rc) {
 		phys_addr_t	paddr;
 		dma_addr_t	dma_addr;
-		struct device	dev_bogus;
+		struct device	*dev_bogus;
 
-		dev_bogus.dma_range_map = map;
-		paddr = dma_to_phys(&dev_bogus, expect_dma_addr);
-		dma_addr = phys_to_dma(&dev_bogus, expect_paddr);
+		dev_bogus = kzalloc(sizeof(struct device), GFP_KERNEL);
+		if (!dev_bogus) {
+			unittest(0, "kzalloc() failed\n");
+			kfree(map);
+			return;
+		}
+
+		dev_bogus->dma_range_map = map;
+		paddr = dma_to_phys(dev_bogus, expect_dma_addr);
+		dma_addr = phys_to_dma(dev_bogus, expect_paddr);
 
 		unittest(paddr == expect_paddr,
 			 "of_dma_get_range: wrong phys addr %pap (expecting %llx) on node %pOF\n",

base-commit: c741e49150dbb0c0aebe234389f4aa8b47958fa8

Signature · 1 line
2.17.1
#1 lore raw
Quoted 26 lines · Jim Quinlan

The struct device variable "dev_bogus" was triggering this warning on a PowerPC build:

drivers/of/unittest.c: In function 'of_unittest_dma_ranges_one.constprop':
[...] >> The frame size of 1424 bytes is larger than 1024 bytes
[-Wframe-larger-than=]

This variable is now dynamically allocated.

Fixes e0d072782c734 ("dma-mapping: introduce DMA range map, supplanting dma_pfn_offset")
---
 drivers/of/unittest.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/of/unittest.c +1 -1
index 481ba8682ebf..945cda299a63 100644
@@ -911,11 +911,18 @@ static void __init of_unittest_dma_ranges_one(const char *path,
 	if (!rc) {
 		phys_addr_t	paddr;
 		dma_addr_t	dma_addr;
-		struct device	dev_bogus;
+		struct device	*dev_bogus;

drivers/of/unittest.c static void __init of_unittest_dma_ranges_one(const char *path, · line 921

Quoted 10 lines
drivers/of/unittest.c +6 -3
 
-		dev_bogus.dma_range_map = map;
-		paddr = dma_to_phys(&dev_bogus, expect_dma_addr);
-		dma_addr = phys_to_dma(&dev_bogus, expect_paddr);
+		dev_bogus = kzalloc(sizeof(struct device), GFP_KERNEL);
+		if (!dev_bogus) {
+			unittest(0, "kzalloc() failed\n");
+			kfree(map);
+			return;
+		}

You are leaking dev_bogus here.

Signature · 1 line
Florian