diff mbox series

[v1,1/1] printk: Remove printk.h inclusion in percpu.h

Message ID 20211112140749.80042-1-andriy.shevchenko@linux.intel.com (mailing list archive)
State New
Headers show
Series [v1,1/1] printk: Remove printk.h inclusion in percpu.h | expand

Commit Message

Andy Shevchenko Nov. 12, 2021, 2:07 p.m. UTC
After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
in NMI") the printk.h is not needed anymore in percpu.h.

Moreover `make headerdep` complains (an excerpt)

In file included from linux/printk.h,
                 from linux/dynamic_debug.h:188
                 from linux/printk.h:559 <-- here
                 from linux/percpu.h:9
                 from linux/idr.h:17
include/net/9p/client.h:13: warning: recursive header inclusion

Yeah, it's not a root cause of this, but removing will help to reduce
the noise.

Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk in NMI")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 include/linux/percpu.h | 1 -
 1 file changed, 1 deletion(-)

Comments

Dennis Zhou Nov. 12, 2021, 6:15 p.m. UTC | #1
Hello,

On Fri, Nov 12, 2021 at 04:07:49PM +0200, Andy Shevchenko wrote:
> After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> in NMI") the printk.h is not needed anymore in percpu.h.
> 
> Moreover `make headerdep` complains (an excerpt)
> 
> In file included from linux/printk.h,
>                  from linux/dynamic_debug.h:188
>                  from linux/printk.h:559 <-- here
>                  from linux/percpu.h:9
>                  from linux/idr.h:17
> include/net/9p/client.h:13: warning: recursive header inclusion
> 
> Yeah, it's not a root cause of this, but removing will help to reduce
> the noise.
> 
> Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk in NMI")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  include/linux/percpu.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/include/linux/percpu.h b/include/linux/percpu.h
> index 98a9371133f8..ae4004e7957e 100644
> --- a/include/linux/percpu.h
> +++ b/include/linux/percpu.h
> @@ -6,7 +6,6 @@
>  #include <linux/preempt.h>
>  #include <linux/smp.h>
>  #include <linux/cpumask.h>
> -#include <linux/printk.h>
>  #include <linux/pfn.h>
>  #include <linux/init.h>
>  
> -- 
> 2.33.0
> 

Acked-by: Dennis Zhou <dennis@kernel.org>

Hey Andrew, it doesn't seem like I have anything big coming through
percpu, do you mind taking this. I might have some stuff due to sh, but
I'm still working on that with them.

Thanks,
Dennis
Petr Mladek Nov. 15, 2021, 9:48 a.m. UTC | #2
On Fri 2021-11-12 13:15:51, Dennis Zhou wrote:
> On Fri, Nov 12, 2021 at 04:07:49PM +0200, Andy Shevchenko wrote:
> > After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > in NMI") the printk.h is not needed anymore in percpu.h.
> > 
> > Moreover `make headerdep` complains (an excerpt)
> > 
> > In file included from linux/printk.h,
> >                  from linux/dynamic_debug.h:188
> >                  from linux/printk.h:559 <-- here
> >                  from linux/percpu.h:9
> >                  from linux/idr.h:17
> > include/net/9p/client.h:13: warning: recursive header inclusion
> > 
> > Yeah, it's not a root cause of this, but removing will help to reduce
> > the noise.
> > 
> > Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > in NMI")

Yup, the include was there because of printk_func_t definition that
was removed by the above commit.

Reviewed-by: Petr Mladek <pmladek@suse.com>

> Hey Andrew, it doesn't seem like I have anything big coming through
> percpu, do you mind taking this. I might have some stuff due to sh, but
> I'm still working on that with them.

I assume that either Andrew or Dennis will take this patch.

Best Regards,
Petr
Andy Shevchenko Nov. 15, 2021, 10:38 a.m. UTC | #3
On Mon, Nov 15, 2021 at 10:48:04AM +0100, Petr Mladek wrote:
> On Fri 2021-11-12 13:15:51, Dennis Zhou wrote:
> > On Fri, Nov 12, 2021 at 04:07:49PM +0200, Andy Shevchenko wrote:
> > > After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > in NMI") the printk.h is not needed anymore in percpu.h.
> > > 
> > > Moreover `make headerdep` complains (an excerpt)
> > > 
> > > In file included from linux/printk.h,
> > >                  from linux/dynamic_debug.h:188
> > >                  from linux/printk.h:559 <-- here
> > >                  from linux/percpu.h:9
> > >                  from linux/idr.h:17
> > > include/net/9p/client.h:13: warning: recursive header inclusion
> > > 
> > > Yeah, it's not a root cause of this, but removing will help to reduce
> > > the noise.
> > > 
> > > Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > in NMI")
> 
> Yup, the include was there because of printk_func_t definition that
> was removed by the above commit.
> 
> Reviewed-by: Petr Mladek <pmladek@suse.com>
> 
> > Hey Andrew, it doesn't seem like I have anything big coming through
> > percpu, do you mind taking this. I might have some stuff due to sh, but
> > I'm still working on that with them.
> 
> I assume that either Andrew or Dennis will take this patch.

I assumed you take it, that's why I haven't Cc'ed Andrew in the first place,
but it seems you have a consensus with Dennis that Andrew is the best
maintainer to take this. So, I'll send v2 with tags and Cc to him.

Thanks!
Petr Mladek Nov. 15, 2021, 1:57 p.m. UTC | #4
On Mon 2021-11-15 12:38:03, Andy Shevchenko wrote:
> On Mon, Nov 15, 2021 at 10:48:04AM +0100, Petr Mladek wrote:
> > On Fri 2021-11-12 13:15:51, Dennis Zhou wrote:
> > > On Fri, Nov 12, 2021 at 04:07:49PM +0200, Andy Shevchenko wrote:
> > > > After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > > in NMI") the printk.h is not needed anymore in percpu.h.
> > > > 
> > > > Moreover `make headerdep` complains (an excerpt)
> > > > 
> > > > In file included from linux/printk.h,
> > > >                  from linux/dynamic_debug.h:188
> > > >                  from linux/printk.h:559 <-- here
> > > >                  from linux/percpu.h:9
> > > >                  from linux/idr.h:17
> > > > include/net/9p/client.h:13: warning: recursive header inclusion
> > > > 
> > > > Yeah, it's not a root cause of this, but removing will help to reduce
> > > > the noise.
> > > > 
> > > > Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > > in NMI")
> > 
> > Yup, the include was there because of printk_func_t definition that
> > was removed by the above commit.
> > 
> > Reviewed-by: Petr Mladek <pmladek@suse.com>
> > 
> > > Hey Andrew, it doesn't seem like I have anything big coming through
> > > percpu, do you mind taking this. I might have some stuff due to sh, but
> > > I'm still working on that with them.
> > 
> > I assume that either Andrew or Dennis will take this patch.
> 
> I assumed you take it, that's why I haven't Cc'ed Andrew in the first place,
> but it seems you have a consensus with Dennis that Andrew is the best
> maintainer to take this. So, I'll send v2 with tags and Cc to him.

No problem, I am going to take it, in a hour or so. I did not want to
make chaos when Denis asked Andrew. But it is not worth resending the patch.

Best Regards,
Petr
Andy Shevchenko Nov. 15, 2021, 2:20 p.m. UTC | #5
On Mon, Nov 15, 2021 at 02:57:27PM +0100, Petr Mladek wrote:
> On Mon 2021-11-15 12:38:03, Andy Shevchenko wrote:
> > On Mon, Nov 15, 2021 at 10:48:04AM +0100, Petr Mladek wrote:

...

> > I assumed you take it, that's why I haven't Cc'ed Andrew in the first place,
> > but it seems you have a consensus with Dennis that Andrew is the best
> > maintainer to take this. So, I'll send v2 with tags and Cc to him.
> 
> No problem, I am going to take it, in a hour or so. I did not want to
> make chaos when Denis asked Andrew. But it is not worth resending the patch.

Thanks!

If needed something from me, just ping.
Petr Mladek Nov. 15, 2021, 2:34 p.m. UTC | #6
On Mon 2021-11-15 14:57:30, Petr Mladek wrote:
> On Mon 2021-11-15 12:38:03, Andy Shevchenko wrote:
> > On Mon, Nov 15, 2021 at 10:48:04AM +0100, Petr Mladek wrote:
> > > On Fri 2021-11-12 13:15:51, Dennis Zhou wrote:
> > > > On Fri, Nov 12, 2021 at 04:07:49PM +0200, Andy Shevchenko wrote:
> > > > > After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > > > in NMI") the printk.h is not needed anymore in percpu.h.
> > > > > 
> > > > > Moreover `make headerdep` complains (an excerpt)
> > > > > 
> > > > > In file included from linux/printk.h,
> > > > >                  from linux/dynamic_debug.h:188
> > > > >                  from linux/printk.h:559 <-- here
> > > > >                  from linux/percpu.h:9
> > > > >                  from linux/idr.h:17
> > > > > include/net/9p/client.h:13: warning: recursive header inclusion
> > > > > 
> > > > > Yeah, it's not a root cause of this, but removing will help to reduce
> > > > > the noise.
> > > > > 
> > > > > Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > > > in NMI")
> > > 
> > > Yup, the include was there because of printk_func_t definition that
> > > was removed by the above commit.
> > > 
> > > Reviewed-by: Petr Mladek <pmladek@suse.com>
> > > 
> > > > Hey Andrew, it doesn't seem like I have anything big coming through
> > > > percpu, do you mind taking this. I might have some stuff due to sh, but
> > > > I'm still working on that with them.
> > > 
> > > I assume that either Andrew or Dennis will take this patch.
> > 
> > I assumed you take it, that's why I haven't Cc'ed Andrew in the first place,
> > but it seems you have a consensus with Dennis that Andrew is the best
> > maintainer to take this. So, I'll send v2 with tags and Cc to him.
> 
> No problem, I am going to take it, in a hour or so. I did not want to
> make chaos when Denis asked Andrew. But it is not worth resending the patch.

The patch is comitted in printk/linux.git, branch for-5.16-fixup.

I am going to add it into pull request for 5.16-rc2 with another fix.

Best Regards,
Petr
Dennis Zhou Nov. 15, 2021, 3:04 p.m. UTC | #7
On Mon, Nov 15, 2021 at 03:34:04PM +0100, Petr Mladek wrote:
> On Mon 2021-11-15 14:57:30, Petr Mladek wrote:
> > On Mon 2021-11-15 12:38:03, Andy Shevchenko wrote:
> > > On Mon, Nov 15, 2021 at 10:48:04AM +0100, Petr Mladek wrote:
> > > > On Fri 2021-11-12 13:15:51, Dennis Zhou wrote:
> > > > > On Fri, Nov 12, 2021 at 04:07:49PM +0200, Andy Shevchenko wrote:
> > > > > > After the commit 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > > > > in NMI") the printk.h is not needed anymore in percpu.h.
> > > > > > 
> > > > > > Moreover `make headerdep` complains (an excerpt)
> > > > > > 
> > > > > > In file included from linux/printk.h,
> > > > > >                  from linux/dynamic_debug.h:188
> > > > > >                  from linux/printk.h:559 <-- here
> > > > > >                  from linux/percpu.h:9
> > > > > >                  from linux/idr.h:17
> > > > > > include/net/9p/client.h:13: warning: recursive header inclusion
> > > > > > 
> > > > > > Yeah, it's not a root cause of this, but removing will help to reduce
> > > > > > the noise.
> > > > > > 
> > > > > > Fixes: 42a0bb3f7138 ("printk/nmi: generic solution for safe printk
> > > > > > in NMI")
> > > > 
> > > > Yup, the include was there because of printk_func_t definition that
> > > > was removed by the above commit.
> > > > 
> > > > Reviewed-by: Petr Mladek <pmladek@suse.com>
> > > > 
> > > > > Hey Andrew, it doesn't seem like I have anything big coming through
> > > > > percpu, do you mind taking this. I might have some stuff due to sh, but
> > > > > I'm still working on that with them.
> > > > 
> > > > I assume that either Andrew or Dennis will take this patch.
> > > 
> > > I assumed you take it, that's why I haven't Cc'ed Andrew in the first place,
> > > but it seems you have a consensus with Dennis that Andrew is the best
> > > maintainer to take this. So, I'll send v2 with tags and Cc to him.
> > 
> > No problem, I am going to take it, in a hour or so. I did not want to
> > make chaos when Denis asked Andrew. But it is not worth resending the patch.
> 
> The patch is comitted in printk/linux.git, branch for-5.16-fixup.
> 
> I am going to add it into pull request for 5.16-rc2 with another fix.
> 
> Best Regards,
> Petr

Thanks Petr!

In general I would take it, it just depends on other circumstances such
as if I'm carrying anything or if there is any other bigger issues with
other mm. Right now I'm dealing with mm as a fix for hotplug in percpu
has been pulled and I'm not terribly happy about it.

I appreciate being looped in and made aware of the changes. Thank you
Andy and Petr.

Thanks,
Dennis
diff mbox series

Patch

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 98a9371133f8..ae4004e7957e 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -6,7 +6,6 @@ 
 #include <linux/preempt.h>
 #include <linux/smp.h>
 #include <linux/cpumask.h>
-#include <linux/printk.h>
 #include <linux/pfn.h>
 #include <linux/init.h>