From: Arnd Bergmann <[email protected]>
After the dw_edma_debugfs_entry arrays are no longer compile-time
constant, they take up space on the stack, which exceeds the warning
limit after inlining:
drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
void dw_edma_v0_debugfs_on(struct dw_edma *dw)
Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
being inlined together, which cuts the stack frame size in half and
makes it fit below the warning limit.
Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
Signed-off-by: Arnd Bergmann <[email protected]>
---
v2: rebase on top of dmaengine tree
---
drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
index 42380bf64a70..6542060bd01a 100644
--- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
+++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
@@ -136,7 +136,8 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma *dw, enum dw_edma_dir dir,
dw_edma_debugfs_create_x32(dw, debugfs_regs, nr_entries, dent);
}
-static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
+static noinline_for_stack void
+dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
{
const struct dw_edma_debugfs_entry debugfs_regs[] = {
/* eDMA global registers */
@@ -197,7 +198,8 @@ static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
}
}
-static void dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
+static noinline_for_stack void
+dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
{
const struct dw_edma_debugfs_entry debugfs_regs[] = {
/* eDMA global registers */
--
2.39.0
On Mon, Jan 30, 2023 at 07:50:42PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> After the dw_edma_debugfs_entry arrays are no longer compile-time
This sentence doesn't look complete to me.
> constant, they take up space on the stack, which exceeds the warning
> limit after inlining:
>
> drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> void dw_edma_v0_debugfs_on(struct dw_edma *dw)
>
> Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> being inlined together, which cuts the stack frame size in half and
> makes it fit below the warning limit.
>
> Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> Signed-off-by: Arnd Bergmann <[email protected]>
Small style comment below, with that:
Reviewed-by: Manivannan Sadhasivam <[email protected]>
> ---
> v2: rebase on top of dmaengine tree
> ---
> drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> index 42380bf64a70..6542060bd01a 100644
> --- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> +++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> @@ -136,7 +136,8 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma *dw, enum dw_edma_dir dir,
> dw_edma_debugfs_create_x32(dw, debugfs_regs, nr_entries, dent);
> }
>
> -static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> +static noinline_for_stack void
> +dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
For consistency, the function arguments could be wrapped:
static noinline_for_stack void dw_edma_debugfs_regs_wr(struct dw_edma *dw,
struct dentry *dent)
I could see that with the addition of "noinline_for_stack", the arguments are
shifted towards the end of the line. But this style matches rest of the
functions in this file.
Thanks,
Mani
> {
> const struct dw_edma_debugfs_entry debugfs_regs[] = {
> /* eDMA global registers */
> @@ -197,7 +198,8 @@ static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> }
> }
>
> -static void dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> +static noinline_for_stack void
> +dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> {
> const struct dw_edma_debugfs_entry debugfs_regs[] = {
> /* eDMA global registers */
> --
> 2.39.0
>
--
மணிவண்ணன் சதாசிவம்
On Mon, Jan 30, 2023 at 07:50:42PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> After the dw_edma_debugfs_entry arrays are no longer compile-time
> constant, they take up space on the stack, which exceeds the warning
> limit after inlining:
>
> drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> void dw_edma_v0_debugfs_on(struct dw_edma *dw)
>
> Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> being inlined together, which cuts the stack frame size in half and
> makes it fit below the warning limit.
>
> Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> Signed-off-by: Arnd Bergmann <[email protected]>
Great! Thanks for the patch.
Reviewed-by: Serge Semin <[email protected]>
-Serge(y)
> ---
> v2: rebase on top of dmaengine tree
> ---
> drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> index 42380bf64a70..6542060bd01a 100644
> --- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> +++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> @@ -136,7 +136,8 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma *dw, enum dw_edma_dir dir,
> dw_edma_debugfs_create_x32(dw, debugfs_regs, nr_entries, dent);
> }
>
> -static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> +static noinline_for_stack void
> +dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> {
> const struct dw_edma_debugfs_entry debugfs_regs[] = {
> /* eDMA global registers */
> @@ -197,7 +198,8 @@ static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> }
> }
>
> -static void dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> +static noinline_for_stack void
> +dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> {
> const struct dw_edma_debugfs_entry debugfs_regs[] = {
> /* eDMA global registers */
> --
> 2.39.0
>
On 30-01-23, 19:50, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> After the dw_edma_debugfs_entry arrays are no longer compile-time
> constant, they take up space on the stack, which exceeds the warning
> limit after inlining:
>
> drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> void dw_edma_v0_debugfs_on(struct dw_edma *dw)
>
> Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> being inlined together, which cuts the stack frame size in half and
> makes it fit below the warning limit.
>
> Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> v2: rebase on top of dmaengine tree
I dont have 5c0373eafd83 in my tree, I guess that went thru PCI tree, so
I am going to defer this after merge window
> ---
> drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> index 42380bf64a70..6542060bd01a 100644
> --- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> +++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> @@ -136,7 +136,8 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma *dw, enum dw_edma_dir dir,
> dw_edma_debugfs_create_x32(dw, debugfs_regs, nr_entries, dent);
> }
>
> -static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> +static noinline_for_stack void
> +dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> {
> const struct dw_edma_debugfs_entry debugfs_regs[] = {
> /* eDMA global registers */
> @@ -197,7 +198,8 @@ static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> }
> }
>
> -static void dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> +static noinline_for_stack void
> +dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> {
> const struct dw_edma_debugfs_entry debugfs_regs[] = {
> /* eDMA global registers */
> --
> 2.39.0
--
~Vinod
Hello Vinod
On Fri, Feb 10, 2023 at 02:22:28PM +0530, Vinod Koul wrote:
> On 30-01-23, 19:50, Arnd Bergmann wrote:
> > From: Arnd Bergmann <[email protected]>
> >
> > After the dw_edma_debugfs_entry arrays are no longer compile-time
> > constant, they take up space on the stack, which exceeds the warning
> > limit after inlining:
> >
> > drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> > void dw_edma_v0_debugfs_on(struct dw_edma *dw)
> >
> > Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> > being inlined together, which cuts the stack frame size in half and
> > makes it fit below the warning limit.
> >
> > Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
> > v2: rebase on top of dmaengine tree
>
> I dont have 5c0373eafd83 in my tree, I guess that went thru PCI tree, so
> I am going to defer this after merge window
It's in the @Bjorn tree now
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/commit/?h=pci/ctrl/dwc&id=5c0373eafd8334343da22338d8588ed61e8daba0
If you are ok with the fix then @Bjorn could take the patch in to his
repo. Right, @Bjorn?
-Serge(y)
>
> > ---
> > drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> > index 42380bf64a70..6542060bd01a 100644
> > --- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> > +++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
> > @@ -136,7 +136,8 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma *dw, enum dw_edma_dir dir,
> > dw_edma_debugfs_create_x32(dw, debugfs_regs, nr_entries, dent);
> > }
> >
> > -static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> > +static noinline_for_stack void
> > +dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> > {
> > const struct dw_edma_debugfs_entry debugfs_regs[] = {
> > /* eDMA global registers */
> > @@ -197,7 +198,8 @@ static void dw_edma_debugfs_regs_wr(struct dw_edma *dw, struct dentry *dent)
> > }
> > }
> >
> > -static void dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> > +static noinline_for_stack void
> > +dw_edma_debugfs_regs_rd(struct dw_edma *dw, struct dentry *dent)
> > {
> > const struct dw_edma_debugfs_entry debugfs_regs[] = {
> > /* eDMA global registers */
> > --
> > 2.39.0
>
> --
> ~Vinod
On 10-02-23, 15:35, Serge Semin wrote:
> Hello Vinod
>
> On Fri, Feb 10, 2023 at 02:22:28PM +0530, Vinod Koul wrote:
> > On 30-01-23, 19:50, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <[email protected]>
> > >
> > > After the dw_edma_debugfs_entry arrays are no longer compile-time
> > > constant, they take up space on the stack, which exceeds the warning
> > > limit after inlining:
> > >
> > > drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> > > void dw_edma_v0_debugfs_on(struct dw_edma *dw)
> > >
> > > Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> > > being inlined together, which cuts the stack frame size in half and
> > > makes it fit below the warning limit.
> > >
> > > Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> > > Signed-off-by: Arnd Bergmann <[email protected]>
> > > ---
> > > v2: rebase on top of dmaengine tree
> >
> > I dont have 5c0373eafd83 in my tree, I guess that went thru PCI tree, so
> > I am going to defer this after merge window
>
> It's in the @Bjorn tree now
> https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/commit/?h=pci/ctrl/dwc&id=5c0373eafd8334343da22338d8588ed61e8daba0
>
> If you are ok with the fix then @Bjorn could take the patch in to his
> repo. Right, @Bjorn?
Sure:
Acked-by: Vinod Koul <[email protected]>
--
~Vinod
On Fri, Feb 10, 2023 at 03:35:25PM +0300, Serge Semin wrote:
> On Fri, Feb 10, 2023 at 02:22:28PM +0530, Vinod Koul wrote:
> > On 30-01-23, 19:50, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <[email protected]>
> > >
> > > After the dw_edma_debugfs_entry arrays are no longer compile-time
> > > constant, they take up space on the stack, which exceeds the warning
> > > limit after inlining:
> > >
> > > drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> > > void dw_edma_v0_debugfs_on(struct dw_edma *dw)
> > >
> > > Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> > > being inlined together, which cuts the stack frame size in half and
> > > makes it fit below the warning limit.
> > >
> > > Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> > > Signed-off-by: Arnd Bergmann <[email protected]>
> > > ---
> > > v2: rebase on top of dmaengine tree
> >
> > I dont have 5c0373eafd83 in my tree, I guess that went thru PCI tree, so
> > I am going to defer this after merge window
>
> It's in the @Bjorn tree now
> https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/commit/?h=pci/ctrl/dwc&id=5c0373eafd8334343da22338d8588ed61e8daba0
>
> If you are ok with the fix then @Bjorn could take the patch in to his
> repo. Right, @Bjorn?
Yes, I squashed this into the original patch and tweaked the
whitespace per Manivannan's comment.
Note that we've moved to a shared PCI git tree, so the helgaas/pci.git
tree is obsolete and will bit rot until we remove it completely.
The new one is:
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/
Bjorn
On Fri, Feb 10, 2023 at 05:29:40PM -0600, Bjorn Helgaas wrote:
> On Fri, Feb 10, 2023 at 03:35:25PM +0300, Serge Semin wrote:
> > On Fri, Feb 10, 2023 at 02:22:28PM +0530, Vinod Koul wrote:
> > > On 30-01-23, 19:50, Arnd Bergmann wrote:
> > > > From: Arnd Bergmann <[email protected]>
> > > >
> > > > After the dw_edma_debugfs_entry arrays are no longer compile-time
> > > > constant, they take up space on the stack, which exceeds the warning
> > > > limit after inlining:
> > > >
> > > > drivers/dma/dw-edma/dw-edma-v0-debugfs.c:280:6: error: stack frame size (1784) exceeds limit (1400) in 'dw_edma_v0_debugfs_on' [-Werror,-Wframe-larger-than]
> > > > void dw_edma_v0_debugfs_on(struct dw_edma *dw)
> > > >
> > > > Work around this by preventing dw_edma_debugfs_regs_{wr,rd} from both
> > > > being inlined together, which cuts the stack frame size in half and
> > > > makes it fit below the warning limit.
> > > >
> > > > Fixes: 5c0373eafd83 ("dmaengine: dw-edma: Move eDMA data pointer to debugfs node descriptor")
> > > > Signed-off-by: Arnd Bergmann <[email protected]>
> > > > ---
> > > > v2: rebase on top of dmaengine tree
> > >
> > > I dont have 5c0373eafd83 in my tree, I guess that went thru PCI tree, so
> > > I am going to defer this after merge window
> >
> > It's in the @Bjorn tree now
> > https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/commit/?h=pci/ctrl/dwc&id=5c0373eafd8334343da22338d8588ed61e8daba0
> >
> > If you are ok with the fix then @Bjorn could take the patch in to his
> > repo. Right, @Bjorn?
>
> Yes, I squashed this into the original patch and tweaked the
> whitespace per Manivannan's comment.
Great! Thanks.
>
> Note that we've moved to a shared PCI git tree, so the helgaas/pci.git
> tree is obsolete and will bit rot until we remove it completely.
>
> The new one is:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/
Good to know. Thanks again.
-Serge(y)
>
> Bjorn