Message ID | 20211210171258.41138-1-jim2101024@gmail.com |
---|---|
State | Superseded, archived |
Headers | show |
Series | [v1] of: unittest: fix warning on PowerPC frame size warning | expand |
Context | Check | Description |
---|---|---|
robh/checkpatch | warning | total: 0 errors, 1 warnings, 22 lines checked |
robh/dtbs-check | success | |
robh/dt-meta-schema | success |
On 12/10/21 9:12 AM, Jim Quinlan wrote: > 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") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Jim Quinlan <jim2101024@gmail.com> > --- > drivers/of/unittest.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c > index 481ba8682ebf..945cda299a63 100644 > --- a/drivers/of/unittest.c > +++ b/drivers/of/unittest.c > @@ -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; > + } You are leaking dev_bogus here.
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 481ba8682ebf..945cda299a63 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -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",
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") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Jim Quinlan <jim2101024@gmail.com> --- drivers/of/unittest.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) base-commit: c741e49150dbb0c0aebe234389f4aa8b47958fa8