squashfs: Fix compilation on big endian systems
PATCH 1/1 squashfs: Fix compilation on big endian systems
--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
fs/squashfs/sqfs.c +1 -2
@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h>
fs/squashfs/sqfs_dir.c +1 -2
@@ -7,8 +7,7 @@#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h>
Signature · 1 line
2.20.1
Hi Pali,
[email protected] wrote on Wed, 6 Apr 2022 23:31:53 +0200:
Would you mind explaining a little bit how this change fixes it? It does not look straightforward to me.
Quoted 25 lines
Signed-off-by Pali Rohár <[email protected]>--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)fs/squashfs/sqfs.c +1
-2@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h> fs/squashfs/sqfs_dir.c +0
-0
fs/squashfs/sqfs_dir.c line 13
Quoted 9 lines
fs/squashfs/sqfs_dir.c +1
-2@@ -7,8 +7,7 @@#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h>
Cheers,
Miquèl
Quoted 6 lines · On Thursday 07 April 2022 09:54:21 Miquel Raynal wrote:
Hi Pali,
[email protected] wrote on Wed, 6 Apr 2022 23:31:53 +0200:
Would you mind explaining a little bit how this change fixes it? It does not look straightforward to me.
Yes! I though that it is straightforward this change... byteorder/little_endian.h defines cpu_to_le* macros for Little Endian systems and byteorder/big_endian.h for Big Endian systems.
File asm/byteorder.h is then ARCH-specific and implements macros for the current architecture (by including the correct header file).
So currently if you try to compile squashfs for big endian systems you get compile error:
In file included from ./arch/powerpc/include/asm/byteorder.h:82,
from include/linux/unaligned/access_ok.h:4,
from ./arch/powerpc/include/asm/unaligned.h:9,
from fs/squashfs/sqfs_filesystem.h:11,
from fs/squashfs/sqfs_dir.c:16: include/linux/byteorder/big_endian.h:34: warning: "__cpu_to_le32" redefined
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
In file included from fs/squashfs/sqfs_dir.c:10:
include/linux/byteorder/little_endian.h:34: note: this is the location of the previous definition
#define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
Or:
In file included from fs/squashfs/sqfs.c:14:
include/linux/byteorder/little_endian.h:89:21: error: redefinition of ‘__be16_to_cpup’
static inline __u16 __be16_to_cpup(const __be16 *p)
^~~~~~~~~~~~~~
In file included from ./arch/powerpc/include/asm/byteorder.h:82,
from include/linux/unaligned/access_ok.h:4,
from ./arch/powerpc/include/asm/unaligned.h:9,
from fs/squashfs/sqfs.c:10:
include/linux/byteorder/big_endian.h:89:21: note: previous definition of ‘__be16_to_cpup’ was here
static inline __u16 __be16_to_cpup(const __be16 *p)
^~~~~~~~~~~~~~As some header files include correct asm/byteorder.h file and this squashfs includes additional little_endian.h.
Quoted 37 lines
Quoted 25 lines
Signed-off-by Pali Rohár <[email protected]>--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)fs/squashfs/sqfs.c +1
-2@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h> fs/squashfs/sqfs_dir.c +0
-0fs/squashfs/sqfs_dir.c line 13
Quoted 9 lines
fs/squashfs/sqfs_dir.c +1
-2@@ -7,8 +7,7 @@#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> Cheers,
Miquèl
Hi Pali,
[email protected] wrote on Thu, 7 Apr 2022 11:41:59 +0200:
Quoted 44 lines · On Thursday 07 April 2022 09:54:21 Miquel Raynal wrote:
Quoted 6 lines
Hi Pali,
[email protected] wrote on Wed, 6 Apr 2022 23:31:53 +0200:
Would you mind explaining a little bit how this change fixes it? It does not look straightforward to me.
Yes! I though that it is straightforward this change...
byteorder/little_endian.hdefines cpu_to_le* macros for Little Endian systems andbyteorder/big_endian.hfor Big Endian systems.File
asm/byteorder.his then ARCH-specific and implements macros for the current architecture (by including the correct header file).So currently if you try to compile squashfs for big endian systems you get compile error:
In file included from
./arch/powerpc/include/asm/byteorder.h:82,from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs_filesystem.h:11, from fs/squashfs/sqfs_dir.c:16:
include/linux/byteorder/big_endian.h:34: warning: "__cpu_to_le32" redefined
#define__cpu_to_le32(x)((__force__le32)__swab32((x)))In file included from
fs/squashfs/sqfs_dir.c:10:
include/linux/byteorder/little_endian.h:34: note: this is the location of the previous definition
#define__cpu_to_le32(x)((__force__le32)(__u32)(x))Or:
In file included from
fs/squashfs/sqfs.c:14:
include/linux/byteorder/little_endian.h:89:21: error: redefinition of ‘__be16_to_cpup’
static inline__u16__be16_to_cpup(const __be16 *p)^~~~~~~~~~~~~~ In file included from ./arch/powerpc/include/asm/byteorder.h:82, from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs.c:10: include/linux/byteorder/big_endian.h:89:21: note: previous definition of ‘__be16_to_cpup’ was here static inline __u16 __be16_to_cpup(const __be16 *p) ^~~~~~~~~~~~~~
Quoted 2 lines
As some header files include correct
asm/byteorder.hfile and this squashfs includes additionallittle_endian.h.
Great, thanks for the thorough explanation. Based on what you said, wouldn't it be cleaner to just get rid of the little_endian.h include rather than also use the ARCH specific byteorder.h header?
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Signed-off-by Pali Rohár <[email protected]>--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)fs/squashfs/sqfs.c +1
-2@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h> fs/squashfs/sqfs_dir.c +0
-0@@ -7,8 +7,7 @@
Quoted 11 lines
Quoted 11 lines
fs/squashfs/sqfs_dir.c line 13
Quoted 8 lines
fs/squashfs/sqfs_dir.c +1
-2#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> Cheers,
Miquèl
Thanks,
Miquèl
Quoted 48 lines · On Thursday 07 April 2022 11:54:55 Miquel Raynal wrote:
Hi Pali,
[email protected] wrote on Thu, 7 Apr 2022 11:41:59 +0200:
Quoted 44 lines · On Thursday 07 April 2022 09:54:21 Miquel Raynal wrote:
Quoted 6 lines
Hi Pali,
[email protected] wrote on Wed, 6 Apr 2022 23:31:53 +0200:
Would you mind explaining a little bit how this change fixes it? It does not look straightforward to me.
Yes! I though that it is straightforward this change...
byteorder/little_endian.hdefines cpu_to_le* macros for Little Endian systems andbyteorder/big_endian.hfor Big Endian systems.File
asm/byteorder.his then ARCH-specific and implements macros for the current architecture (by including the correct header file).So currently if you try to compile squashfs for big endian systems you get compile error:
In file included from
./arch/powerpc/include/asm/byteorder.h:82,from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs_filesystem.h:11, from fs/squashfs/sqfs_dir.c:16:
include/linux/byteorder/big_endian.h:34: warning: "__cpu_to_le32" redefined
#define__cpu_to_le32(x)((__force__le32)__swab32((x)))In file included from
fs/squashfs/sqfs_dir.c:10:
include/linux/byteorder/little_endian.h:34: note: this is the location of the previous definition
#define__cpu_to_le32(x)((__force__le32)(__u32)(x))Or:
In file included from
fs/squashfs/sqfs.c:14:
include/linux/byteorder/little_endian.h:89:21: error: redefinition of ‘__be16_to_cpup’
static inline__u16__be16_to_cpup(const __be16 *p)^~~~~~~~~~~~~~ In file included from ./arch/powerpc/include/asm/byteorder.h:82, from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs.c:10: include/linux/byteorder/big_endian.h:89:21: note: previous definition of ‘__be16_to_cpup’ was here static inline __u16 __be16_to_cpup(const __be16 *p) ^~~~~~~~~~~~~~
Quoted 6 lines
Quoted 2 lines
As some header files include correct
asm/byteorder.hfile and this squashfs includes additionallittle_endian.h.Great, thanks for the thorough explanation. Based on what you said, wouldn't it be cleaner to just get rid of the
little_endian.hinclude rather than also use the ARCH specificbyteorder.hheader?
I think that this is not possible. squashfs code uses le16_to_cpu() macro and its correct definition is provided only by arch specific asm/byteorder.h.
Quoted 42 lines
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Signed-off-by Pali Rohár <[email protected]>--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)fs/squashfs/sqfs.c +1
-2@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h> fs/squashfs/sqfs_dir.c +0
-0@@ -7,8 +7,7 @@Quoted 11 lines
Quoted 11 lines
fs/squashfs/sqfs_dir.c line 13
Quoted 8 lines
fs/squashfs/sqfs_dir.c +1
-2#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> Cheers,
MiquèlThanks,
Miquèl
Quoted 52 lines · Pali Rohár
Quoted 51 lines · On Thursday 07 April 2022 11:54:55 Miquel Raynal wrote:
Hi Pali,
[email protected] wrote on Thu, 7 Apr 2022 11:41:59 +0200:
Quoted 46 lines · On Thursday 07 April 2022 09:54:21 Miquel Raynal wrote:
Quoted 6 lines
Hi Pali,
[email protected] wrote on Wed, 6 Apr 2022 23:31:53 +0200:
Would you mind explaining a little bit how this change fixes it? It does not look straightforward to me.
Yes! I though that it is straightforward this change...
byteorder/little_endian.hdefines cpu_to_le* macros for Little Endian systems andbyteorder/big_endian.hfor Big Endian systems.File
asm/byteorder.his then ARCH-specific and implements macros for the current architecture (by including the correct header file).So currently if you try to compile squashfs for big endian systems you get compile error:
In file included from
./arch/powerpc/include/asm/byteorder.h:82,from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs_filesystem.h:11, from fs/squashfs/sqfs_dir.c:16:
include/linux/byteorder/big_endian.h:34: warning: "__cpu_to_le32" redefined
#define__cpu_to_le32(x)((__force__le32)__swab32((x)))In file included from
fs/squashfs/sqfs_dir.c:10:
include/linux/byteorder/little_endian.h:34: note: this is the location of the previous definition
#define__cpu_to_le32(x)((__force__le32)(__u32)(x))Or:
In file included from
fs/squashfs/sqfs.c:14:
include/linux/byteorder/little_endian.h:89:21: error: redefinition of ‘__be16_to_cpup’
static inline__u16__be16_to_cpup(const __be16 *p)^~~~~~~~~~~~~~ In file included from ./arch/powerpc/include/asm/byteorder.h:82, from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs.c:10: include/linux/byteorder/big_endian.h:89:21: note: previous definition of ‘__be16_to_cpup’ was here static inline __u16 __be16_to_cpup(const __be16 *p) ^~~~~~~~~~~~~~As some header files include correct
asm/byteorder.hfile and this squashfs includes additionallittle_endian.h.
Quoted 7 lines
Quoted 3 lines
Great, thanks for the thorough explanation. Based on what you said, wouldn't it be cleaner to just get rid of the
little_endian.hinclude rather than also use the ARCH specificbyteorder.hheader?I think that this is not possible. squashfs code uses
le16_to_cpu()macro and its correct definition is provided only by arch specificasm/byteorder.h.
Miquel, is this sufficient explanation? Thanks.
Signature · 1 line
Tom
Miquel Raynal
Reviewed-byHi Tom,
[email protected] wrote on Wed, 1 Jun 2022 10:08:20 -0400:
Quoted 57 lines · Pali Rohár
Quoted 56 lines · On Thursday 07 April 2022 11:54:55 Miquel Raynal wrote:
Quoted 54 lines
Hi Pali,
[email protected] wrote on Thu, 7 Apr 2022 11:41:59 +0200:
Quoted 44 lines · On Thursday 07 April 2022 09:54:21 Miquel Raynal wrote:
Quoted 6 lines
Hi Pali,
[email protected] wrote on Wed, 6 Apr 2022 23:31:53 +0200:
Would you mind explaining a little bit how this change fixes it? It does not look straightforward to me.
Yes! I though that it is straightforward this change...
byteorder/little_endian.hdefines cpu_to_le* macros for Little Endian systems andbyteorder/big_endian.hfor Big Endian systems.File
asm/byteorder.his then ARCH-specific and implements macros for the current architecture (by including the correct header file).So currently if you try to compile squashfs for big endian systems you get compile error:
In file included from
./arch/powerpc/include/asm/byteorder.h:82,from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs_filesystem.h:11, from fs/squashfs/sqfs_dir.c:16:
include/linux/byteorder/big_endian.h:34: warning: "__cpu_to_le32" redefined
#define__cpu_to_le32(x)((__force__le32)__swab32((x)))In file included from
fs/squashfs/sqfs_dir.c:10:
include/linux/byteorder/little_endian.h:34: note: this is the location of the previous definition
#define__cpu_to_le32(x)((__force__le32)(__u32)(x))Or:
In file included from
fs/squashfs/sqfs.c:14:
include/linux/byteorder/little_endian.h:89:21: error: redefinition of ‘__be16_to_cpup’
static inline__u16__be16_to_cpup(const __be16 *p)^~~~~~~~~~~~~~ In file included from ./arch/powerpc/include/asm/byteorder.h:82, from include/linux/unaligned/access_ok.h:4, from ./arch/powerpc/include/asm/unaligned.h:9, from fs/squashfs/sqfs.c:10: include/linux/byteorder/big_endian.h:89:21: note: previous definition of ‘__be16_to_cpup’ was here static inline __u16 __be16_to_cpup(const __be16 *p) ^~~~~~~~~~~~~~Quoted 2 lines
As some header files include correct
asm/byteorder.hfile and this squashfs includes additionallittle_endian.h.Great, thanks for the thorough explanation. Based on what you said, wouldn't it be cleaner to just get rid of the
little_endian.hinclude rather than also use the ARCH specificbyteorder.hheader?
Quoted 5 lines
Quoted 3 lines
I think that this is not possible. squashfs code uses
le16_to_cpu()macro and its correct definition is provided only by arch specificasm/byteorder.h.Miquel, is this sufficient explanation? Thanks.
Yes, sorry, it seems like in U-Boot including the asm header is the way to go, so:
Thanks,
Miquèl
Quoted 37 lines · On Wednesday 06 April 2022 23:31:53 Pali Rohár wrote:
Signed-off-by Pali Rohár <[email protected]>--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)fs/squashfs/sqfs.c +1
-2@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h> fs/squashfs/sqfs_dir.c +1
-2@@ -7,8 +7,7 @@#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> Signature · 1 line
2.20.1
PING?
Quoted 27 lines · On Tuesday 10 May 2022 16:33:56 Pali Rohár wrote:
Quoted 26 lines · On Wednesday 06 April 2022 23:31:53 Pali Rohár wrote:
Signed-off-by Pali Rohár <[email protected]>--- fs/squashfs/sqfs.c | 3 +-- fs/squashfs/sqfs_dir.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)fs/squashfs/sqfs.c +1
-2@@ -11,8 +11,7 @@#include <errno.h> #include <fs.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <memalign.h> #include <stdlib.h> #include <string.h> fs/squashfs/sqfs_dir.c +0
-0@@ -7,8 +7,7 @@
Quoted 13 lines
Quoted 11 lines
fs/squashfs/sqfs_dir.c +1
-2#include <errno.h> #include <linux/types.h> -#include <linux/byteorder/little_endian.h> -#include <linux/byteorder/generic.h> +#include <asm/byteorder.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> Signature · 1 line
2.20.1PING?
PING?
Quoted 2 lines · Pali Rohár
Signed-off-by Pali Rohár <[email protected]>Reviewed-by Miquel Raynal <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom