improve compat handling for the i386 u64 alignment quirk v3
Hi all,
the i386 ABI is a little special in that it uses less than natural alignment for 64-bit integer types (u64 and s64), and a significant amount of our compat handlers deals with just that. Unfortunately there is no good way to check for this specific quirk at runtime, similar how in_compat_syscall() checks for a compat syscall. This series adds such a check, and then uses the quota code as an example of how this improves the compat handling. I have a few other places in mind where this will also be useful going forward.
Changes since v2:
- drop the patch to use <linux/compat.h> in the arm64 headers
Changes since v1:
- use asm-generic/compat.h instead of linux/compat.h for compat_u64 and compat_s64
- fix a typo
Diffstat:
b/arch/arm64/include/asm/compat.h | 2 b/arch/mips/include/asm/compat.h | 2 b/arch/parisc/include/asm/compat.h | 2 b/arch/powerpc/include/asm/compat.h | 2 b/arch/s390/include/asm/compat.h | 2 b/arch/sparc/include/asm/compat.h | 3 b/arch/x86/entry/syscalls/syscall_32.tbl | 2 b/arch/x86/include/asm/compat.h | 3 b/fs/quota/Kconfig | 5 - b/fs/quota/Makefile | 1 b/fs/quota/compat.h | 34 ++++++++ b/fs/quota/quota.c | 73 +++++++++++++++--- b/include/asm-generic/compat.h | 8 ++ b/include/linux/compat.h | 9 ++ b/include/linux/quotaops.h | 3 b/kernel/sys_ni.c | 1 fs/quota/compat.c | 120 ------------------------------- 17 files changed, 113 insertions(+), 159 deletions(-)
PATCH 1/3 compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
lift the compat_s64 and compat_u64 definitions into common code using the COMPAT_FOR_U64_ALIGNMENT symbol for the x86 special case.
--- arch/arm64/include/asm/compat.h | 2 -- arch/mips/include/asm/compat.h | 2 -- arch/parisc/include/asm/compat.h | 2 -- arch/powerpc/include/asm/compat.h | 2 -- arch/s390/include/asm/compat.h | 2 -- arch/sparc/include/asm/compat.h | 3 +-- arch/x86/include/asm/compat.h | 2 -- include/asm-generic/compat.h | 8 ++++++++ 8 files changed, 9 insertions(+), 14 deletions(-)
arch/arm64/include/asm/compat.h +0 -2
@@ -35,8 +35,6 @@ typedef s32 compat_nlink_t;typedef u16 compat_ipc_pid_t ;typedef u32 compat_caddr_t ;typedef __kernel_fsid_t compat_fsid_t ; -typedef s64 compat_s64 ; -typedef u64 compat_u64 ;struct compat_stat {#ifdef __AARCH64EB__
arch/mips/include/asm/compat.h +0 -2
@@ -26,8 +26,6 @@ typedef s32 compat_caddr_t;typedef struct {s32 val[2 ]; }compat_fsid_t ; -typedef s64 compat_s64 ; -typedef u64 compat_u64 ;struct compat_stat {compat_dev_t st_dev;
arch/parisc/include/asm/compat.h +0 -2
@@ -22,8 +22,6 @@ typedef u32 compat_dev_t;typedef u16 compat_nlink_t ;typedef u16 compat_ipc_pid_t ;typedef u32 compat_caddr_t ; -typedef s64 compat_s64 ; -typedef u64 compat_u64 ;struct compat_stat {compat_dev_t st_dev;/* dev_t is 32 bits on parisc */
arch/powerpc/include/asm/compat.h +0 -2
@@ -27,8 +27,6 @@ typedef s16 compat_nlink_t;typedef u16 compat_ipc_pid_t ;typedef u32 compat_caddr_t ;typedef __kernel_fsid_t compat_fsid_t ; -typedef s64 compat_s64 ; -typedef u64 compat_u64 ;struct compat_stat {compat_dev_t st_dev;
arch/s390/include/asm/compat.h +0 -2
@@ -63,8 +63,6 @@ typedef u16 compat_nlink_t;typedef u16 compat_ipc_pid_t ;typedef u32 compat_caddr_t ;typedef __kernel_fsid_t compat_fsid_t ; -typedef s64 compat_s64 ; -typedef u64 compat_u64 ; typedef struct { u32 mask;
arch/sparc/include/asm/compat.h +1 -2
@@ -21,8 +21,7 @@ typedef s16 compat_nlink_t;typedef u16 compat_ipc_pid_t ;typedef u32 compat_caddr_t ;typedef __kernel_fsid_t compat_fsid_t ; -typedef s64 compat_s64 ; -typedef u64 compat_u64 ; +struct compat_stat {compat_dev_t st_dev;compat_ino_t st_ino;
arch/x86/include/asm/compat.h +0 -2
@@ -27,8 +27,6 @@ typedef u16 compat_nlink_t;typedef u16 compat_ipc_pid_t ;typedef u32 compat_caddr_t ;typedef __kernel_fsid_t compat_fsid_t ; -typedef s64 __attribute__((aligned(4))) compat_s64; -typedef u64 __attribute__((aligned(4))) compat_u64;struct compat_stat {compat_dev_t st_dev;
include/asm-generic/compat.h +8 -0
@@ -22,4 +22,12 @@ typedef u32 compat_ulong_t;typedef u32 compat_uptr_t ;typedef u32 compat_aio_context_t ; +#ifdef CONFIG_COMPAT_FOR_U64_ALIGNMENT +typedef s64 __attribute__((aligned(4))) compat_s64; +typedef u64 __attribute__((aligned(4))) compat_u64; +#else +typedef s64 compat_s64 ; +typedef u64 compat_u64 ; +#endif +#endif
Signature · 1 line
2.28.0
Re: [PATCH 1/3] compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
Quoted 5 lines · Christoph Hellwig
lift the
compat_s64andcompat_u64definitions into common code using theCOMPAT_FOR_U64_ALIGNMENTsymbol for the x86 special case.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 10 lines
--- arch/arm64/include/asm/compat.h | 2 -- arch/mips/include/asm/compat.h | 2 -- arch/parisc/include/asm/compat.h | 2 -- arch/powerpc/include/asm/compat.h | 2 -- arch/s390/include/asm/compat.h | 2 -- arch/sparc/include/asm/compat.h | 3 +-- arch/x86/include/asm/compat.h | 2 -- include/asm-generic/compat.h | 8 ++++++++ 8 files changed, 9 insertions(+), 14 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Al Viro
maintainerRe: [PATCH 1/3] compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
lift the
compat_s64andcompat_u64definitions into common code using theCOMPAT_FOR_U64_ALIGNMENTsymbol for the x86 special case.
OK... Unlike the previous series it's not trying to wean arm64 off the direct includes of asm/compat.h, avoiding the breakage you've got there.
Looks sane, applied.
PATCH 2/3 compat: add a compat_need_64bit_alignment_fixup() helper
In reply to Christoph HellwigAdd a helper to check if the calling syscall needs a fixup for non-natural 64-bit type alignment in the compat ABI. This will only return true for i386 syscalls on x86_64.
--- arch/x86/include/asm/compat.h | 1 + include/linux/compat.h | 9 +++++++++ 2 files changed, 10 insertions(+)
arch/x86/include/asm/compat.h +1 -0
@@ -209,6 +209,7 @@ static inline bool in_compat_syscall(void) return in_32bit_syscall(); }#define in_compat_syscall in_compat_syscall/* override the generic impl */ +#define compat_need_64bit_alignment_fixup in_ia32_syscall#endif struct compat_siginfo ;
include/linux/compat.h +9 -0
@@ -932,6 +932,15 @@ static inline bool in_compat_syscall(void) { return false; }#endif /* CONFIG_COMPAT */ +/* +* Some legacy ABIs like the i386 one use less than natural alignment for 64-bit +* types, and will need special compat treatment for that. Most architectures +* don't need that special handling even for compat syscalls. +*/ +#ifndef compat_need_64bit_alignment_fixup +#define compat_need_64bit_alignment_fixup () false +#endif +/* * A pointer passed in from user mode. This should not * be used for syscall parameters, just declare them
Signature · 1 line
2.28.0
PATCH 3/3 quota: simplify the quotactl compat handling
In reply to Christoph HellwigFold the misaligned u64 workarounds into the main quotactl flow instead of implementing a separate compat syscall handler.
--- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- fs/quota/Kconfig | 5 -- fs/quota/Makefile | 1 - fs/quota/compat.c | 120 ------------------------- fs/quota/compat.h | 34 +++++++ fs/quota/quota.c | 73 ++++++++++++--- include/linux/quotaops.h | 3 - kernel/sys_ni.c | 1 - 8 files changed, 94 insertions(+), 145 deletions(-) delete mode 100644 fs/quota/compat.c create mode 100644 fs/quota/compat.h
arch/x86/entry/syscalls/syscall_32.tbl +1 -1
@@ -142,7 +142,7 @@ 128 i386 init_module sys_init_module 129 i386 delete_module sys_delete_module 130 i386 get_kernel_syms -131 i386 quotactl sys_quotactl compat_sys_quotactl32 +131 i386 quotactl sys_quotactl 132 i386 getpgid sys_getpgid 133 i386 fchdir sys_fchdir 134 i386 bdflush sys_bdflush
fs/quota/Kconfig +0 -5
@@ -70,8 +70,3 @@ config QFMT_V2 config QUOTACTL bool default n - -config QUOTACTL_COMPAT - bool - depends on QUOTACTL && COMPAT_FOR_U64_ALIGNMENT - default y
fs/quota/Makefile +0 -1
@@ -4,5 +4,4 @@ obj-$(CONFIG_QFMT_V1) += quota_v1.o obj-$(CONFIG_QFMT_V2) += quota_v2.o obj-$(CONFIG_QUOTA_TREE) += quota_tree.o obj-$(CONFIG_QUOTACTL) += quota.o kqid.o -obj-$(CONFIG_QUOTACTL_COMPAT) += compat.o obj-$(CONFIG_QUOTA_NETLINK_INTERFACE) += netlink.o
fs/quota/compat.c deleted +0 -120
120 lines not on this page · raw message
fs/quota/compat.h new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/compat.h> + +struct compat_if_dqblk { +compat_u64 dqb_bhardlimit; +compat_u64 dqb_bsoftlimit; +compat_u64 dqb_curspace; +compat_u64 dqb_ihardlimit; +compat_u64 dqb_isoftlimit; +compat_u64 dqb_curinodes; +compat_u64 dqb_btime; +compat_u64 dqb_itime; +compat_uint_t dqb_valid; +}; + +struct compat_fs_qfilestat { +compat_u64 dqb_bhardlimit; +compat_u64 qfs_nblks; +compat_uint_t qfs_nextents; +}; + +struct compat_fs_quota_stat { +__s8 qs_version; +__u16 qs_flags; +__s8 qs_pad; +struct compat_fs_qfilestat qs_uquota; +struct compat_fs_qfilestat qs_gquota; +compat_uint_t qs_incoredqs; +compat_int_t qs_btimelimit; +compat_int_t qs_itimelimit; +compat_int_t qs_rtbtimelimit; +__u16 qs_bwarnlimit; +__u16 qs_iwarnlimit; +};
fs/quota/quota.c +59 -14
113 lines not on this page · raw message
include/linux/quotaops.h +0 -3
@@ -27,9 +27,6 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia) (ia->ia_valid &ATTR_GID && !gid_eq (ia->ia_gid, inode->i_gid)); } -int kernel_quotactl (unsigned int cmd,const char __user *special, -qid_t id,void __user *addr); -#if defined(CONFIG_QUOTA ) #define quota_error(sb, fmt, args...) \
kernel/sys_ni.c +0 -1
@@ -369,7 +369,6 @@ COND_SYSCALL_COMPAT(fanotify_mark);/* x86 */ COND_SYSCALL (vm86old);COND_SYSCALL (modify_ldt); -COND_SYSCALL_COMPAT (quotactl32);COND_SYSCALL (vm86);COND_SYSCALL (kexec_file_load);
Signature · 1 line
2.28.0