Skip to contentSkip to conversation

fix printk format compiler warnings

PATCH In review Jan Beulich 5 participants 6 messages Sep 5, 2008 – Sep 30, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix printk format compiler warnings

%llx and the like cannot be used on u64-derived data types - they must be cast to long long explicitly for arch-es where u64 is a typedef of unsigned long (ia64 is where I observed the problem).

---
 drivers/pci/probe.c     |   16 +++++++++++++---
 drivers/pci/setup-bus.c |    6 +++++-
 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/pci/probe.c +13 -3
@@ -383,7 +383,10 @@ void __devinit pci_read_bridge_bases(str
 			res->start = base;
 		if (!res->end)
 			res->end = limit + 0xfff;
-		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s io port: [%Lx, %Lx]\n",
+		       pci_name(dev),
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 
 	res = child->resource[1];
@@ -395,7 +398,10 @@ 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_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%Lx, %Lx]\n",
+		       pci_name(dev),
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 
 	res = child->resource[2];
@@ -431,7 +437,11 @@ 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_INFO "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);
+		printk(KERN_INFO "PCI: bridge %s %dbit mmio pref: [%Lx, %Lx]\n",
+		       pci_name(dev),
+		       res->flags & PCI_PREF_RANGE_TYPE_64 ? 64 : 32,
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 }
 
drivers/pci/setup-bus.c +5 -1
@@ -539,7 +539,11 @@ static void pci_bus_dump_res(struct pci_
                 if (!res)
                         continue;
 
-		printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
+		printk(KERN_INFO "bus: %02x index %x %s: [%Lx, %Lx]\n",
+		       bus->number, i,
+		       res->flags & IORESOURCE_IO ? "io port" : "mmio",
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
         }
 }
 
#1 lore raw
Quoted 56 lines · On Fri, 05 Sep 2008 13:06:24 +0100 "Jan Beulich" <[email protected]> wrote:

%llx and the like cannot be used on u64-derived data types - they must be cast to long long explicitly for arch-es where u64 is a typedef of unsigned long (ia64 is where I observed the problem).

---
 drivers/pci/probe.c     |   16 +++++++++++++---
 drivers/pci/setup-bus.c |    6 +++++-
 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/pci/probe.c +13 -3
@@ -383,7 +383,10 @@ void __devinit pci_read_bridge_bases(str
 			res->start = base;
 		if (!res->end)
 			res->end = limit + 0xfff;
-		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s io port: [%Lx, %Lx]\n",
+		       pci_name(dev),
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 
 	res = child->resource[1];
@@ -395,7 +398,10 @@ 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_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%Lx, %Lx]\n",
+		       pci_name(dev),
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 
 	res = child->resource[2];
@@ -431,7 +437,11 @@ 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_INFO "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);
+		printk(KERN_INFO "PCI: bridge %s %dbit mmio pref: [%Lx, %Lx]\n",
+		       pci_name(dev),
+		       res->flags & PCI_PREF_RANGE_TYPE_64 ? 64 : 32,
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 }
 
drivers/pci/setup-bus.c +0 -0
@@ -539,7 +539,11 @@ static void pci_bus_dump_res(struct pci_
                 if (!res)
                         continue;

drivers/pci/setup-bus.c static void pci_bus_dump_res(struct pci_ · line 549

Quoted 10 lines
drivers/pci/setup-bus.c +5 -1
 
-		printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
+		printk(KERN_INFO "bus: %02x index %x %s: [%Lx, %Lx]\n",
+		       bus->number, i,
+		       res->flags & IORESOURCE_IO ? "io port" : "mmio",
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
         }
 }
 

These have been fixed in linux-next for a month.

Jesse, can we get that into 2.6.27 please?

#2 lore raw
Quoted 78 lines · Andrew Morton

On Fri, 05 Sep 2008 13:06:24 +0100

Quoted 65 lines · Jan Beulich

%llx and the like cannot be used on u64-derived data types - they must be cast to long long explicitly for arch-es where u64 is a typedef of unsigned long (ia64 is where I observed the problem).

---
 drivers/pci/probe.c     |   16 +++++++++++++---
 drivers/pci/setup-bus.c |    6 +++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

--- linux-2.6.27-rc5/drivers/pci/probe.c 2008-08-21 14:37:32.000000000
+0200 +++ 2.6.27-rc5-pci-probe-print/drivers/pci/probe.c 2008-09-02
15:18:08.000000000 +0200 @@ -383,7 +383,10 @@ void __devinit pci_read_bridge_bases(str

drivers/pci/probe.c +0 -1
 			res->start = base;
 		if (!res->end)
 			res->end = limit + 0xfff;
-		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n",

pci_name(dev), res->start, res->end); + printk(KERN_INFO "PCI: bridge %s
io port: [%Lx, %Lx]\n",

drivers/pci/probe.c +3 -1
+		       pci_name(dev),
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 
 	res = child->resource[1];
@@ -395,7 +398,10 @@ 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_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",

pci_name(dev), res->start, res->end); + printk(KERN_INFO "PCI: bridge %s
32bit mmio: [%Lx, %Lx]\n",

drivers/pci/probe.c +3 -1
+		       pci_name(dev),
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 
 	res = child->resource[2];
@@ -431,7 +437,11 @@ 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_INFO "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);

drivers/pci/probe.c +4 -1
+		printk(KERN_INFO "PCI: bridge %s %dbit mmio pref: [%Lx, %Lx]\n", +		  
    pci_name(dev),
+		       res->flags & PCI_PREF_RANGE_TYPE_64 ? 64 : 32,
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
 	}
 }
 
--- linux-2.6.27-rc5/drivers/pci/setup-bus.c	2008-08-21

14:37:32.000000000 +0200 +++
2.6.27-rc5-pci-probe-print/drivers/pci/setup-bus.c 2008-09-02
15:18:20.000000000 +0200 @@ -539,7 +539,11 @@ static void pci_bus_dump_res(struct pci_

                 if (!res)
                         continue;
(quoted diff) +0 -1
-		printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number,

i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);

drivers/pci/setup-bus.c static void pci_bus_dump_res(struct pci_ · line 548

Quoted 7 lines
drivers/pci/setup-bus.c +5 -0
+		printk(KERN_INFO "bus: %02x index %x %s: [%Lx, %Lx]\n",
+		       bus->number, i,
+		       res->flags & IORESOURCE_IO ? "io port" : "mmio",
+		       (unsigned long long)res->start,
+		       (unsigned long long)res->end);
         }
 }

These have been fixed in linux-next for a month.

Quoted 1 line

Jesse, can we get that into 2.6.27 please?

I suppose. They only appear with certain configs and are fairly harmless, so I wasn't planning on pushing them into 2.6.27. But I'll include it in my next pull request anyway, since you're such a cool guy and I want to make you happy :) (assuming 2.6.27 proper isn't released in the next couple of day...)

Thanks,
Jesse

#3 lore raw

PATCH 1/1 checkpatch: Check for %L for all integer formats (was: Re: [PATCH] fix printk format compiler warnings)

In reply to Jan Beulich
Quoted 5 lines · Jan Beulich

%llx and the like cannot be used on u64-derived data types - they must be cast to long long explicitly for arch-es where u64 is a typedef of unsigned long (ia64 is where I observed the problem).

(quoted diff) +0 -1
-		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);

Review

Quoted 10 lines
(quoted diff) +4 -3
+		printk(KERN_INFO "PCI: bridge %s io port: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "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);
+		printk(KERN_INFO "PCI: bridge %s %dbit mmio pref: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
+		printk(KERN_INFO "bus: %02x index %x %s: [%Lx, %Lx]\n",

Why did you replace %ll' by %L'?

While L' is used as an internal flag in Linux' vsnprintf() implementation and is still supported because of historical (pre-C99) reasons, the L' conversion qualifier is meant for the long double' floating point type, as per C99. The recommended conversion qualifier for the long long' integer type is `ll'.

Perhaps checkpatch should check for this? Ah, it already does for some of the integer formats. The patch below adds checks for the missing ones.

Subject: [PATCH] checkpatch: Check for %L for all integer formats

Checkpatch checks for the use of the non-standard L' conversion qualifier for some (u', d', and i') of the 6 integers formats. Add the missing ones (o', x', and `X'), and keep the list sorted.

scripts/checkpatch.pl +3 -3
index bc67793..92cbf5e 100755
@@ -2277,12 +2277,12 @@ sub process {
 			WARN("usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr);
 		}
 
-# check for %L{u,d,i} in strings
+# check for %L{d,i,o,u,x,X} in strings
 		my $string;
 		while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
 			$string = substr($rawline, $-[1], $+[1] - $-[1]);
-			if ($string =~ /(?<!%)%L[udi]/) {
-				WARN("\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
+			if ($string =~ /(?<!%)%L[diouxX]/) {
+				WARN("\%L[diouxX] are not-standard C, use %ll[diouxX]\n" . $herecurr);
 				last;
 			}
 		}

With kind regards,

Geert Uytterhoeven
Software Architect

Sony Techsoft Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone:    +32 (0)2 700 8453
Fax:      +32 (0)2 700 8622
E-mail:   [email protected]
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010

#4 lore raw

Re: [PATCH] checkpatch: Check for %L for all integer formats (was: Re: [PATCH] fix printk format compiler warnings)

Quoted 19 lines · Geert Uytterhoeven
Quoted 5 lines · Jan Beulich

%llx and the like cannot be used on u64-derived data types - they must be cast to long long explicitly for arch-es where u64 is a typedef of unsigned long (ia64 is where I observed the problem).

(quoted diff) +0 -1
-		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);

Review

Quoted 10 lines
(quoted diff) +4 -3
+		printk(KERN_INFO "PCI: bridge %s io port: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "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);
+		printk(KERN_INFO "PCI: bridge %s %dbit mmio pref: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
+		printk(KERN_INFO "bus: %02x index %x %s: [%Lx, %Lx]\n",

Why did you replace %ll' by %L'?

Quoted 7 lines

While L' is used as an internal flag in Linux' vsnprintf() implementation and is still supported because of historical (pre-C99) reasons, the L' conversion qualifier is meant for the long double' floating point type, as per C99. The recommended conversion qualifier for the long long' integer type is `ll'.

Perhaps checkpatch should check for this? Ah, it already does for some of the integer formats. The patch below adds checks for the missing ones.

[...]

Yes that looks entirly reasonable to me. Will queue it up with my next batch for Andrew.

Thanks.

-apw

#5 lore raw

PATCH 1/1 checkpatch: Check for %L for all integer formats (was: Re:[PATCH] fix printk format compiler warnings)

In reply to Geert Uytterhoeven
Quoted 12 lines
Quoted 1 line
Quoted 1 line

Geert Uytterhoeven <[email protected]> 30.09.08 13:29 >>>

Quoted 9 lines · Jan Beulich

%llx and the like cannot be used on u64-derived data types - they must be cast to long long explicitly for arch-es where u64 is a typedef of unsigned long (ia64 is where I observed the problem).

(quoted diff) +2 -2
-		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s io port: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%Lx, %Lx]\n",
Quoted 7 lines

Review

Quoted 5 lines
(quoted diff) +2 -2
-		printk(KERN_INFO "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);
+		printk(KERN_INFO "PCI: bridge %s %dbit mmio pref: [%Lx, %Lx]\n",
 
-		printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
+		printk(KERN_INFO "bus: %02x index %x %s: [%Lx, %Lx]\n",

Why did you replace %ll' by %L'?

Because it's one byte shorter.

Quoted 4 lines

While L' is used as an internal flag in Linux' vsnprintf() implementation and is still supported because of historical (pre-C99) reasons, the L' conversion qualifier is meant for the long double' floating point type, as per C99. The recommended conversion qualifier for the long long' integer type is `ll'.

I understand all of this, but can't see why you would care about floating point formats in the kernel (when specifically you know that vsnprintf() & Co aren't able to handle it anyway).

So I think rather than widening the set of specifiers checkpatch looks for, the check should rather be removed altogether.

Jan