[FIX] kernel: Fix build with Clang-12 for tokens introducing statement expression

[AndyLavr]

From 0c5c040ef92430c4aa401e3ec380ae6aed8ce81c Sat, 29 Aug 2020 13:20:18 +0300
From: Andy Lavr <andy.lavr@gmail.com>
Date: Sat, 29 Aug 2020 12:05:22 +0300
Subject: [PATCH] kernel: Fix build all error for tokens introducing statement expression


One of the many build errors:

include/linux/dcache.h:511:9: error: '(' and '{' tokens introducing
statement expression are separated by whitespace
[-Werror,-Wcompound-token-split-by-space]
return mult_frac(val, sysctl_vfs_cache_pressure, 100);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

include/linux/kernel.h:161:35: note: expanded from macro 'mult_frac'
#define mult_frac(x, numer, denom)(                     \
                                  ^~~~~~~~~~~~~~~~~~~~~~~


Signed-off-by: Andy Lavr <andy.lavr@gmail.com>
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 9d44632..7b273e1 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -46,12 +46,10 @@
  */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
 
-#define u64_to_user_ptr(x) (           \
-{                                      \
+#define u64_to_user_ptr(x) ({          \
        typecheck(u64, (x));            \
        (void __user *)(uintptr_t)(x);  \
-}                                      \
-)
+})
 
 /*
  * This looks more complex than it should be. But we need to
@@ -60,6 +58,7 @@
  * arguments just once each.
  */
 #define __round_mask(x, y) ((__typeof__(x))((y)-1))
+
 /**
  * round_up - round up to next specified power of 2
  * @x: the value to round
@@ -69,6 +68,7 @@
  * To perform arbitrary rounding up, use roundup() below.
  */
 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
+
 /**
  * round_down - round down to next specified power of 2
  * @x: the value to round
@@ -103,12 +103,11 @@
  * Rounds @x up to next multiple of @y. If @y will always be a power
  * of 2, consider using the faster round_up().
  */
-#define roundup(x, y) (                                        \
-{                                                      \
+#define roundup(x, y) ({                               \
        typeof(y) __y = y;                              \
        (((x) + (__y - 1)) / __y) * __y;                \
-}                                                      \
-)
+})
+
 /**
  * rounddown - round down to next specified multiple
  * @x: the value to round
@@ -117,12 +116,10 @@
  * Rounds @x down to next multiple of @y. If @y will always be a power
  * of 2, consider using the faster round_down().
  */
-#define rounddown(x, y) (                              \
-{                                                      \
+#define rounddown(x, y) ({                             \
        typeof(x) __x = (x);                            \
        __x - (__x % (y));                              \
-}                                                      \
-)
+})
 
 /*
  * Divide positive or negative dividend by positive or negative divisor
@@ -130,8 +127,7 @@
  * divisors if the dividend variable type is unsigned and for negative
  * dividends if the divisor variable type is unsigned.
  */
-#define DIV_ROUND_CLOSEST(x, divisor)(                 \
-{                                                      \
+#define DIV_ROUND_CLOSEST(x, divisor) ({               \
        typeof(x) __x = x;                              \
        typeof(divisor) __d = divisor;                  \
        (((typeof(x))-1) > 0 ||                         \
@@ -139,33 +135,28 @@
         (((__x) > 0) == ((__d) > 0))) ?                \
                (((__x) + ((__d) / 2)) / (__d)) :       \
                (((__x) - ((__d) / 2)) / (__d));        \
-}                                                      \
-)
+})
+
 /*
  * Same as above but for u64 dividends. divisor must be a 32-bit
  * number.
  */
-#define DIV_ROUND_CLOSEST_ULL(x, divisor)(             \
-{                                                      \
+#define DIV_ROUND_CLOSEST_ULL(x, divisor) ({           \
        typeof(divisor) __d = divisor;                  \
        unsigned long long _tmp = (x) + (__d) / 2;      \
        do_div(_tmp, __d);                              \
        _tmp;                                           \
-}                                                      \
-)
+})
 
 /*
  * Multiplies an integer by a fraction, while avoiding unnecessary
  * overflow or loss of precision.
  */
-#define mult_frac(x, numer, denom)(                    \
-{                                                      \
+#define mult_frac(x, numer, denom) ({                  \
        typeof(x) quot = (x) / (denom);                 \
        typeof(x) rem  = (x) % (denom);                 \
        (quot * (numer)) + ((rem * (numer)) / (denom)); \
-}                                                      \
-)
-
+})
 
 #define _RET_IP_               (unsigned long)__builtin_return_address(0)
 #define _THIS_IP_  ({ __label__ __here; __here: (unsigned long)&&__here; })
@@ -218,6 +209,7 @@
  */
 # define might_sleep() \
        do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
+
 /**
  * cant_sleep - annotation for functions that cannot sleep
  *
@@ -226,6 +218,7 @@
 # define cant_sleep() \
        do { __cant_sleep(__FILE__, __LINE__, 0); } while (0)
 # define sched_annotate_sleep()        (current->task_state_change = 0)
+
 /**
  * non_block_start - annotate the start of section where sleeping is prohibited
  *
@@ -237,6 +230,7 @@
  * issues.
  */
 # define non_block_start() (current->non_block_count++)
+
 /**
  * non_block_end - annotate the end of section where sleeping is prohibited
  *

[nathanchance]

Are you planning on splitting these up into individual patches and sending them off upstream (since I doubt that a monolithic patch like this would not be accepted)? Or were you just reporting it so that others can take care of it?

[AndyLavr]

You can send on your own behalf, the procedure for accepting patches to upstream is very annoying for me. )

[nathanchance]

Sure, thanks for the heads up and pointing out these instances! I will send patches for these with some reported-by credits (if you are okay with that) either tomorrow or Monday.

[AndyLavr]

It's okay, do it.

[AndyLavr]

Another header:

From 78f7c915ec3befa6565a02d16fd9986e9914407d Mon, 31 Aug 2020 15:34:08 +0300
From: Andy Lavr <andy.lavr@gmail.com>
Date: Mon, 31 Aug 2020 15:14:01 +0300
Subject: [PATCH] uapi: Fix build all warning for tokens introducing statement expression


Signed-off-by: Andy Lavr <andy.lavr@gmail.com>
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 93096e52..bf7b412 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -572,26 +572,22 @@
 #define DM_MAPIO_DELAY_REQUEUE DM_ENDIO_DELAY_REQUEUE
 #define DM_MAPIO_KILL          4
 
-#define dm_sector_div64(x, y)( \
-{ \
+#define dm_sector_div64(x, y) ({ \
        u64 _res; \
        (x) = div64_u64_rem(x, y, &_res); \
        _res; \
-} \
-)
+})
 
 /*
  * Ceiling(n / sz)
  */
 #define dm_div_up(n, sz) (((n) + (sz) - 1) / (sz))
 
-#define dm_sector_div_up(n, sz) ( \
-{ \
+#define dm_sector_div_up(n, sz) ({ \
        sector_t _r = ((n) + (sz) - 1); \
        sector_div(_r, (sz)); \
        _r; \
-} \
-)
+})
 
 /*
  * ceiling(n / size) * size
diff --git a/include/uapi/linux/byteorder/big_endian.h b/include/uapi/linux/byteorder/big_endian.h
index 2199adc..a9ed15f 100644
--- a/include/uapi/linux/byteorder/big_endian.h
+++ b/include/uapi/linux/byteorder/big_endian.h
@@ -12,34 +12,34 @@
 #include <linux/types.h>
 #include <linux/swab.h>
 
-#define __constant_htonl(x) ((__force __be32)(__u32)(x))
-#define __constant_ntohl(x) ((__force __u32)(__be32)(x))
-#define __constant_htons(x) ((__force __be16)(__u16)(x))
-#define __constant_ntohs(x) ((__force __u16)(__be16)(x))
-#define __constant_cpu_to_le64(x) ((__force __le64)___constant_swab64((x)))
-#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64)(__le64)(x))
-#define __constant_cpu_to_le32(x) ((__force __le32)___constant_swab32((x)))
-#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32)(__le32)(x))
-#define __constant_cpu_to_le16(x) ((__force __le16)___constant_swab16((x)))
-#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16)(__le16)(x))
-#define __constant_cpu_to_be64(x) ((__force __be64)(__u64)(x))
-#define __constant_be64_to_cpu(x) ((__force __u64)(__be64)(x))
-#define __constant_cpu_to_be32(x) ((__force __be32)(__u32)(x))
-#define __constant_be32_to_cpu(x) ((__force __u32)(__be32)(x))
-#define __constant_cpu_to_be16(x) ((__force __be16)(__u16)(x))
-#define __constant_be16_to_cpu(x) ((__force __u16)(__be16)(x))
-#define __cpu_to_le64(x) ((__force __le64)__swab64((x)))
-#define __le64_to_cpu(x) __swab64((__force __u64)(__le64)(x))
-#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
-#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
-#define __cpu_to_le16(x) ((__force __le16)__swab16((x)))
-#define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
-#define __cpu_to_be64(x) ((__force __be64)(__u64)(x))
-#define __be64_to_cpu(x) ((__force __u64)(__be64)(x))
-#define __cpu_to_be32(x) ((__force __be32)(__u32)(x))
-#define __be32_to_cpu(x) ((__force __u32)(__be32)(x))
-#define __cpu_to_be16(x) ((__force __be16)(__u16)(x))
-#define __be16_to_cpu(x) ((__force __u16)(__be16)(x))
+#define __constant_htonl(x) ((__force __be32) (__u32) (x))
+#define __constant_ntohl(x) ((__force __u32) (__be32) (x))
+#define __constant_htons(x) ((__force __be16) (__u16) (x))
+#define __constant_ntohs(x) ((__force __u16) (__be16) (x))
+#define __constant_cpu_to_le64(x) ((__force __le64) ___constant_swab64((x)))
+#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64) (__le64) (x))
+#define __constant_cpu_to_le32(x) ((__force __le32) ___constant_swab32((x)))
+#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32) (__le32) (x))
+#define __constant_cpu_to_le16(x) ((__force __le16) ___constant_swab16((x)))
+#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16) (__le16) (x))
+#define __constant_cpu_to_be64(x) ((__force __be64) (__u64) (x))
+#define __constant_be64_to_cpu(x) ((__force __u64) (__be64) (x))
+#define __constant_cpu_to_be32(x) ((__force __be32) (__u32) (x))
+#define __constant_be32_to_cpu(x) ((__force __u32) (__be32) (x))
+#define __constant_cpu_to_be16(x) ((__force __be16) (__u16) (x))
+#define __constant_be16_to_cpu(x) ((__force __u16) (__be16) (x))
+#define __cpu_to_le64(x) ((__force __le64) __swab64((x)))
+#define __le64_to_cpu(x) __swab64((__force __u64) (__le64) (x))
+#define __cpu_to_le32(x) ((__force __le32) __swab32((x)))
+#define __le32_to_cpu(x) __swab32((__force __u32) (__le32) (x))
+#define __cpu_to_le16(x) ((__force __le16) __swab16((x)))
+#define __le16_to_cpu(x) __swab16((__force __u16) (__le16) (x))
+#define __cpu_to_be64(x) ((__force __be64) (__u64) (x))
+#define __be64_to_cpu(x) ((__force __u64) (__be64) (x))
+#define __cpu_to_be32(x) ((__force __be32) (__u32) (x))
+#define __be32_to_cpu(x) ((__force __u32) (__be32) (x))
+#define __cpu_to_be16(x) ((__force __be16) (__u16) (x))
+#define __be16_to_cpu(x) ((__force __u16) (__be16) (x))
 
 static __always_inline __le64 __cpu_to_le64p(const __u64 *p)
 {
@@ -95,12 +95,12 @@
 #define __le32_to_cpus(x) __swab32s((x))
 #define __cpu_to_le16s(x) __swab16s((x))
 #define __le16_to_cpus(x) __swab16s((x))
-#define __cpu_to_be64s(x) do { (void)(x); } while (0)
-#define __be64_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be32s(x) do { (void)(x); } while (0)
-#define __be32_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be16s(x) do { (void)(x); } while (0)
-#define __be16_to_cpus(x) do { (void)(x); } while (0)
+#define __cpu_to_be64s(x) do { (void) (x); } while (0)
+#define __be64_to_cpus(x) do { (void) (x); } while (0)
+#define __cpu_to_be32s(x) do { (void) (x); } while (0)
+#define __be32_to_cpus(x) do { (void) (x); } while (0)
+#define __cpu_to_be16s(x) do { (void) (x); } while (0)
+#define __be16_to_cpus(x) do { (void) (x); } while (0)
 
 
 #endif /* _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H */
diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
index 601c904..375a4cf 100644
--- a/include/uapi/linux/byteorder/little_endian.h
+++ b/include/uapi/linux/byteorder/little_endian.h
@@ -12,34 +12,34 @@
 #include <linux/types.h>
 #include <linux/swab.h>
 
-#define __constant_htonl(x) ((__force __be32)___constant_swab32((x)))
-#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x))
-#define __constant_htons(x) ((__force __be16)___constant_swab16((x)))
-#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x))
-#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x))
-#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x))
-#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x))
-#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x))
-#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x))
-#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x))
-#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x)))
-#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x))
-#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x)))
-#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x))
-#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x)))
-#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x))
-#define __cpu_to_le64(x) ((__force __le64)(__u64)(x))
-#define __le64_to_cpu(x) ((__force __u64)(__le64)(x))
-#define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
-#define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
-#define __cpu_to_le16(x) ((__force __le16)(__u16)(x))
-#define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
-#define __cpu_to_be64(x) ((__force __be64)__swab64((x)))
-#define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x))
-#define __cpu_to_be32(x) ((__force __be32)__swab32((x)))
-#define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x))
-#define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
-#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
+#define __constant_htonl(x) ((__force __be32) ___constant_swab32((x)))
+#define __constant_ntohl(x) ___constant_swab32((__force __be32) (x))
+#define __constant_htons(x) ((__force __be16) ___constant_swab16((x)))
+#define __constant_ntohs(x) ___constant_swab16((__force __be16) (x))
+#define __constant_cpu_to_le64(x) ((__force __le64) (__u64) (x))
+#define __constant_le64_to_cpu(x) ((__force __u64) (__le64) (x))
+#define __constant_cpu_to_le32(x) ((__force __le32) (__u32) (x))
+#define __constant_le32_to_cpu(x) ((__force __u32) (__le32) (x))
+#define __constant_cpu_to_le16(x) ((__force __le16) (__u16) (x))
+#define __constant_le16_to_cpu(x) ((__force __u16) (__le16) (x))
+#define __constant_cpu_to_be64(x) ((__force __be64) ___constant_swab64((x)))
+#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64) (__be64) (x))
+#define __constant_cpu_to_be32(x) ((__force __be32) ___constant_swab32((x)))
+#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32) (__be32) (x))
+#define __constant_cpu_to_be16(x) ((__force __be16) ___constant_swab16((x)))
+#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16) (__be16) (x))
+#define __cpu_to_le64(x) ((__force __le64) (__u64) (x))
+#define __le64_to_cpu(x) ((__force __u64) (__le64) (x))
+#define __cpu_to_le32(x) ((__force __le32) (__u32) (x))
+#define __le32_to_cpu(x) ((__force __u32) (__le32) (x))
+#define __cpu_to_le16(x) ((__force __le16) (__u16) (x))
+#define __le16_to_cpu(x) ((__force __u16) (__le16) (x))
+#define __cpu_to_be64(x) ((__force __be64) __swab64((x)))
+#define __be64_to_cpu(x) __swab64((__force __u64) (__be64) (x))
+#define __cpu_to_be32(x) ((__force __be32) __swab32((x)))
+#define __be32_to_cpu(x) __swab32((__force __u32) (__be32) (x))
+#define __cpu_to_be16(x) ((__force __be16) __swab16((x)))
+#define __be16_to_cpu(x) __swab16((__force __u16) (__be16) (x))
 
 static __always_inline __le64 __cpu_to_le64p(const __u64 *p)
 {
@@ -89,12 +89,12 @@
 {
        return __swab16p((__u16 *)p);
 }
-#define __cpu_to_le64s(x) do { (void)(x); } while (0)
-#define __le64_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_le32s(x) do { (void)(x); } while (0)
-#define __le32_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_le16s(x) do { (void)(x); } while (0)
-#define __le16_to_cpus(x) do { (void)(x); } while (0)
+#define __cpu_to_le64s(x) do { (void) (x); } while (0)
+#define __le64_to_cpus(x) do { (void) (x); } while (0)
+#define __cpu_to_le32s(x) do { (void) (x); } while (0)
+#define __le32_to_cpus(x) do { (void) (x); } while (0)
+#define __cpu_to_le16s(x) do { (void) (x); } while (0)
+#define __le16_to_cpus(x) do { (void) (x); } while (0)
 #define __cpu_to_be64s(x) __swab64s((x))
 #define __be64_to_cpus(x) __swab64s((x))
 #define __cpu_to_be32s(x) __swab32s((x))

[nathanchance]

I do not believe this is going to be much of an issue anymore but I am going to do a set of builds tonight to see: llvm/llvm-project@0da8453

Might still be worth fixing these eventually but I do not think I have seen any actual bugs from these warnings so far so it just seems like noise and if the warnings are no longer present in a default kernel build, I am not going to bother sending the patches since white space changes seem to be received rather poorly.

[AndyLavr]

Another header:

From 5c0d44a905fe079ab843e7fe08f1517ae78ccb79 Tue, 1 Sep 2020 08:49:44 +0300
From: Andy Lavr <andy.lavr@gmail.com>
Date: Tue, 1 Sep 2020 08:49:23 +0300
marvell: Fix build all warning for tokens introducing statement expression

Signed-off-by: Andy Lavr <andy.lavr@gmail.com>
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index d9f8bdb..ee073a0 100644
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -513,10 +513,11 @@
 
 #define RF_ANTENNA_AUTO                 0xFFFF
 
-#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) {   \
-       (((seq) & 0x00ff) |                             \
-        (((num) & 0x000f) << 8)) |                     \
-       (((type) & 0x000f) << 12);                  }
+#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) ({         \
+       (((seq) & 0x00ff) |                                     \
+        (((num) & 0x000f) << 8)) |                             \
+       (((type) & 0x000f) << 12);                              \
+})
 
 #define HostCmd_GET_SEQ_NO(seq)       \
        ((seq) & HostCmd_SEQ_NUM_MASK)

[AndyLavr]

I am not going to bother sending the patches since white space changes seem to be received rather poorly.

I indifferently who wants to fix it self.