Skip to contentSkip to conversation

io: Fix return type of _inb and _inl

PATCH In review Stafford Horne 4 participants 6 messages Jul 26, 2020 – Jul 27, 2020 Generic include/asm header files

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 io: Fix return type of _inb and _inl

The return type of functions _inb, _inw and _inl are all u16 which looks wrong. This patch makes them u8, u16 and u32 respectively.

The original commit text for these does not indicate that these should be all forced to u16.

Fixes f009c89df79a ("io: Provide _inX() and _outX()")
---
 include/asm-generic/io.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/asm-generic/io.h +2 -2
index 8b1e020e9a03..30a3aab312e6 100644
@@ -456,7 +456,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer,
 
 #if !defined(inb) && !defined(_inb)
 #define _inb _inb
-static inline u16 _inb(unsigned long addr)
+static inline u8 _inb(unsigned long addr)
 {
 	u8 val;
 
@@ -482,7 +482,7 @@ static inline u16 _inw(unsigned long addr)
 
 #if !defined(inl) && !defined(_inl)
 #define _inl _inl
-static inline u16 _inl(unsigned long addr)
+static inline u32 _inl(unsigned long addr)
 {
 	u32 val;
 
Signature · 1 line
2.26.2
#1 lore raw
Quoted 6 lines · Stafford Horne

The return type of functions _inb, _inw and _inl are all u16 which looks wrong. This patch makes them u8, u16 and u32 respectively.

The original commit text for these does not indicate that these should be all forced to u16.

Is it in alight with all architectures? that support this interface natively?

(Return value is arch-dependent AFAIU, so it might actually return 16-bit for byte read, but I agree that this is weird for 32-bit value. I think you have elaborate more in the commit message)

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Stafford Horne

The return type of functions _inb, _inw and _inl are all u16 which looks wrong. This patch makes them u8, u16 and u32 respectively.

Quoted 8 lines
Quoted 2 lines

The original commit text for these does not indicate that these should be all forced to u16.

Is it in alight with all architectures? that support this interface natively?

(Return value is arch-dependent AFAIU, so it might actually return 16-bit for byte read, but I agree that this is weird for 32-bit value. I think you have elaborate more in the commit message)

Well, this is the generic io code, at least these api's appear to not be different for each architecture. The output read by the architecture dependant code i.e. __raw_readb() below is getting is placed into a u8. So I think the output of the function will be u8.

static inline u8 _inb(unsigned long addr)

{
	u8 val;

	__io_pbr();
	val = __raw_readb(PCI_IOBASE + addr);
	__io_par(val);
	return val;
}

I can expand the commit text, but I would like to get some comments from the original author to confirm if this is an issue.

-Stafford

maintainer
#3 lore raw
Quoted 31 lines · Stafford Horne
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Stafford Horne

The return type of functions _inb, _inw and _inl are all u16 which looks wrong. This patch makes them u8, u16 and u32 respectively.

Quoted 8 lines
Quoted 2 lines

The original commit text for these does not indicate that these should be all forced to u16.

Is it in alight with all architectures? that support this interface natively?

(Return value is arch-dependent AFAIU, so it might actually return 16-bit for byte read, but I agree that this is weird for 32-bit value. I think you have elaborate more in the commit message)

Well, this is the generic io code, at least these api's appear to not be different for each architecture. The output read by the architecture dependant code i.e. __raw_readb() below is getting is placed into a u8. So I think the output of the function will be u8.

static inline u8 _inb(unsigned long addr)

{
        u8 val;

        __io_pbr();
        val = __raw_readb(PCI_IOBASE + addr);
        __io_par(val);
        return val;
}
Quoted 2 lines

I can expand the commit text, but I would like to get some comments from the original author to confirm if this is an issue.

I think your original version is fine, this was clearly just a typo and I've applied your fix now and will forward it to Linus in the next few days, giving John the chance to add his Ack or further comments.

Thanks a lot for spotting it and sending a fix.

Arnd

Reviewed-by
#4 lore raw
Quoted 31 lines · Stafford Horne
Quoted 31 lines · Andy Shevchenko
Quoted 5 lines · Stafford Horne
Quoted 4 lines

The return type of functions _inb, _inw and _inl are all u16 which looks wrong. This patch makes them u8, u16 and u32 respectively.

Quoted 8 lines
Quoted 2 lines

The original commit text for these does not indicate that these should be all forced to u16.

Is it in alight with all architectures? that support this interface natively?

(Return value is arch-dependent AFAIU, so it might actually return 16-bit for byte read, but I agree that this is weird for 32-bit value. I think you have elaborate more in the commit message)

Well, this is the generic io code, at least these api's appear to not be different for each architecture. The output read by the architecture dependant code i.e. __raw_readb() below is getting is placed into a u8. So I think the output of the function will be u8.

static inline u8 _inb(unsigned long addr)

{
         u8 val;

         __io_pbr();
         val = __raw_readb(PCI_IOBASE + addr);
         __io_par(val);
         return val;
}
Quoted 8 lines
Quoted 2 lines

I can expand the commit text, but I would like to get some comments from the original author to confirm if this is an issue.

I think your original version is fine, this was clearly just a typo and I've applied your fix now and will forward it to Linus in the next few days, giving John the chance to add his Ack or further comments.

Thanks a lot for spotting it and sending a fix.

Thanks Arnd.

Yeah, these looks like copy+paste errors on my part:

I'll give this patch a spin, but not expecting any differences (since original seems ok).

Note that kbuild robot also reported this:
https://lore.kernel.org/lkml/202007140549.J7X9BVPT%[email protected]/

Extract:

include/asm-generic/io.h:521:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:521:22: sparse: expected unsigned int
[usertype] value
include/asm-generic/io.h:521:22: sparse: got restricted __le32
[usertype]

But they look like issues which were in the existing code. I tried to recreate to verify any change, but trying to manually upgrade glibc busted my machine :(

Thanks,
John

maintainer
#5 lore raw
Quoted 40 lines · John Garry
Quoted 38 lines · Stafford Horne
Quoted 31 lines · Andy Shevchenko
Quoted 5 lines · Stafford Horne
Quoted 4 lines

The return type of functions _inb, _inw and _inl are all u16 which looks wrong. This patch makes them u8, u16 and u32 respectively.

Quoted 8 lines
Quoted 2 lines

The original commit text for these does not indicate that these should be all forced to u16.

Is it in alight with all architectures? that support this interface natively?

(Return value is arch-dependent AFAIU, so it might actually return 16-bit for byte read, but I agree that this is weird for 32-bit value. I think you have elaborate more in the commit message)

Well, this is the generic io code, at least these api's appear to not be different for each architecture. The output read by the architecture dependant code i.e. __raw_readb() below is getting is placed into a u8. So I think the output of the function will be u8.

static inline u8 _inb(unsigned long addr)

{
         u8 val;

         __io_pbr();
         val = __raw_readb(PCI_IOBASE + addr);
         __io_par(val);
         return val;
}
Quoted 2 lines

I can expand the commit text, but I would like to get some comments from the original author to confirm if this is an issue.

I think your original version is fine, this was clearly just a typo and I've applied your fix now and will forward it to Linus in the next few days, giving John the chance to add his Ack or further comments.

Quoted 7 lines
Quoted 1 line

Thanks a lot for spotting it and sending a fix.

Thanks Arnd.

Yeah, these looks like copy+paste errors on my part:

Thanks!

Quoted 14 lines

I'll give this patch a spin, but not expecting any differences (since original seems ok).

Note that kbuild robot also reported this:
https://lore.kernel.org/lkml/202007140549.J7X9BVPT%[email protected]/

Extract:

include/asm-generic/io.h:521:22: sparse: sparse: incorrect type in
argument 1 (different base types) @@ expected unsigned int
[usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:521:22: sparse: expected unsigned int
[usertype] value

Quoted 4 lines
    include/asm-generic/io.h:521:22: sparse:     got restricted __le32

[usertype]

But they look like issues which were in the existing code.

Yes, this driver code (atm/ambassador.c) seems to have been broken that way since it was merged in 1999.

Arnd