1. Patchew
  2. linux
  3. View series

[PATCH] lockdep: Use info level for lockdep initial info messages

Jiri Slaby (SUSE) posted 1 patch 1 month, 3 weeks ago 
kernel/locking/lockdep.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
[PATCH] lockdep: Use info level for lockdep initial info messages
Posted by Jiri Slaby (SUSE) 1 month, 3 weeks ago 
All those:
 Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar
 ... MAX_LOCKDEP_SUBCLASSES:  8
 ... MAX_LOCK_DEPTH:          48
 ... MAX_LOCKDEP_KEYS:        8192
and so on are dumped with the KERN_WARNING level. It is due to missing
KERN_* annotation.

Use pr_info() instead of bare print() to dump the info with the info
level.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
---
 kernel/locking/lockdep.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 536bd471557f..ae8750157099 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -6576,17 +6576,17 @@ EXPORT_SYMBOL_GPL(lockdep_unregister_key);
 
 void __init lockdep_init(void)
 {
-	printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
+	pr_info("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
 
-	printk("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
-	printk("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
-	printk("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
-	printk("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
-	printk("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
-	printk("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
-	printk("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
+	pr_info("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
+	pr_info("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
+	pr_info("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
+	pr_info("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
+	pr_info("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
+	pr_info("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
+	pr_info("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
 
-	printk(" memory used by lock dependency info: %zu kB\n",
+	pr_info(" memory used by lock dependency info: %zu kB\n",
 	       (sizeof(lock_classes) +
 		sizeof(lock_classes_in_use) +
 		sizeof(classhash_table) +
@@ -6604,12 +6604,12 @@ void __init lockdep_init(void)
 		);
 
 #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)
-	printk(" memory used for stack traces: %zu kB\n",
+	pr_info(" memory used for stack traces: %zu kB\n",
 	       (sizeof(stack_trace) + sizeof(stack_trace_hash)) / 1024
 	       );
 #endif
 
-	printk(" per task-struct memory footprint: %zu bytes\n",
+	pr_info(" per task-struct memory footprint: %zu bytes\n",
 	       sizeof(((struct task_struct *)NULL)->held_locks));
 }
 
-- 
2.46.1
Re: [PATCH] lockdep: Use info level for lockdep initial info messages
Posted by Waiman Long 1 month, 3 weeks ago 
On 10/7/24 2:54 AM, Jiri Slaby (SUSE) wrote:
> All those:
>   Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar
>   ... MAX_LOCKDEP_SUBCLASSES:  8
>   ... MAX_LOCK_DEPTH:          48
>   ... MAX_LOCKDEP_KEYS:        8192
> and so on are dumped with the KERN_WARNING level. It is due to missing
> KERN_* annotation.
>
> Use pr_info() instead of bare print() to dump the info with the info
> level.
>
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Waiman Long <longman@redhat.com>
> Cc: Boqun Feng <boqun.feng@gmail.com>
> ---
>   kernel/locking/lockdep.c | 22 +++++++++++-----------
>   1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index 536bd471557f..ae8750157099 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -6576,17 +6576,17 @@ EXPORT_SYMBOL_GPL(lockdep_unregister_key);
>   
>   void __init lockdep_init(void)
>   {
> -	printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
> +	pr_info("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
>   
> -	printk("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
> -	printk("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
> -	printk("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
> -	printk("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
> -	printk("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
> -	printk("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
> -	printk("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
> +	pr_info("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
> +	pr_info("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
> +	pr_info("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
> +	pr_info("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
> +	pr_info("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
> +	pr_info("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
> +	pr_info("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
>   
> -	printk(" memory used by lock dependency info: %zu kB\n",
> +	pr_info(" memory used by lock dependency info: %zu kB\n",
>   	       (sizeof(lock_classes) +
>   		sizeof(lock_classes_in_use) +
>   		sizeof(classhash_table) +
> @@ -6604,12 +6604,12 @@ void __init lockdep_init(void)
>   		);
>   
>   #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)
> -	printk(" memory used for stack traces: %zu kB\n",
> +	pr_info(" memory used for stack traces: %zu kB\n",
>   	       (sizeof(stack_trace) + sizeof(stack_trace_hash)) / 1024
>   	       );
>   #endif
>   
> -	printk(" per task-struct memory footprint: %zu bytes\n",
> +	pr_info(" per task-struct memory footprint: %zu bytes\n",
>   	       sizeof(((struct task_struct *)NULL)->held_locks));
>   }
>   

Make sense!

Reviewed-by: Waiman Long <longman@redhat.com>
Re: [PATCH] lockdep: Use info level for lockdep initial info messages
Posted by Boqun Feng 1 month, 2 weeks ago 
On Mon, Oct 07, 2024 at 09:05:25AM -0400, Waiman Long wrote:
> On 10/7/24 2:54 AM, Jiri Slaby (SUSE) wrote:
> > All those:
> >   Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar
> >   ... MAX_LOCKDEP_SUBCLASSES:  8
> >   ... MAX_LOCK_DEPTH:          48
> >   ... MAX_LOCKDEP_KEYS:        8192
> > and so on are dumped with the KERN_WARNING level. It is due to missing
> > KERN_* annotation.
> > 
> > Use pr_info() instead of bare print() to dump the info with the info
> > level.
> > 
> > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: Will Deacon <will@kernel.org>
> > Cc: Waiman Long <longman@redhat.com>
> > Cc: Boqun Feng <boqun.feng@gmail.com>
> > ---
> >   kernel/locking/lockdep.c | 22 +++++++++++-----------
> >   1 file changed, 11 insertions(+), 11 deletions(-)
> > 
> > diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> > index 536bd471557f..ae8750157099 100644
> > --- a/kernel/locking/lockdep.c
> > +++ b/kernel/locking/lockdep.c
> > @@ -6576,17 +6576,17 @@ EXPORT_SYMBOL_GPL(lockdep_unregister_key);
> >   void __init lockdep_init(void)
> >   {
> > -	printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
> > +	pr_info("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
> > -	printk("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
> > -	printk("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
> > -	printk("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
> > -	printk("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
> > -	printk("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
> > -	printk("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
> > -	printk("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
> > +	pr_info("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
> > +	pr_info("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
> > +	pr_info("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
> > +	pr_info("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
> > +	pr_info("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
> > +	pr_info("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
> > +	pr_info("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
> > -	printk(" memory used by lock dependency info: %zu kB\n",
> > +	pr_info(" memory used by lock dependency info: %zu kB\n",
> >   	       (sizeof(lock_classes) +
> >   		sizeof(lock_classes_in_use) +
> >   		sizeof(classhash_table) +
> > @@ -6604,12 +6604,12 @@ void __init lockdep_init(void)
> >   		);
> >   #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)
> > -	printk(" memory used for stack traces: %zu kB\n",
> > +	pr_info(" memory used for stack traces: %zu kB\n",
> >   	       (sizeof(stack_trace) + sizeof(stack_trace_hash)) / 1024
> >   	       );
> >   #endif
> > -	printk(" per task-struct memory footprint: %zu bytes\n",
> > +	pr_info(" per task-struct memory footprint: %zu bytes\n",
> >   	       sizeof(((struct task_struct *)NULL)->held_locks));
> >   }
> 
> Make sense!
> 
> Reviewed-by: Waiman Long <longman@redhat.com>
> 

Thanks!

Queued in lockdep tree:

	https://git.kernel.org/pub/scm/linux/kernel/git/boqun/linux.git/log/?h=lockdep-for-tip

will send a PR to tip between -rc3 and -rc4.

Regards,
Boqun
[tip: locking/core] lockdep: Use info level for lockdep initial info messages
Posted by tip-bot2 for Jiri Slaby (SUSE) 1 month ago 
The following commit has been merged into the locking/core branch of tip:

Commit-ID:     e48bf7ca6056297664eb260fa88cae8e50d9b698
Gitweb:        https://git.kernel.org/tip/e48bf7ca6056297664eb260fa88cae8e50d9b698
Author:        Jiri Slaby (SUSE) <jirislaby@kernel.org>
AuthorDate:    Mon, 07 Oct 2024 08:54:57 +02:00
Committer:     Boqun Feng <boqun.feng@gmail.com>
CommitterDate: Thu, 17 Oct 2024 21:21:16 -07:00

lockdep: Use info level for lockdep initial info messages

All those:
 Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar
 ... MAX_LOCKDEP_SUBCLASSES:  8
 ... MAX_LOCK_DEPTH:          48
 ... MAX_LOCKDEP_KEYS:        8192
and so on are dumped with the KERN_WARNING level. It is due to missing
KERN_* annotation.

Use pr_info() instead of bare printk() to dump the info with the info
level.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Reviewed-by: Waiman Long <longman@redhat.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20241007065457.20128-1-jirislaby@kernel.org
---
 kernel/locking/lockdep.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 6fd4af2..2d8ec03 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -6600,17 +6600,17 @@ EXPORT_SYMBOL_GPL(lockdep_unregister_key);
 
 void __init lockdep_init(void)
 {
-	printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
+	pr_info("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n");
 
-	printk("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
-	printk("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
-	printk("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
-	printk("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
-	printk("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
-	printk("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
-	printk("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
+	pr_info("... MAX_LOCKDEP_SUBCLASSES:  %lu\n", MAX_LOCKDEP_SUBCLASSES);
+	pr_info("... MAX_LOCK_DEPTH:          %lu\n", MAX_LOCK_DEPTH);
+	pr_info("... MAX_LOCKDEP_KEYS:        %lu\n", MAX_LOCKDEP_KEYS);
+	pr_info("... CLASSHASH_SIZE:          %lu\n", CLASSHASH_SIZE);
+	pr_info("... MAX_LOCKDEP_ENTRIES:     %lu\n", MAX_LOCKDEP_ENTRIES);
+	pr_info("... MAX_LOCKDEP_CHAINS:      %lu\n", MAX_LOCKDEP_CHAINS);
+	pr_info("... CHAINHASH_SIZE:          %lu\n", CHAINHASH_SIZE);
 
-	printk(" memory used by lock dependency info: %zu kB\n",
+	pr_info(" memory used by lock dependency info: %zu kB\n",
 	       (sizeof(lock_classes) +
 		sizeof(lock_classes_in_use) +
 		sizeof(classhash_table) +
@@ -6628,12 +6628,12 @@ void __init lockdep_init(void)
 		);
 
 #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)
-	printk(" memory used for stack traces: %zu kB\n",
+	pr_info(" memory used for stack traces: %zu kB\n",
 	       (sizeof(stack_trace) + sizeof(stack_trace_hash)) / 1024
 	       );
 #endif
 
-	printk(" per task-struct memory footprint: %zu bytes\n",
+	pr_info(" per task-struct memory footprint: %zu bytes\n",
 	       sizeof(((struct task_struct *)NULL)->held_locks));
 }

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.