Skip to contentSkip to conversation

add DEFINE_LOGLEVEL_SETUP v2

PATCH In review Yinghai Lu 5 participants 9 messages Sep 16, 2008 – Sep 17, 2008

Subsystems (4)
lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/5 add DEFINE_LOGLEVEL_SETUP v2

so could make subsys easy to add loglevel and xxx_printk
v2: make it more genric, so subsys user only need to two line macro

---
 arch/x86/kernel/vmlinux_32.lds.S  |    1 +
 arch/x86/kernel/vmlinux_64.lds.S  |    2 ++
 include/asm-generic/vmlinux.lds.h |    8 ++++++++
 include/linux/init.h              |   36 ++++++++++++++++++++++++++++++++++++
 include/linux/kernel.h            |    9 +++++++++
 init/main.c                       |   28 +++++++++++++++++++++++++++-
 6 files changed, 83 insertions(+), 1 deletion(-)
arch/x86/kernel/vmlinux_32.lds.S +1 -0
Index: linux-2.6/arch/x86/kernel/vmlinux_32.lds.S
===================================================================
@@ -145,6 +145,7 @@ SECTIONS
 	*(.x86_cpu_dev.init)
 	__x86_cpu_dev_end = .;
   }
+  LOGLEVEL_SETUP_INIT(8)
   DYN_ARRAY_INIT(8)
   SECURITY_INIT
   . = ALIGN(4);
arch/x86/kernel/vmlinux_64.lds.S +2 -0
Index: linux-2.6/arch/x86/kernel/vmlinux_64.lds.S
===================================================================
@@ -174,6 +174,8 @@ SECTIONS
   }
   __x86_cpu_dev_end = .;
 
+  LOGLEVEL_SETUP_INIT(8)
+
   DYN_ARRAY_INIT(8)
 
   SECURITY_INIT
include/asm-generic/vmlinux.lds.h +8 -0
Index: linux-2.6/include/asm-generic/vmlinux.lds.h
===================================================================
@@ -222,6 +222,14 @@
  * All archs are supposed to use RO_DATA() */
 #define RODATA RO_DATA(4096)
 
+#define LOGLEVEL_SETUP_INIT(align)					\
+	. = ALIGN((align));						\
+	.loglevel_setup.init : AT(ADDR(.loglevel_setup.init) - LOAD_OFFSET) {	\
+		VMLINUX_SYMBOL(__loglevel_setup_start) = .;		\
+		*(.loglevel_setup.init)					\
+		VMLINUX_SYMBOL(__loglevel_setup_end) = .;		\
+	}
+
 #define DYN_ARRAY_INIT(align)							\
 	. = ALIGN((align));						\
 	.dyn_array.init : AT(ADDR(.dyn_array.init) - LOAD_OFFSET) {	\
include/linux/init.h +36 -0
Index: linux-2.6/include/linux/init.h
===================================================================
@@ -251,6 +251,42 @@ struct obs_kernel_param {
 /* Relies on boot_command_line being set */
 void __init parse_early_param(void);
 
+#define DECLARE_LOGLEVEL(nameX)					\
+	extern int loglevel_##nameX;				\
+	extern int nameX##_printk(int v, const char *fmt, ...)
+
+struct loglevel_setup {
+	char *name;
+	void (*setup)(char *);
+};
+
+extern struct loglevel_setup *__loglevel_setup_start[], *__loglevel_setup_end[];
+
+#define DEFINE_LOGLEVEL_SETUP(nameX)				\
+	int loglevel_##nameX;					\
+	int nameX##_printk(int v, const char *fmt, ...)		\
+	{							\
+		va_list args;					\
+		int r;						\
+		if (v > loglevel_##nameX)			\
+			return 0;				\
+		va_start(args, fmt);				\
+		r = vprintk(fmt, args);				\
+		va_end(args);					\
+		return r;					\
+	}							\
+	static void __init setup_loglevel_##nameX(char *str)	\
+	{							\
+		get_option(&str, &loglevel_##nameX);		\
+	}							\
+	static struct loglevel_setup __loglevel_setup_##nameX __initdata = \
+	{	.name = #nameX,					\
+		.setup = setup_loglevel_##nameX,		\
+	};							\
+	static struct loglevel_setup *__loglevel_setup_ptr_##nameX __used \
+	__attribute__((__section__(".loglevel_setup.init"))) =	\
+		&__loglevel_setup_##nameX
+
 struct dyn_array {
 	void **name;
 	unsigned long size;
include/linux/kernel.h +9 -0
Index: linux-2.6/include/linux/kernel.h
===================================================================
@@ -104,6 +104,15 @@ extern int console_printk[];
 #define minimum_console_loglevel (console_printk[2])
 #define default_console_loglevel (console_printk[3])
 
+#define	KERN_LOG_EMERG	0	/* system is unusable			*/
+#define	KERN_LOG_ALERT	1	/* action must be taken immediately	*/
+#define	KERN_LOG_CRIT	2	/* critical conditions			*/
+#define	KERN_LOG_ERR	3	/* error conditions			*/
+#define	KERN_LOG_WARNING	4	/* warning conditions			*/
+#define	KERN_LOG_NOTICE	5	/* normal but significant condition	*/
+#define	KERN_LOG_INFO	6	/* informational			*/
+#define	KERN_LOG_DEBUG	7	/* debug-level messages			*/
+
 struct completion;
 struct pt_regs;
 struct user;
init/main.c +27 -1
Index: linux-2.6/init/main.c
===================================================================
@@ -248,9 +248,35 @@ static int __init quiet_kernel(char *str
 early_param("debug", debug_kernel);
 early_param("quiet", quiet_kernel);
 
+static char __init *real_loglevel_setup(char *str)
+{
+	struct loglevel_setup **la;
+
+	for (la = __loglevel_setup_start ; la < __loglevel_setup_end; la++) {
+		struct loglevel_setup *l = *la;
+		int len = strlen(l->name);
+
+		if (!strncmp(str, l->name, len)) {
+			/* skip one : */
+			l->setup(str + len + 1);
+			str = NULL;
+			break;
+		}
+	}
+
+	return str;
+}
 static int __init loglevel(char *str)
 {
-	get_option(&str, &console_loglevel);
+	while (str) {
+		char *k = strchr(str, ',');
+		if (k)
+			*k++ = 0;
+		if (*str && (str = real_loglevel_setup(str)) && *str) {
+			get_option(&str, &console_loglevel);
+		}
+		str = k;
+	}
 	return 0;
 }
 
author
#1 lore raw

PATCH 2/5 pci: add pci_printk v2

use DEFINE_LOGLEVEL_SETUP to set loglevel for pci
v2: two lines only

---
 drivers/pci/pci.c   |    2 ++
 include/linux/pci.h |    2 ++
 2 files changed, 4 insertions(+)
drivers/pci/pci.c +2 -0
Index: linux-2.6/drivers/pci/pci.c
===================================================================
@@ -1953,6 +1953,8 @@ static int __devinit pci_setup(char *str
 }
 early_param("pci", pci_setup);
 
+DEFINE_LOGLEVEL_SETUP(pci);
+
 device_initcall_sync(pci_init);
 
 EXPORT_SYMBOL(pci_reenable_device);
include/linux/pci.h +2 -0
Index: linux-2.6/include/linux/pci.h
===================================================================
@@ -55,6 +55,8 @@
 /* Include the ID list */
 #include <linux/pci_ids.h>
 
+DECLARE_LOGLEVEL(pci);
+
 /* pci_slot represents a physical slot */
 struct pci_slot {
 	struct pci_bus *bus;		/* The bus this slot is on */
author
#2 lore raw

PATCH 3/5 pci: using pci_printk

In reply to Yinghai Lu
---
 drivers/pci/probe.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pci/probe.c +5 -5
Index: linux-2.6/drivers/pci/probe.c
===================================================================
@@ -304,7 +304,7 @@ static int __pci_read_base(struct pci_de
 		} else {
 			res->start = l64;
 			res->end = l64 + sz64;
-			printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
+			pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
 				 pci_name(dev), pos, res->start, res->end);
 		}
 	} else {
@@ -315,7 +315,7 @@ static int __pci_read_base(struct pci_de
 
 		res->start = l;
 		res->end = l + sz;
-		printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),
+		pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),
 			 pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",
 			 res->start, res->end);
 	}
@@ -388,7 +388,7 @@ void __devinit pci_read_bridge_bases(str
 			res->start = base;
 		if (!res->end)
 			res->end = limit + 0xfff;
-		printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
+		pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
 				 pci_name(dev), res->start, res->end);
 	}
 
@@ -401,7 +401,7 @@ void __devinit pci_read_bridge_bases(str
 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
 		res->start = base;
 		res->end = limit + 0xfffff;
-		printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
+		pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
 				 pci_name(dev), res->start, res->end);
 	}
 
@@ -438,7 +438,7 @@ void __devinit pci_read_bridge_bases(str
 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
 		res->start = base;
 		res->end = limit + 0xfffff;
-		printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
+		pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
 				 pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",
 				 res->start, res->end);
 	}
#3 lore raw

Re: [PATCH 3/5] pci: using pci_printk

drivers/pci/probe.c static int __pci_read_base(struct pci_de · line 305

Quoted 6 lines · Yinghai Lu
drivers/pci/probe.c +1 -1
@@ -304,7 +304,7 @@ static int __pci_read_base(struct pci_de
 
-			printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
+			pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
				   ^^^^^^^^^^^^^^^^^^^^^^^^^^

Brilliant, simply brilliant!

Printk haters club is definitely creative, no questions.

#4 lore raw

Re: [PATCH 3/5] pci: using pci_printk

Quoted 10 lines · Alexey Dobriyan

drivers/pci/probe.c static int __pci_read_base(struct pci_de · line 305

Quoted 6 lines · Yinghai Lu
drivers/pci/probe.c +1 -1
@@ -304,7 +304,7 @@ static int __pci_read_base(struct pci_de
 
-			printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
+			pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
				   ^^^^^^^^^^^^^^^^^^^^^^^^^^

Brilliant, simply brilliant!

Wouldn't it be much simpler to have an i/f as for dev_dbg() and also run the log level check only for debug messages? And, the dev_dbg() macro seems to have code that can be binary pached (?) to enable it if the compile option is not set.

-Robert

#define dev_dbg(dev, format, arg...)            \
        ({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; })
Signature · 3 lines
Advanced Micro Devices, Inc.
Operating System Research Center
email: [email protected]
#5 lore raw

Re: [PATCH 3/5] pci: using pci_printk

In reply to Alexey Dobriyan

* Alexey Dobriyan <[email protected]>:

Quoted 9 lines · Yinghai Lu

drivers/pci/probe.c static int __pci_read_base(struct pci_de · line 305

Quoted 6 lines
drivers/pci/probe.c +1 -1
@@ -304,7 +304,7 @@ static int __pci_read_base(struct pci_de
 
-			printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
+			pci_printk(KERN_LOG_DEBUG, KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
				   ^^^^^^^^^^^^^^^^^^^^^^^^^^

Brilliant, simply brilliant!

Yeah, that's ugly.

Quoted 1 line

Printk haters club is definitely creative, no questions.

Bjorn might have some useful advice here.

Also, didn't we recently get all the PCI printk output to resemble what lspci shows us?

/ac

author
#6 lore raw

PATCH 4/5 acpi: add acpi_printk

In reply to Yinghai Lu

use DEFINE_LOGLEVEL_SETUP to set loglevel for acpi

---
 drivers/acpi/osl.c   |    2 ++
 include/linux/acpi.h |    1 +
 2 files changed, 3 insertions(+)
drivers/acpi/osl.c +2 -0
Index: linux-2.6/drivers/acpi/osl.c
===================================================================
@@ -75,6 +75,8 @@ EXPORT_SYMBOL(acpi_in_debugger);
 extern char line_buf[80];
 #endif				/*ENABLE_DEBUGGER */
 
+DEFINE_LOGLEVEL_SETUP(acpi);
+
 static unsigned int acpi_irq_irq;
 static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
include/linux/acpi.h +1 -0
Index: linux-2.6/include/linux/acpi.h
===================================================================
@@ -43,6 +43,7 @@
 #include <asm/acpi.h>
 #include <linux/dmi.h>
 
+DECLARE_LOGLEVEL(acpi);
 
 enum acpi_irq_model_id {
 	ACPI_IRQ_MODEL_PIC = 0,
author
#7 lore raw

PATCH 5/5 apci: dump slit v3

In reply to Yinghai Lu

v2: using boot_printk
v3: using acpi_printk

---
 drivers/acpi/numa.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/acpi/numa.c +8 -0
Index: linux-2.6/drivers/acpi/numa.c
===================================================================
@@ -150,6 +150,14 @@ static __init int slit_valid(struct acpi
 {
 	int i, j;
 	int d = slit->locality_count;
+	acpi_printk(KERN_LOG_DEBUG, KERN_DEBUG "ACPI: SLIT: nodes = %d\n", d);
+	for (i = 0; i < d; i++) {
+		for (j = 0; j < d; j++)  {
+			u8 val = slit->entry[d*i + j];
+			acpi_printk(KERN_LOG_DEBUG, " %d", val);
+		}
+		acpi_printk(KERN_LOG_DEBUG, "\n");
+	}
 	for (i = 0; i < d; i++) {
 		for (j = 0; j < d; j++)  {
 			u8 val = slit->entry[d*i + j];
#8 lore raw

Re: [PATCH 5/5] apci: dump slit v3

[Yinghai Lu - Tue, Sep 16, 2008 at 01:52:54AM -0700]

| v2: using boot_printk
| v3: using acpi_printk
| 
| Signed-off-by: Yinghai Lu <[email protected]>
| 
| ---
|  drivers/acpi/numa.c |    8 ++++++++
|  1 file changed, 8 insertions(+)
| 
| Index: linux-2.6/drivers/acpi/numa.c
| ===================================================================
| --- linux-2.6.orig/drivers/acpi/numa.c
| +++ linux-2.6/drivers/acpi/numa.c
| @@ -150,6 +150,14 @@ static __init int slit_valid(struct acpi
|  {
|  	int i, j;
|  	int d = slit->locality_count;
| +	acpi_printk(KERN_LOG_DEBUG, KERN_DEBUG "ACPI: SLIT: nodes = %d\n", d);
| +	for (i = 0; i < d; i++) {
| +		for (j = 0; j < d; j++)  {
| +			u8 val = slit->entry[d*i + j];
| +			acpi_printk(KERN_LOG_DEBUG, " %d", val);
| +		}
| +		acpi_printk(KERN_LOG_DEBUG, "\n");
| +	}
|  	for (i = 0; i < d; i++) {
|  		for (j = 0; j < d; j++)  {
|  			u8 val = slit->entry[d*i + j];
| 

I suppose there will be some apic_pr_... macro since typing ~40 symbols to print a message a bit annoying. Yinghai?

- Cyrill -