consolidate the compat fcntl definitions v2
Hi all,
currenty the compat fcnt definitions are duplicate for all compat architectures, and the native fcntl64 definitions aren't even usable from userspace due to a bogus CONFIG_64BIT ifdef. This series tries to sort out all that.
Changes since v1:
- only make the F*64 defines uapi visible for 32-bit architectures
Diffstat:
arch/arm64/include/asm/compat.h | 20 -------------------- arch/mips/include/asm/compat.h | 23 ++--------------------- arch/mips/include/uapi/asm/fcntl.h | 30 +++++------------------------- arch/parisc/include/asm/compat.h | 16 ---------------- arch/powerpc/include/asm/compat.h | 20 -------------------- arch/s390/include/asm/compat.h | 20 -------------------- arch/sparc/include/asm/compat.h | 22 +--------------------- arch/x86/include/asm/compat.h | 24 +++--------------------- include/linux/compat.h | 31 +++++++++++++++++++++++++++++++ include/uapi/asm-generic/fcntl.h | 23 +++++++++-------------- tools/include/uapi/asm-generic/fcntl.h | 21 +++++++-------------- 11 files changed, 58 insertions(+), 192 deletions(-)
PATCH 1/5 uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
--- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-)
include/uapi/asm-generic/fcntl.h +0 -2
@@ -207,7 +207,6 @@ struct flock { };#endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD#define __ARCH_FLOCK64_PAD#endif
@@ -220,6 +219,5 @@ struct flock64 {__kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */
tools/include/uapi/asm-generic/fcntl.h +0 -2
@@ -202,7 +202,6 @@ struct flock { };#endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD#define __ARCH_FLOCK64_PAD#endif
@@ -215,6 +214,5 @@ struct flock64 {__kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */
Signature · 1 line
2.30.2
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Quoted 48 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-)include/uapi/asm-generic/fcntl.h +0
-2@@ -207,7 +207,6 @@ struct flock { };#endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD#define __ARCH_FLOCK64_PAD#endif @@ -220,6 +219,5 @@ struct flock64 {__kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ tools/include/uapi/asm-generic/fcntl.h +0
-3@@ -202,7 +202,6 @@ struct flock { };#endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD#define __ARCH_FLOCK64_PAD#endif @@ -215,6 +214,5 @@ struct flock64 {__kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ --2.30.2
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
In reply to Christoph HellwigThis patch should be:
include/uapi/asm-generic/fcntl.h +5 -9
@@ -193,32 +193,28 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD -};#endif - -#ifndef HAVE_ARCH_STRUCT_FLOCK64 -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +}#endif +#ifndef HAVE_ARCH_STRUCT_FLOCK64 struct flock64 {short l_type;short l_whence;__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD __ARCH_FLOCK64_PAD +#endif };
Right?
Seems you've based on an old tree, right?
Quoted 48 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-)include/uapi/asm-generic/fcntl.h +0
-2@@ -207,7 +207,6 @@ struct flock { };#endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD#define __ARCH_FLOCK64_PAD#endif @@ -220,6 +219,5 @@ struct flock64 {__kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ tools/include/uapi/asm-generic/fcntl.h +0
-3@@ -202,7 +202,6 @@ struct flock { };#endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD#define __ARCH_FLOCK64_PAD#endif @@ -215,6 +214,5 @@ struct flock64 {__kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ --2.30.2
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Quoted 3 lines · Guo Ren
Right?
Seems you've based on an old tree, right?
This was a fairly recent Linus tree. I don't have the tree at hand right now due to travel, but what changed there recently?
PATCH 2/5 uapi: simplify __ARCH_FLOCK{,64}_PAD a little
In reply to Christoph HellwigDon't bother to define the symbols empty, just don't use them. That makes the intent a little more clear.
--- include/uapi/asm-generic/fcntl.h | 12 ++++-------- tools/include/uapi/asm-generic/fcntl.h | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-)
include/uapi/asm-generic/fcntl.h +4 -8
@@ -193,22 +193,16 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD -};#endif - -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +};#endif struct flock64 {
@@ -217,7 +211,9 @@ struct flock64 {__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD__ARCH_FLOCK64_PAD +#endif };#endif /* _ASM_GENERIC_FCNTL_H */
tools/include/uapi/asm-generic/fcntl.h +4 -8
@@ -188,22 +188,16 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD -};#endif - -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +};#endif struct flock64 {
@@ -212,7 +206,9 @@ struct flock64 {__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD__ARCH_FLOCK64_PAD +#endif };#endif /* _ASM_GENERIC_FCNTL_H */
Signature · 1 line
2.30.2
Re: [PATCH 2/5] uapi: simplify __ARCH_FLOCK{,64}_PAD a little
Quoted 89 lines · Christoph Hellwig
Don't bother to define the symbols empty, just don't use them. That makes the intent a little more clear.
Signed-off-by Christoph Hellwig <[email protected]>--- include/uapi/asm-generic/fcntl.h | 12 ++++-------- tools/include/uapi/asm-generic/fcntl.h | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-)include/uapi/asm-generic/fcntl.h +4
-8@@ -193,22 +193,16 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD -};#endif - -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +};#endif struct flock64 {@@ -217,7 +211,9 @@ struct flock64 {__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD__ARCH_FLOCK64_PAD +#endif };#endif /* _ASM_GENERIC_FCNTL_H */ tools/include/uapi/asm-generic/fcntl.h +4
-9@@ -188,22 +188,16 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD -};#endif - -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +};#endif struct flock64 {@@ -212,7 +206,9 @@ struct flock64 {__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD__ARCH_FLOCK64_PAD +#endif };#endif /* _ASM_GENERIC_FCNTL_H */ --
Quoted 2 lines
2.30.2
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
PATCH 3/5 uapi: merge the 32-bit mips struct flock into the generic one
In reply to Christoph HellwigAdd a new __ARCH_FLOCK_EXTRA_SYSID macro following the style of __ARCH_FLOCK_PAD to avoid having a separate definition just for one architecture.
--- arch/mips/include/uapi/asm/fcntl.h | 26 +++----------------------- include/uapi/asm-generic/fcntl.h | 5 +++-- tools/include/uapi/asm-generic/fcntl.h | 5 +++-- 3 files changed, 9 insertions(+), 27 deletions(-)
arch/mips/include/uapi/asm/fcntl.h +3 -23
@@ -50,30 +50,10 @@#define F_SETLKW64 35#endif -/* -* The flavours of struct flock. "struct flock" is the ABI compliant -* variant. Finally struct flock64 is the LFS variant of struct flock. As -* a historic accident and inconsistence with the ABI definition it doesn't -* contain all the same fields as struct flock. -*/ -#if _MIPS_SIM != _MIPS_SIM_ABI64 - -#include <linux/types.h> - -struct flock { -short l_type; -short l_whence; -__kernel_off_t l_start; -__kernel_off_t l_len; -long l_sysid; -__kernel_pid_t l_pid; -long pad[4 ]; -}; - -#define HAVE_ARCH_STRUCT_FLOCK - -#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ +#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; +#define __ARCH_FLOCK_PAD long pad[4]; +#endif #include <asm-generic/fcntl.h>
include/uapi/asm-generic/fcntl.h +3 -2
@@ -192,18 +192,19 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024 -#ifndef HAVE_ARCH_STRUCT_FLOCK struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len; +#ifdef __ARCH_FLOCK_EXTRA_SYSID + __ARCH_FLOCK_EXTRA_SYSID +#endif __kernel_pid_t l_pid;#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD#endif }; -#endif struct flock64 {short l_type;
tools/include/uapi/asm-generic/fcntl.h +3 -2
@@ -187,18 +187,19 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024 -#ifndef HAVE_ARCH_STRUCT_FLOCK struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len; +#ifdef __ARCH_FLOCK_EXTRA_SYSID + __ARCH_FLOCK_EXTRA_SYSID +#endif __kernel_pid_t l_pid;#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD#endif }; -#endif struct flock64 {short l_type;
Signature · 1 line
2.30.2
PATCH 4/5 uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
In reply to Christoph HellwigThe F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented for the 32-bit syscall APIs, but are also needed for compat handling on 64-bit kernels.
Consolidate them in unistd.h instead of definining the internal compat definitions in compat.h, which is rather errror prone (e.g. parisc gets the values wrong currently).
Note that before this change they were never visible to userspace due to the fact that CONFIG_64BIT is only set for kernel builds.
--- arch/arm64/include/asm/compat.h | 4 ---- arch/mips/include/asm/compat.h | 4 ---- arch/mips/include/uapi/asm/fcntl.h | 4 ++-- arch/powerpc/include/asm/compat.h | 4 ---- arch/s390/include/asm/compat.h | 4 ---- arch/sparc/include/asm/compat.h | 4 ---- arch/x86/include/asm/compat.h | 4 ---- include/uapi/asm-generic/fcntl.h | 4 ++-- tools/include/uapi/asm-generic/fcntl.h | 2 -- 9 files changed, 4 insertions(+), 30 deletions(-)
arch/arm64/include/asm/compat.h +0 -4
@@ -73,10 +73,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/mips/include/asm/compat.h +0 -4
@@ -65,10 +65,6 @@ struct compat_flock {s32 pad[4 ]; }; -#define F_GETLK64 33 -#define F_SETLK64 34 -#define F_SETLKW64 35 -struct compat_flock64 {short l_type;short l_whence;
arch/mips/include/uapi/asm/fcntl.h +2 -2
@@ -44,11 +44,11 @@#define F_SETOWN 24/* for sockets. */ #define F_GETOWN 23/* for sockets. */ -#ifndef __mips64 +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#define F_GETLK64 33/* using 'struct flock64' */ #define F_SETLK64 34#define F_SETLKW64 35 -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #if _MIPS_SIM != _MIPS_SIM_ABI64#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;
arch/powerpc/include/asm/compat.h +0 -4
@@ -52,10 +52,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/s390/include/asm/compat.h +0 -4
@@ -110,10 +110,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/sparc/include/asm/compat.h +0 -4
@@ -84,10 +84,6 @@ struct compat_flock {short __unused; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/x86/include/asm/compat.h +0 -4
@@ -58,10 +58,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -/* * IA32 uses 4 byte alignment for 64 bit quantities, * so we need to pack this structure.
include/uapi/asm-generic/fcntl.h +2 -2
@@ -116,13 +116,13 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15
tools/include/uapi/asm-generic/fcntl.h +0 -2
@@ -115,13 +115,11 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT #ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif #ifndef F_SETOWN_EX #define F_SETOWN_EX 15
Signature · 1 line
2.30.2
Re: [PATCH 4/5] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
Quoted 174 lines · Christoph Hellwig
The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented for the 32-bit syscall APIs, but are also needed for compat handling on 64-bit kernels.
Consolidate them in
unistd.hinstead of definining the internal compat definitions incompat.h, which is rather errror prone (e.g. parisc gets the values wrong currently).Note that before this change they were never visible to userspace due to the fact that
CONFIG_64BITis only set for kernel builds.Signed-off-by Christoph Hellwig <[email protected]>--- arch/arm64/include/asm/compat.h | 4 ---- arch/mips/include/asm/compat.h | 4 ---- arch/mips/include/uapi/asm/fcntl.h | 4 ++-- arch/powerpc/include/asm/compat.h | 4 ---- arch/s390/include/asm/compat.h | 4 ---- arch/sparc/include/asm/compat.h | 4 ---- arch/x86/include/asm/compat.h | 4 ---- include/uapi/asm-generic/fcntl.h | 4 ++-- tools/include/uapi/asm-generic/fcntl.h | 2 -- 9 files changed, 4 insertions(+), 30 deletions(-)arch/arm64/include/asm/compat.h +0
-4@@ -73,10 +73,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/mips/include/asm/compat.h +0
-4@@ -65,10 +65,6 @@ struct compat_flock {s32 pad[4 ]; }; -#define F_GETLK64 33 -#define F_SETLK64 34 -#define F_SETLKW64 35 -struct compat_flock64 {short l_type;short l_whence;arch/mips/include/uapi/asm/fcntl.h +2
-2@@ -44,11 +44,11 @@#define F_SETOWN 24/* for sockets. */ #define F_GETOWN 23/* for sockets. */ -#ifndef __mips64 +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#define F_GETLK64 33/* using 'struct flock64' */ #define F_SETLK64 34#define F_SETLKW64 35 -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #if _MIPS_SIM != _MIPS_SIM_ABI64#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;arch/powerpc/include/asm/compat.h +0
-4@@ -52,10 +52,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/s390/include/asm/compat.h +0
-4@@ -110,10 +110,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/sparc/include/asm/compat.h +0
-4@@ -84,10 +84,6 @@ struct compat_flock {short __unused; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/x86/include/asm/compat.h +0
-4@@ -58,10 +58,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -/* * IA32 uses 4 byte alignment for 64 bit quantities, * so we need to pack this structure. include/uapi/asm-generic/fcntl.h +2
-2@@ -116,13 +116,13 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15tools/include/uapi/asm-generic/fcntl.h +0
-3@@ -115,13 +115,11 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT #ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif #ifndef F_SETOWN_EX #define F_SETOWN_EX 15 --2.30.2
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 4/5] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
In reply to Christoph HellwigQuoted 45 lines · Christoph Hellwig
The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented for the 32-bit syscall APIs, but are also needed for compat handling on 64-bit kernels.
Consolidate them in
unistd.hinstead of definining the internal compat definitions incompat.h, which is rather errror prone (e.g. parisc gets the values wrong currently).Note that before this change they were never visible to userspace due to the fact that
CONFIG_64BITis only set for kernel builds.Signed-off-by Christoph Hellwig <[email protected]>--- arch/arm64/include/asm/compat.h | 4 ---- arch/mips/include/asm/compat.h | 4 ---- arch/mips/include/uapi/asm/fcntl.h | 4 ++-- arch/powerpc/include/asm/compat.h | 4 ---- arch/s390/include/asm/compat.h | 4 ---- arch/sparc/include/asm/compat.h | 4 ---- arch/x86/include/asm/compat.h | 4 ---- include/uapi/asm-generic/fcntl.h | 4 ++-- tools/include/uapi/asm-generic/fcntl.h | 2 -- 9 files changed, 4 insertions(+), 30 deletions(-)arch/arm64/include/asm/compat.h +0
-4@@ -73,10 +73,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/mips/include/asm/compat.h +0
-0
arch/mips/include/asm/compat.h struct compat_flock { · line 70
Quoted 6 lines
arch/mips/include/asm/compat.h +0
-3@@ -65,10 +65,6 @@ struct compat_flock {s32 pad[4 ]; }; -#define F_GETLK64 33 -#define F_SETLK64 34 -#define F_SETLKW64 35
Oops we can't remove above, right?
Quoted 123 lines
arch/mips/include/asm/compat.h +0
-1-struct compat_flock64 {short l_type;short l_whence;arch/mips/include/uapi/asm/fcntl.h +2
-2@@ -44,11 +44,11 @@#define F_SETOWN 24/* for sockets. */ #define F_GETOWN 23/* for sockets. */ -#ifndef __mips64 +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#define F_GETLK64 33/* using 'struct flock64' */ #define F_SETLK64 34#define F_SETLKW64 35 -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #if _MIPS_SIM != _MIPS_SIM_ABI64#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;arch/powerpc/include/asm/compat.h +0
-4@@ -52,10 +52,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/s390/include/asm/compat.h +0
-4@@ -110,10 +110,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/sparc/include/asm/compat.h +0
-4@@ -84,10 +84,6 @@ struct compat_flock {short __unused; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/x86/include/asm/compat.h +0
-4@@ -58,10 +58,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -/* * IA32 uses 4 byte alignment for 64 bit quantities, * so we need to pack this structure. include/uapi/asm-generic/fcntl.h +2
-2@@ -116,13 +116,13 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15tools/include/uapi/asm-generic/fcntl.h +0
-3@@ -115,13 +115,11 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT #ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif #ifndef F_SETOWN_EX #define F_SETOWN_EX 15 --2.30.2
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 4/5] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
Quoted 50 lines · Guo Ren
Quoted 48 lines · Christoph Hellwig
The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented for the 32-bit syscall APIs, but are also needed for compat handling on 64-bit kernels.
Consolidate them in
unistd.hinstead of definining the internal compat definitions incompat.h, which is rather errror prone (e.g. parisc gets the values wrong currently).Note that before this change they were never visible to userspace due to the fact that
CONFIG_64BITis only set for kernel builds.Signed-off-by Christoph Hellwig <[email protected]>--- arch/arm64/include/asm/compat.h | 4 ---- arch/mips/include/asm/compat.h | 4 ---- arch/mips/include/uapi/asm/fcntl.h | 4 ++-- arch/powerpc/include/asm/compat.h | 4 ---- arch/s390/include/asm/compat.h | 4 ---- arch/sparc/include/asm/compat.h | 4 ---- arch/x86/include/asm/compat.h | 4 ---- include/uapi/asm-generic/fcntl.h | 4 ++-- tools/include/uapi/asm-generic/fcntl.h | 2 -- 9 files changed, 4 insertions(+), 30 deletions(-)arch/arm64/include/asm/compat.h +0
-4@@ -73,10 +73,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/mips/include/asm/compat.h +0
-0@@ -65,10 +65,6 @@ struct compat_flock {s32 pad[4 ]; };
Quoted 4 lines
arch/mips/include/asm/compat.h struct compat_flock { · line 70
Quoted 3 lines
arch/mips/include/asm/compat.h +0
-3-#define F_GETLK64 33 -#define F_SETLK64 34 -#define F_SETLKW64 35Oops we can't remove above, right?
No problem, I missing, it's okay.
All come from arch/mips/include/uapi/asm/fcntl.h
Quoted 131 lines
Quoted 122 lines
arch/mips/include/asm/compat.h +0
-1-struct compat_flock64 {short l_type;short l_whence;arch/mips/include/uapi/asm/fcntl.h +2
-2@@ -44,11 +44,11 @@#define F_SETOWN 24/* for sockets. */ #define F_GETOWN 23/* for sockets. */ -#ifndef __mips64 +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#define F_GETLK64 33/* using 'struct flock64' */ #define F_SETLK64 34#define F_SETLKW64 35 -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #if _MIPS_SIM != _MIPS_SIM_ABI64#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;arch/powerpc/include/asm/compat.h +0
-4@@ -52,10 +52,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/s390/include/asm/compat.h +0
-4@@ -110,10 +110,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/sparc/include/asm/compat.h +0
-4@@ -84,10 +84,6 @@ struct compat_flock {short __unused; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;arch/x86/include/asm/compat.h +0
-4@@ -58,10 +58,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -/* * IA32 uses 4 byte alignment for 64 bit quantities, * so we need to pack this structure. include/uapi/asm-generic/fcntl.h +2
-2@@ -116,13 +116,13 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15tools/include/uapi/asm-generic/fcntl.h +0
-3@@ -115,13 +115,11 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT #ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif #ifndef F_SETOWN_EX #define F_SETOWN_EX 15 --Quoted 2 lines
2.30.2
--
Best Regards
Guo Ren
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
PATCH 5/5 compat: consolidate the compat_flock{,64} definition
In reply to Christoph HellwigProvide a single common definition for the compat_flock and compat_flock64 structures using the same tricks as for the native variants. Another extra define is added for the packing required on x86.
--- arch/arm64/include/asm/compat.h | 16 ---------------- arch/mips/include/asm/compat.h | 19 ++----------------- arch/parisc/include/asm/compat.h | 16 ---------------- arch/powerpc/include/asm/compat.h | 16 ---------------- arch/s390/include/asm/compat.h | 16 ---------------- arch/sparc/include/asm/compat.h | 18 +----------------- arch/x86/include/asm/compat.h | 20 +++----------------- include/linux/compat.h | 31 +++++++++++++++++++++++++++++++ 8 files changed, 37 insertions(+), 115 deletions(-)
arch/arm64/include/asm/compat.h +0 -16
@@ -65,22 +65,6 @@ struct compat_stat {compat_ulong_t __unused4[2 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {int f_type;int f_bsize;
arch/mips/include/asm/compat.h +2 -17
@@ -55,23 +55,8 @@ struct compat_stat {s32 st_pad4[14 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -s32 l_sysid; -compat_pid_t l_pid; -s32 pad[4 ]; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; +#define __ARCH_COMPAT_FLOCK_EXTRA_SYSID s32 l_sysid; +#define __ARCH_COMPAT_FLOCK_PAD s32 pad[4];struct compat_statfs {int f_type;
arch/parisc/include/asm/compat.h +0 -16
@@ -53,22 +53,6 @@ struct compat_stat {u32 st_spare4[3 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {s32 f_type;s32 f_bsize;
arch/powerpc/include/asm/compat.h +0 -16
@@ -44,22 +44,6 @@ struct compat_stat {u32 __unused4[2 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {int f_type;int f_bsize;
arch/s390/include/asm/compat.h +0 -16
@@ -102,22 +102,6 @@ struct compat_stat {u32 __unused5; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {u32 f_type;u32 f_bsize;
arch/sparc/include/asm/compat.h +1 -17
@@ -75,23 +75,7 @@ struct compat_stat64 {unsigned int __unused5; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -short __unused; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -short __unused; -}; +#define __ARCH_COMPAT_FLOCK_PAD short __unused;struct compat_statfs {int f_type;
arch/x86/include/asm/compat.h +3 -17
@@ -50,25 +50,11 @@ struct compat_stat {u32 __unused5; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; -/* -* IA32 uses 4 byte alignment for 64 bit quantities, -* so we need to pack this structure. +* IA32 uses 4 byte alignment for 64 bit quantities, so we need to pack the +* compat flock64 structure. */ -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -} __attribute__((packed)); +#define __ARCH_NEED_COMPAT_FLOCK64_PACKEDstruct compat_statfs {int f_type;
include/linux/compat.h +31 -0
@@ -258,6 +258,37 @@ struct compat_rlimit {compat_ulong_t rlim_max; }; +#ifdef __ARCH_NEED_COMPAT_FLOCK64_PACKED +#define __ARCH_COMPAT_FLOCK64_PACK __attribute__((packed)) +#else +#define __ARCH_COMPAT_FLOCK64_PACK +#endif + +struct compat_flock { +short l_type; +short l_whence; +compat_off_t l_start; +compat_off_t l_len; +#ifdef __ARCH_COMPAT_FLOCK_EXTRA_SYSID + __ARCH_COMPAT_FLOCK_EXTRA_SYSID +#endif +compat_pid_t l_pid; +#ifdef __ARCH_COMPAT_FLOCK_PAD + __ARCH_COMPAT_FLOCK_PAD +#endif +}; + +struct compat_flock64 { +short l_type; +short l_whence; +compat_loff_t l_start; +compat_loff_t l_len; +compat_pid_t l_pid; +#ifdef __ARCH_COMPAT_FLOCK64_PAD + __ARCH_COMPAT_FLOCK64_PAD +#endif +} __ARCH_COMPAT_FLOCK64_PACK; +struct compat_rusage {struct old_timeval32 ru_utime;struct old_timeval32 ru_stime;
Signature · 1 line
2.30.2
Quoted 10 lines · Christoph Hellwig
Hi all,
currenty the compat fcnt definitions are duplicate for all compat architectures, and the native fcntl64 definitions aren't even usable from userspace due to a bogus
CONFIG_64BITifdef. This series tries to sort out all that.Changes since v1:
- only make the F*64 defines uapi visible for 32-bit architectures
Looks all good to me,
I think it would be best to merge this through the risc-v tree along with the coming compat support
that depends on it. Alternatively, I can put it into my asm-generic tree for 5.18.
Arnd
Quoted 13 lines · Arnd Bergmann
Quoted 10 lines · Christoph Hellwig
Hi all,
currenty the compat fcnt definitions are duplicate for all compat architectures, and the native fcntl64 definitions aren't even usable from userspace due to a bogus
CONFIG_64BITifdef. This series tries to sort out all that.Changes since v1:
- only make the F*64 defines uapi visible for 32-bit architectures
Quoted 7 lines
Looks all good to me,
Reviewed-by Arnd Bergmann <[email protected]>I think it would be best to merge this through the risc-v tree along with the coming compat support
that depends on it.
Okay, I would include it in my next version series.
Quoted 4 lines
Alternatively, I can put it into my asm-generic
tree for 5.18.Arnd
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Quoted 3 lines · Arnd Bergmann
I think it would be best to merge this through the risc-v tree along with the coming compat support
that depends on it.
Sounds perfect to me!
Hi Christoph,
Le 31/01/2022 à 07:49, Christoph Hellwig a écrit :
Quoted 6 lines
Hi all,
currenty the compat fcnt definitions are duplicate for all compat architectures, and the native fcntl64 definitions aren't even usable from userspace due to a bogus
CONFIG_64BITifdef. This series tries to sort out all that.
There must be something wrong with this cover letter, patchwork doesn't see it, see
https://patchwork.ozlabs.org/project/linuxppc-dev/list/?submitter=82
Any idea what the problem is ?
Thanks
Christophe
Quoted 17 lines
Changes since v1:
- only make the F*64 defines uapi visible for 32-bit architecturesDiffstat:
arch/arm64/include/asm/compat.h | 20 -------------------- arch/mips/include/asm/compat.h | 23 ++--------------------- arch/mips/include/uapi/asm/fcntl.h | 30 +++++------------------------- arch/parisc/include/asm/compat.h | 16 ---------------- arch/powerpc/include/asm/compat.h | 20 -------------------- arch/s390/include/asm/compat.h | 20 -------------------- arch/sparc/include/asm/compat.h | 22 +--------------------- arch/x86/include/asm/compat.h | 24 +++--------------------- include/linux/compat.h | 31 +++++++++++++++++++++++++++++++ include/uapi/asm-generic/fcntl.h | 23 +++++++++-------------- tools/include/uapi/asm-generic/fcntl.h | 21 +++++++-------------- 11 files changed, 58 insertions(+), 192 deletions(-)