* [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods
@ 2020-06-20 9:33 Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 1/3] MIPS: generic/ip32: io: fix __mem_ioswabq() Alexander Lobakin
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Alexander Lobakin @ 2020-06-20 9:33 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Alexandre Belloni, Paul Burton, Alexander Lobakin, linux-mips,
linux-kernel
This set addresses the two most annoying sparse floods when building the
tree with C={1,2}: one in asm/io.h (in several mangle-port.h actually),
and one in asm/checksum.h.
Both of these comes from lack of forced typecasting and hence harmless,
but complicates real bug hunting, as asm/io.h is included in almost
every driver, while asm/checksum.h is included in lots of networking
code.
I also fixed two wrong __mem_ioswabq() macros while was nearby.
Tested on Generic MIPS platform -- no more flooding in console (there's
one more source in mips-cm.h, but it's included in just a few files, so
not a real problem. It can be issued separately anyway), while objdump
doesn't see any difference at all.
Alexander Lobakin (3):
MIPS: generic/ip32: io: fix __mem_ioswabq()
MIPS: io: fix sparse flood on asm/io.h
MIPS: checksum: fix sparse flooding on asm/checksum.h
arch/mips/include/asm/checksum.h | 4 ++--
.../include/asm/mach-cavium-octeon/mangle-port.h | 12 +++++++++---
arch/mips/include/asm/mach-generic/mangle-port.h | 12 ++++++------
arch/mips/include/asm/mach-ip27/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-ip30/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-ip32/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-tx39xx/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-tx49xx/mangle-port.h | 6 +++---
8 files changed, 32 insertions(+), 26 deletions(-)
--
2.27.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH mips-next 1/3] MIPS: generic/ip32: io: fix __mem_ioswabq()
2020-06-20 9:33 [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Alexander Lobakin
@ 2020-06-20 9:34 ` Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 2/3] MIPS: io: fix sparse flood on asm/io.h Alexander Lobakin
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Lobakin @ 2020-06-20 9:34 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Alexandre Belloni, Paul Burton, Alexander Lobakin, linux-mips,
linux-kernel
*readq() family operates with u64 arguments, so they need 64-bit
byteswaps.
Correct macros for Generic MIPS and IP-32 to match other machines'
implementations.
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
arch/mips/include/asm/mach-generic/mangle-port.h | 2 +-
arch/mips/include/asm/mach-ip32/mangle-port.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/mach-generic/mangle-port.h b/arch/mips/include/asm/mach-generic/mangle-port.h
index f49dc990214b..e4daf163706c 100644
--- a/arch/mips/include/asm/mach-generic/mangle-port.h
+++ b/arch/mips/include/asm/mach-generic/mangle-port.h
@@ -45,7 +45,7 @@
# define ioswabl(a, x) (x)
# define __mem_ioswabl(a, x) cpu_to_le32(x)
# define ioswabq(a, x) (x)
-# define __mem_ioswabq(a, x) cpu_to_le32(x)
+# define __mem_ioswabq(a, x) cpu_to_le64(x)
#endif
diff --git a/arch/mips/include/asm/mach-ip32/mangle-port.h b/arch/mips/include/asm/mach-ip32/mangle-port.h
index f1d0f1756a9f..c5ef72ccb0d5 100644
--- a/arch/mips/include/asm/mach-ip32/mangle-port.h
+++ b/arch/mips/include/asm/mach-ip32/mangle-port.h
@@ -21,6 +21,6 @@
# define ioswabl(a, x) (x)
# define __mem_ioswabl(a, x) cpu_to_le32(x)
# define ioswabq(a, x) (x)
-# define __mem_ioswabq(a, x) cpu_to_le32(x)
+# define __mem_ioswabq(a, x) cpu_to_le64(x)
#endif /* __ASM_MACH_IP32_MANGLE_PORT_H */
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH mips-next 2/3] MIPS: io: fix sparse flood on asm/io.h
2020-06-20 9:33 [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 1/3] MIPS: generic/ip32: io: fix __mem_ioswabq() Alexander Lobakin
@ 2020-06-20 9:34 ` Alexander Lobakin
2020-06-20 9:35 ` [PATCH mips-next 3/3] MIPS: checksum: fix sparse flooding on asm/checksum.h Alexander Lobakin
2020-06-25 9:40 ` [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Thomas Bogendoerfer
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Lobakin @ 2020-06-20 9:34 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Alexandre Belloni, Paul Burton, Alexander Lobakin, linux-mips,
linux-kernel
MIPS MMIO macros for byteswapping from/to hardware endianness are a bit
tricky because they use cpu_to_le{16,32,64}() in both directions.
This generates a lot of questions from sparse as __le{16,32,64} types
are 'restricted' and direct cast is forbidden in order to prevent messing
up the byteorder.
As MMIO ops are used in almost every single driver, this leads to console
flooding and complicates bug hunting.
We could fix it in a more proper way, i.e. separate from device /
to device byteswap macros and expand __BUILD_MEMORY_*(), but this seems
redundant and will produce code duplication.
Instead, just expand the existing *ioswab*() macros with forced
typecasting to stop floods.
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
.../include/asm/mach-cavium-octeon/mangle-port.h | 12 +++++++++---
arch/mips/include/asm/mach-generic/mangle-port.h | 12 ++++++------
arch/mips/include/asm/mach-ip27/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-ip30/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-ip32/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-tx39xx/mangle-port.h | 6 +++---
arch/mips/include/asm/mach-tx49xx/mangle-port.h | 6 +++---
7 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h b/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
index 8ff2cbdf2c3e..239fcc874b99 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
@@ -48,11 +48,17 @@ static inline bool __should_swizzle_addr(u64 p)
# define ioswabb(a, x) (x)
# define __mem_ioswabb(a, x) (x)
-# define ioswabw(a, x) (__should_swizzle_bits(a) ? le16_to_cpu(x) : x)
+# define ioswabw(a, x) (__should_swizzle_bits(a) ? \
+ le16_to_cpu((__force __le16)(x)) : \
+ (x))
# define __mem_ioswabw(a, x) (x)
-# define ioswabl(a, x) (__should_swizzle_bits(a) ? le32_to_cpu(x) : x)
+# define ioswabl(a, x) (__should_swizzle_bits(a) ? \
+ le32_to_cpu((__force __le32)(x)) : \
+ (x))
# define __mem_ioswabl(a, x) (x)
-# define ioswabq(a, x) (__should_swizzle_bits(a) ? le64_to_cpu(x) : x)
+# define ioswabq(a, x) (__should_swizzle_bits(a) ? \
+ le64_to_cpu((__force __le64)(x)) : \
+ (x))
# define __mem_ioswabq(a, x) (x)
#endif /* __ASM_MACH_GENERIC_MANGLE_PORT_H */
diff --git a/arch/mips/include/asm/mach-generic/mangle-port.h b/arch/mips/include/asm/mach-generic/mangle-port.h
index e4daf163706c..77c65c294db6 100644
--- a/arch/mips/include/asm/mach-generic/mangle-port.h
+++ b/arch/mips/include/asm/mach-generic/mangle-port.h
@@ -29,11 +29,11 @@
# define ioswabb(a, x) (x)
# define __mem_ioswabb(a, x) (x)
-# define ioswabw(a, x) le16_to_cpu(x)
+# define ioswabw(a, x) le16_to_cpu((__force __le16)(x))
# define __mem_ioswabw(a, x) (x)
-# define ioswabl(a, x) le32_to_cpu(x)
+# define ioswabl(a, x) le32_to_cpu((__force __le32)(x))
# define __mem_ioswabl(a, x) (x)
-# define ioswabq(a, x) le64_to_cpu(x)
+# define ioswabq(a, x) le64_to_cpu((__force __le64)(x))
# define __mem_ioswabq(a, x) (x)
#else
@@ -41,11 +41,11 @@
# define ioswabb(a, x) (x)
# define __mem_ioswabb(a, x) (x)
# define ioswabw(a, x) (x)
-# define __mem_ioswabw(a, x) cpu_to_le16(x)
+# define __mem_ioswabw(a, x) ((__force u16)cpu_to_le16(x))
# define ioswabl(a, x) (x)
-# define __mem_ioswabl(a, x) cpu_to_le32(x)
+# define __mem_ioswabl(a, x) ((__force u32)cpu_to_le32(x))
# define ioswabq(a, x) (x)
-# define __mem_ioswabq(a, x) cpu_to_le64(x)
+# define __mem_ioswabq(a, x) ((__force u64)cpu_to_le64(x))
#endif
diff --git a/arch/mips/include/asm/mach-ip27/mangle-port.h b/arch/mips/include/asm/mach-ip27/mangle-port.h
index 27c56efa519f..f71c38bbfc2f 100644
--- a/arch/mips/include/asm/mach-ip27/mangle-port.h
+++ b/arch/mips/include/asm/mach-ip27/mangle-port.h
@@ -16,10 +16,10 @@
# define ioswabb(a, x) (x)
# define __mem_ioswabb(a, x) (x)
# define ioswabw(a, x) (x)
-# define __mem_ioswabw(a, x) cpu_to_le16(x)
+# define __mem_ioswabw(a, x) ((__force u16)cpu_to_le16(x))
# define ioswabl(a, x) (x)
-# define __mem_ioswabl(a, x) cpu_to_le32(x)
+# define __mem_ioswabl(a, x) ((__force u32)cpu_to_le32(x))
# define ioswabq(a, x) (x)
-# define __mem_ioswabq(a, x) cpu_to_le64(x)
+# define __mem_ioswabq(a, x) ((__force u64)cpu_to_le64(x))
#endif /* __ASM_MACH_IP27_MANGLE_PORT_H */
diff --git a/arch/mips/include/asm/mach-ip30/mangle-port.h b/arch/mips/include/asm/mach-ip30/mangle-port.h
index f3e1262a2d5e..439c6a601830 100644
--- a/arch/mips/include/asm/mach-ip30/mangle-port.h
+++ b/arch/mips/include/asm/mach-ip30/mangle-port.h
@@ -13,10 +13,10 @@
#define ioswabb(a, x) (x)
#define __mem_ioswabb(a, x) (x)
#define ioswabw(a, x) (x)
-#define __mem_ioswabw(a, x) cpu_to_le16(x)
+#define __mem_ioswabw(a, x) ((__force u16)cpu_to_le16(x))
#define ioswabl(a, x) (x)
-#define __mem_ioswabl(a, x) cpu_to_le32(x)
+#define __mem_ioswabl(a, x) ((__force u32)cpu_to_le32(x))
#define ioswabq(a, x) (x)
-#define __mem_ioswabq(a, x) cpu_to_le64(x)
+#define __mem_ioswabq(a, x) ((__force u64)cpu_to_le64(x))
#endif /* __ASM_MACH_IP30_MANGLE_PORT_H */
diff --git a/arch/mips/include/asm/mach-ip32/mangle-port.h b/arch/mips/include/asm/mach-ip32/mangle-port.h
index c5ef72ccb0d5..4bc3d20e8293 100644
--- a/arch/mips/include/asm/mach-ip32/mangle-port.h
+++ b/arch/mips/include/asm/mach-ip32/mangle-port.h
@@ -17,10 +17,10 @@
# define ioswabb(a, x) (x)
# define __mem_ioswabb(a, x) (x)
# define ioswabw(a, x) (x)
-# define __mem_ioswabw(a, x) cpu_to_le16(x)
+# define __mem_ioswabw(a, x) ((__force u16)cpu_to_le16(x))
# define ioswabl(a, x) (x)
-# define __mem_ioswabl(a, x) cpu_to_le32(x)
+# define __mem_ioswabl(a, x) ((__force u32)cpu_to_le32(x))
# define ioswabq(a, x) (x)
-# define __mem_ioswabq(a, x) cpu_to_le64(x)
+# define __mem_ioswabq(a, x) ((__force u64)cpu_to_le64(x))
#endif /* __ASM_MACH_IP32_MANGLE_PORT_H */
diff --git a/arch/mips/include/asm/mach-tx39xx/mangle-port.h b/arch/mips/include/asm/mach-tx39xx/mangle-port.h
index ab7a70bd895e..95be459950f7 100644
--- a/arch/mips/include/asm/mach-tx39xx/mangle-port.h
+++ b/arch/mips/include/asm/mach-tx39xx/mangle-port.h
@@ -14,11 +14,11 @@ extern unsigned long (*__swizzle_addr_b)(unsigned long port);
#define ioswabb(a, x) (x)
#define __mem_ioswabb(a, x) (x)
-#define ioswabw(a, x) le16_to_cpu(x)
+#define ioswabw(a, x) le16_to_cpu((__force __le16)(x))
#define __mem_ioswabw(a, x) (x)
-#define ioswabl(a, x) le32_to_cpu(x)
+#define ioswabl(a, x) le32_to_cpu((__force __le32)(x))
#define __mem_ioswabl(a, x) (x)
-#define ioswabq(a, x) le64_to_cpu(x)
+#define ioswabq(a, x) le64_to_cpu((__force __le64)(x))
#define __mem_ioswabq(a, x) (x)
#endif /* __ASM_MACH_TX39XX_MANGLE_PORT_H */
diff --git a/arch/mips/include/asm/mach-tx49xx/mangle-port.h b/arch/mips/include/asm/mach-tx49xx/mangle-port.h
index e061ef38fb5f..98c7abf4484a 100644
--- a/arch/mips/include/asm/mach-tx49xx/mangle-port.h
+++ b/arch/mips/include/asm/mach-tx49xx/mangle-port.h
@@ -16,12 +16,12 @@
extern u16 (*ioswabw)(volatile u16 *a, u16 x);
extern u16 (*__mem_ioswabw)(volatile u16 *a, u16 x);
#else
-#define ioswabw(a, x) le16_to_cpu(x)
+#define ioswabw(a, x) le16_to_cpu((__force __le16)(x))
#define __mem_ioswabw(a, x) (x)
#endif
-#define ioswabl(a, x) le32_to_cpu(x)
+#define ioswabl(a, x) le32_to_cpu((__force __le32)(x))
#define __mem_ioswabl(a, x) (x)
-#define ioswabq(a, x) le64_to_cpu(x)
+#define ioswabq(a, x) le64_to_cpu((__force __le64)(x))
#define __mem_ioswabq(a, x) (x)
#endif /* __ASM_MACH_TX49XX_MANGLE_PORT_H */
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH mips-next 3/3] MIPS: checksum: fix sparse flooding on asm/checksum.h
2020-06-20 9:33 [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 1/3] MIPS: generic/ip32: io: fix __mem_ioswabq() Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 2/3] MIPS: io: fix sparse flood on asm/io.h Alexander Lobakin
@ 2020-06-20 9:35 ` Alexander Lobakin
2020-06-25 9:40 ` [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Thomas Bogendoerfer
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Lobakin @ 2020-06-20 9:35 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Alexandre Belloni, Paul Burton, Alexander Lobakin, linux-mips,
linux-kernel
csum_fold() in MIPS' asm/checksum.h is another source of sparse flooding
when building different networking source code.
The thing is that only half of __wsum <--> u32 casts inside the funtion
is forced, which is insufficient.
Add all necessary forced typecasting to stop floods and simplify actual
bug hunting.
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
arch/mips/include/asm/checksum.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h
index dcebaaf8c862..181f7d14efb9 100644
--- a/arch/mips/include/asm/checksum.h
+++ b/arch/mips/include/asm/checksum.h
@@ -113,9 +113,9 @@ static inline __sum16 csum_fold(__wsum csum)
u32 sum = (__force u32)csum;
sum += (sum << 16);
- csum = (sum < csum);
+ csum = (__force __wsum)(sum < (__force u32)csum);
sum >>= 16;
- sum += csum;
+ sum += (__force u32)csum;
return (__force __sum16)~sum;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods
2020-06-20 9:33 [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Alexander Lobakin
` (2 preceding siblings ...)
2020-06-20 9:35 ` [PATCH mips-next 3/3] MIPS: checksum: fix sparse flooding on asm/checksum.h Alexander Lobakin
@ 2020-06-25 9:40 ` Thomas Bogendoerfer
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Bogendoerfer @ 2020-06-25 9:40 UTC (permalink / raw)
To: Alexander Lobakin
Cc: Alexandre Belloni, Paul Burton, linux-mips, linux-kernel
On Sat, Jun 20, 2020 at 09:33:38AM +0000, Alexander Lobakin wrote:
> This set addresses the two most annoying sparse floods when building the
> tree with C={1,2}: one in asm/io.h (in several mangle-port.h actually),
> and one in asm/checksum.h.
> Both of these comes from lack of forced typecasting and hence harmless,
> but complicates real bug hunting, as asm/io.h is included in almost
> every driver, while asm/checksum.h is included in lots of networking
> code.
>
> I also fixed two wrong __mem_ioswabq() macros while was nearby.
> Tested on Generic MIPS platform -- no more flooding in console (there's
> one more source in mips-cm.h, but it's included in just a few files, so
> not a real problem. It can be issued separately anyway), while objdump
> doesn't see any difference at all.
>
> Alexander Lobakin (3):
> MIPS: generic/ip32: io: fix __mem_ioswabq()
> MIPS: io: fix sparse flood on asm/io.h
> MIPS: checksum: fix sparse flooding on asm/checksum.h
>
> arch/mips/include/asm/checksum.h | 4 ++--
> .../include/asm/mach-cavium-octeon/mangle-port.h | 12 +++++++++---
> arch/mips/include/asm/mach-generic/mangle-port.h | 12 ++++++------
> arch/mips/include/asm/mach-ip27/mangle-port.h | 6 +++---
> arch/mips/include/asm/mach-ip30/mangle-port.h | 6 +++---
> arch/mips/include/asm/mach-ip32/mangle-port.h | 6 +++---
> arch/mips/include/asm/mach-tx39xx/mangle-port.h | 6 +++---
> arch/mips/include/asm/mach-tx49xx/mangle-port.h | 6 +++---
> 8 files changed, 32 insertions(+), 26 deletions(-)
series applied to mips-next.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-25 9:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-20 9:33 [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 1/3] MIPS: generic/ip32: io: fix __mem_ioswabq() Alexander Lobakin
2020-06-20 9:34 ` [PATCH mips-next 2/3] MIPS: io: fix sparse flood on asm/io.h Alexander Lobakin
2020-06-20 9:35 ` [PATCH mips-next 3/3] MIPS: checksum: fix sparse flooding on asm/checksum.h Alexander Lobakin
2020-06-25 9:40 ` [PATCH mips-next 0/3] MIPS: fix the two most annoying sparse floods Thomas Bogendoerfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).