binfmt_flat cleanups and RISC-V support v2
Subsystems (9)
Hi Greg,
below is a larger stash of cleanups for the binfmt_misc code, preparing for the last patch that now trivially adds RISC-V support, which will be used for the RISC-V nommu series I am about to post.
Changes since v2:
- fix the handling of old format flags
- don't pass arguments on stack for RISC-V
- small cleanups for flat_v2_reloc_t
PATCH 1/17 binfmt_flat: remove flat_reloc_valid
This helper is the same for all architectures, open code it in the only caller.
--- arch/arm/include/asm/flat.h | 1 - arch/c6x/include/asm/flat.h | 1 - arch/h8300/include/asm/flat.h | 1 - arch/m68k/include/asm/flat.h | 1 - arch/microblaze/include/asm/flat.h | 1 - arch/sh/include/asm/flat.h | 1 - arch/xtensa/include/asm/flat.h | 1 - fs/binfmt_flat.c | 2 +- 8 files changed, 1 insertion(+), 8 deletions(-)
arch/arm/include/asm/flat.h +0 -1
@@ -10,7 +10,6 @@#define flat_argvp_envp_on_stack () 1#define flat_old_ram_flag (flags) (flags) -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent)
arch/c6x/include/asm/flat.h +0 -1
@@ -6,7 +6,6 @@#define flat_argvp_envp_on_stack () 0#define flat_old_ram_flag (flags) (flags) -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/h8300/include/asm/flat.h +0 -1
@@ -10,7 +10,6 @@#define flat_argvp_envp_on_stack () 1#define flat_old_ram_flag (flags) 1 -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))#define flat_set_persistent (relval, p) 0/*
arch/m68k/include/asm/flat.h +0 -1
@@ -10,7 +10,6 @@#define flat_argvp_envp_on_stack () 1#define flat_old_ram_flag (flags) (flags) -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/microblaze/include/asm/flat.h +0 -1
@@ -15,7 +15,6 @@#define flat_argvp_envp_on_stack () 0#define flat_old_ram_flag (flags) (flags) -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))#define flat_set_persistent (relval, p) 0/*
arch/sh/include/asm/flat.h +0 -1
@@ -13,7 +13,6 @@#define flat_argvp_envp_on_stack () 0#define flat_old_ram_flag (flags) (flags) -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/xtensa/include/asm/flat.h +0 -1
@@ -6,7 +6,6 @@#define flat_argvp_envp_on_stack () 0#define flat_old_ram_flag (flags) (flags) -#define flat_reloc_valid (reloc, size) ((reloc) <= (size))static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
fs/binfmt_flat.c +1 -1
@@ -345,7 +345,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp) start_code = p->lib_list[id].start_code; text_len = p->lib_list[id].text_len; -if (!flat_reloc_valid (r, start_brk - start_data + text_len)) { +if (r > start_brk - start_data + text_len) {pr_err ("reloc outside program 0x%lx (0 - 0x%lx/0x%lx)" , r, start_brk-start_data+text_len, text_len); goto failed;
Signature · 1 line
2.20.1
PATCH 2/17 binfmt_flat: remove flat_set_persistent
In reply to Christoph HellwigThis helper is a no-op on all architectures, remove it.
--- arch/arm/include/asm/flat.h | 1 - arch/c6x/include/asm/flat.h | 1 - arch/h8300/include/asm/flat.h | 1 - arch/m68k/include/asm/flat.h | 5 ----- arch/microblaze/include/asm/flat.h | 1 - arch/sh/include/asm/flat.h | 1 - arch/xtensa/include/asm/flat.h | 1 - fs/binfmt_flat.c | 2 -- 8 files changed, 13 deletions(-)
arch/arm/include/asm/flat.h +0 -1
@@ -31,6 +31,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) }#define flat_get_relocate_addr (rel) (rel) -#define flat_set_persistent (relval, p) 0#endif /* __ARM_FLAT_H__ */
arch/c6x/include/asm/flat.h +0 -1
@@ -18,6 +18,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) return 0; }#define flat_get_relocate_addr (rel) (rel) -#define flat_set_persistent (relval, p) 0#endif /* __ASM_C6X_FLAT_H */
arch/h8300/include/asm/flat.h +0 -1
@@ -10,7 +10,6 @@#define flat_argvp_envp_on_stack () 1#define flat_old_ram_flag (flags) 1 -#define flat_set_persistent (relval, p) 0/* * on the H8 a couple of the relocations have an instruction in the
arch/m68k/include/asm/flat.h +0 -5
@@ -30,11 +30,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) }#define flat_get_relocate_addr (rel) (rel) -static inline int flat_set_persistent (u32 relval,u32 *persistent) -{ -return 0 ; -} -#define FLAT_PLAT_INIT (regs) \ do { \ if (current->mm) \
arch/microblaze/include/asm/flat.h +0 -1
@@ -15,7 +15,6 @@#define flat_argvp_envp_on_stack () 0#define flat_old_ram_flag (flags) (flags) -#define flat_set_persistent (relval, p) 0/* * Microblaze works a little differently from other arches, because
arch/sh/include/asm/flat.h +0 -1
@@ -25,7 +25,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)return 0 ; }#define flat_get_relocate_addr (rel) (rel) -#define flat_set_persistent (relval, p) ({ (void)p; 0; })#define FLAT_PLAT_INIT (_r) \ do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \
arch/xtensa/include/asm/flat.h +0 -1
@@ -18,6 +18,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) return 0; }#define flat_get_relocate_addr (rel) (rel) -#define flat_set_persistent (relval, p) 0#endif /* __ASM_XTENSA_FLAT_H */
fs/binfmt_flat.c +0 -2
@@ -787,8 +787,6 @@ static int load_flat_file(struct linux_binprm *bprm,if (get_user (relval, reloc + i))return -EFAULT ; relval =ntohl (relval); -if (flat_set_persistent (relval, &persistent)) -continue ; addr =flat_get_relocate_addr (relval); rp = (u32 __user *)calc_reloc (addr, libinfo, id,1 );if (rp = (u32 __user *)RELOC_FAILED ) {
Signature · 1 line
2.20.1
PATCH 3/17 binfmt_flat: provide a default version of flat_get_relocate_addr
In reply to Christoph HellwigThis way only the two architectures that do masking need to provide the helper.
--- arch/arm/include/asm/flat.h | 2 -- arch/c6x/include/asm/flat.h | 1 - arch/m68k/include/asm/flat.h | 1 - arch/sh/include/asm/flat.h | 1 - arch/xtensa/include/asm/flat.h | 1 - fs/binfmt_flat.c | 4 ++++ 6 files changed, 4 insertions(+), 6 deletions(-)
arch/arm/include/asm/flat.h +0 -2
@@ -30,6 +30,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) #endif } -#define flat_get_relocate_addr (rel) (rel) -#endif /* __ARM_FLAT_H__ */
arch/c6x/include/asm/flat.h +0 -1
@@ -17,6 +17,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)put_unaligned (addr, (__force u32 *)rp); return 0; } -#define flat_get_relocate_addr (rel) (rel)#endif /* __ASM_C6X_FLAT_H */
arch/m68k/include/asm/flat.h +0 -1
@@ -28,7 +28,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)return put_user (addr, rp);#endif } -#define flat_get_relocate_addr (rel) (rel)#define FLAT_PLAT_INIT (regs) \ do { \
arch/sh/include/asm/flat.h +0 -1
@@ -24,7 +24,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)put_unaligned (addr, (__force u32 *)rp);return 0 ; } -#define flat_get_relocate_addr (rel) (rel)#define FLAT_PLAT_INIT (_r) \ do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \
arch/xtensa/include/asm/flat.h +0 -1
@@ -17,6 +17,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)put_unaligned (addr, (__force u32 *)rp); return 0; } -#define flat_get_relocate_addr (rel) (rel)#endif /* __ASM_XTENSA_FLAT_H */
fs/binfmt_flat.c +4 -0
@@ -43,6 +43,10 @@#include <asm/cacheflush.h> #include <asm/page.h> +#ifndef flat_get_relocate_addr +#define flat_get_relocate_addr (rel) (rel) +#endif +/****************************************************************************/ /*
Signature · 1 line
2.20.1
PATCH 4/17 binfmt_flat: remove flat_old_ram_flag
In reply to Christoph HellwigInstead add a Kconfig variable that only h8300 selects.
--- arch/arm/include/asm/flat.h | 1 - arch/c6x/include/asm/flat.h | 1 - arch/h8300/Kconfig | 1 + arch/h8300/include/asm/flat.h | 1 - arch/m68k/include/asm/flat.h | 1 - arch/microblaze/include/asm/flat.h | 1 - arch/sh/include/asm/flat.h | 1 - arch/xtensa/include/asm/flat.h | 1 - fs/Kconfig.binfmt | 3 +++ fs/binfmt_flat.c | 3 ++- 10 files changed, 6 insertions(+), 8 deletions(-)
arch/arm/include/asm/flat.h +0 -1
@@ -9,7 +9,6 @@#include <linux/uaccess.h> #define flat_argvp_envp_on_stack () 1 -#define flat_old_ram_flag (flags) (flags)static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent)
arch/c6x/include/asm/flat.h +0 -1
@@ -5,7 +5,6 @@#include <asm/unaligned.h> #define flat_argvp_envp_on_stack () 0 -#define flat_old_ram_flag (flags) (flags)static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/h8300/Kconfig +1 -0
@@ -2,6 +2,7 @@ config H8300 def_bool y select ARCH_32BIT_OFF_T + select BINFMT_FLAT_OLD_ALWAYS_RAM select GENERIC_ATOMIC64 select HAVE_UID16 select VIRT_TO_BUS
arch/h8300/include/asm/flat.h +0 -1
@@ -9,7 +9,6 @@#include <asm/unaligned.h> #define flat_argvp_envp_on_stack () 1 -#define flat_old_ram_flag (flags) 1/* * on the H8 a couple of the relocations have an instruction in the
arch/m68k/include/asm/flat.h +0 -1
@@ -9,7 +9,6 @@#include <linux/uaccess.h> #define flat_argvp_envp_on_stack () 1 -#define flat_old_ram_flag (flags) (flags)static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/microblaze/include/asm/flat.h +0 -1
@@ -14,7 +14,6 @@#include <asm/unaligned.h> #define flat_argvp_envp_on_stack () 0 -#define flat_old_ram_flag (flags) (flags)/* * Microblaze works a little differently from other arches, because
arch/sh/include/asm/flat.h +0 -1
@@ -12,7 +12,6 @@#include <asm/unaligned.h> #define flat_argvp_envp_on_stack () 0 -#define flat_old_ram_flag (flags) (flags)static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/xtensa/include/asm/flat.h +0 -1
@@ -5,7 +5,6 @@#include <asm/unaligned.h> #define flat_argvp_envp_on_stack () 0 -#define flat_old_ram_flag (flags) (flags)static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
fs/Kconfig.binfmt +3 -0
@@ -97,6 +97,9 @@ config BINFMT_FLAT help Support uClinux FLAT format binaries. +config BINFMT_FLAT_OLD_ALWAYS_RAM + bool + config BINFMT_ZFLAT bool "Enable ZFLAT support" depends on BINFMT_FLAT
fs/binfmt_flat.c +2 -1
@@ -488,7 +488,8 @@ static int load_flat_file(struct linux_binprm *bprm,* fix up the flags for the older format, there were all kinds * of endian hacks, this only works for the simple cases */ -if (rev =OLD_FLAT_VERSION &&flat_old_ram_flag (flags)) +if (rev =OLD_FLAT_VERSION && + (flags ||IS_ENABLED (CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM ))) flags =FLAT_FLAG_RAM ;#ifndef CONFIG_BINFMT_ZFLAT
Signature · 1 line
2.20.1
PATCH 5/17 binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable
In reply to Christoph HellwigThis will eventually allow us to kill the need for an <asm/flat.h> for many cases.
--- arch/arm/Kconfig | 1 + arch/arm/include/asm/flat.h | 2 -- arch/c6x/include/asm/flat.h | 1 - arch/h8300/Kconfig | 1 + arch/h8300/include/asm/flat.h | 2 -- arch/m68k/Kconfig | 1 + arch/m68k/include/asm/flat.h | 1 - arch/microblaze/include/asm/flat.h | 2 -- arch/sh/include/asm/flat.h | 1 - arch/xtensa/include/asm/flat.h | 1 - fs/Kconfig.binfmt | 3 +++ fs/binfmt_flat.c | 5 +++-- 12 files changed, 9 insertions(+), 12 deletions(-)
arch/arm/Kconfig +1 -0
@@ -30,6 +30,7 @@ config ARM select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANT_IPC_PARSE_VERSION + select BINFMT_FLAT_ARGVP_ENVP_ON_STACK select BUILDTIME_EXTABLE_SORT if MMU select CLONE_BACKWARDS select CPU_PM if SUSPEND || CPU_IDLE
arch/arm/include/asm/flat.h +0 -2
@@ -8,8 +8,6 @@#include <linux/uaccess.h> -#define flat_argvp_envp_on_stack () 1 -static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/c6x/include/asm/flat.h +0 -1
@@ -4,7 +4,6 @@#include <asm/unaligned.h> -#define flat_argvp_envp_on_stack () 0static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/h8300/Kconfig +1 -0
@@ -2,6 +2,7 @@ config H8300 def_bool y select ARCH_32BIT_OFF_T + select BINFMT_FLAT_ARGVP_ENVP_ON_STACK select BINFMT_FLAT_OLD_ALWAYS_RAM select GENERIC_ATOMIC64 select HAVE_UID16
arch/h8300/include/asm/flat.h +0 -2
@@ -8,8 +8,6 @@#include <asm/unaligned.h> -#define flat_argvp_envp_on_stack () 1 -/* * on the H8 a couple of the relocations have an instruction in the * top byte. As there can only be 24bits of address space, we just
arch/m68k/Kconfig +1 -0
@@ -7,6 +7,7 @@ config M68K select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select ARCH_NO_COHERENT_DMA_MMAP if !MMU select ARCH_NO_PREEMPT if !COLDFIRE + select BINFMT_FLAT_ARGVP_ENVP_ON_STACK select HAVE_IDE select HAVE_AOUT if MMU select HAVE_DEBUG_BUGVERBOSE
arch/m68k/include/asm/flat.h +0 -1
@@ -8,7 +8,6 @@#include <linux/uaccess.h> -#define flat_argvp_envp_on_stack () 1static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/microblaze/include/asm/flat.h +0 -2
@@ -13,8 +13,6 @@#include <asm/unaligned.h> -#define flat_argvp_envp_on_stack () 0 -/* * Microblaze works a little differently from other arches, because * of the MICROBLAZE_64 reloc type. Here, a 32 bit address is split
arch/sh/include/asm/flat.h +0 -1
@@ -11,7 +11,6 @@#include <asm/unaligned.h> -#define flat_argvp_envp_on_stack () 0static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
arch/xtensa/include/asm/flat.h +0 -1
@@ -4,7 +4,6 @@#include <asm/unaligned.h> -#define flat_argvp_envp_on_stack () 0static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags,u32 *addr,u32 *persistent) {
fs/Kconfig.binfmt +3 -0
@@ -97,6 +97,9 @@ config BINFMT_FLAT help Support uClinux FLAT format binaries. +config BINFMT_FLAT_ARGVP_ENVP_ON_STACK + bool + config BINFMT_FLAT_OLD_ALWAYS_RAM bool
fs/binfmt_flat.c +3 -2
@@ -124,14 +124,15 @@ static int create_flat_tables(struct linux_binprm *bprm, unsigned long arg_start sp -= bprm->envc +1 ; sp -= bprm->argc +1 ; - sp -=flat_argvp_envp_on_stack () ?2 :0 ; +if (IS_ENABLED (CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK )) + sp -=2 ;/* argvp + envp */ sp -=1 ;/* &argc */ current->mm->start_stack = (unsigned long )sp & -FLAT_STACK_ALIGN ; sp = (unsigned long __user *)current->mm->start_stack;__put_user (bprm->argc, sp++); -if (flat_argvp_envp_on_stack ()) { +if (IS_ENABLED (CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK )) {unsigned long argv, envp; argv = (unsigned long )(sp +2 ); envp = (unsigned long )(sp +2 + bprm->argc +1 );
Signature · 1 line
2.20.1
PATCH 6/17 binfmt_flat: remove the uapi <linux/flat.h> header
In reply to Christoph HellwigThe split between the two flat.h files is completely arbitrary, and the uapi version even contains CONFIG_ ifdefs that can't work in userspace. The only userspace program known to use the header is elf2flt, and it ships with its own version of the combined header.
Use the chance to move the <asm/flat.h> inclusion out of this file, as it is in no way needed for the format defintion, but just for the binfmt implementation.
--- fs/binfmt_flat.c | 1 + include/linux/flat.h | 45 ++++++++++++++++++++++++++--- include/uapi/linux/flat.h | 59 --------------------------------------- 3 files changed, 42 insertions(+), 63 deletions(-) delete mode 100644 include/uapi/linux/flat.h
fs/binfmt_flat.c +1 -0
@@ -42,6 +42,7 @@#include <asm/unaligned.h> #include <asm/cacheflush.h> #include <asm/page.h> +#include <asm/flat.h> #ifndef flat_get_relocate_addr#define flat_get_relocate_addr (rel) (rel)
include/linux/flat.h +41 -4
57 lines not on this page · raw message
include/uapi/linux/flat.h deleted +0 -59
59 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 7/17 binfmt_flat: remove the unused OLD_FLAT_FLAG_RAM definition
In reply to Christoph Hellwig--- include/linux/flat.h | 3 --- 1 file changed, 3 deletions(-)
include/linux/flat.h +0 -3
@@ -72,15 +72,12 @@ typedef union {# if defined(mc68000) && !defined(CONFIG_COLDFIRE ) signed long offset : 30; unsigned long type : 2; -# define OLD_FLAT_FLAG_RAM 0x1/* load program entirely into RAM */ # elif defined(__BIG_ENDIAN_BITFIELD) unsigned long type : 2; signed long offset : 30; -# define OLD_FLAT_FLAG_RAM 0x1/* load program entirely into RAM */ # elif defined(__LITTLE_ENDIAN_BITFIELD) signed long offset : 30; unsigned long type : 2; -# define OLD_FLAT_FLAG_RAM 0x1/* load program entirely into RAM */ # else # error "Unknown bitfield order for flat files."# endif
Signature · 1 line
2.20.1
PATCH 8/17 binfmt_flat: consolidate two version of flat_v2_reloc_t
In reply to Christoph HellwigTwo branches of the ifdef maze actually have the same content, so merge them.
--- include/linux/flat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
include/linux/flat.h +2 -4
@@ -69,15 +69,13 @@ struct flat_hdr { typedef union { unsigned long value; struct { -# if defined(mc68000) && !defined(CONFIG_COLDFIRE) +#if defined(__LITTLE_ENDIAN_BITFIELD) || \ + (defined(mc68000) && !defined(CONFIG_COLDFIRE)) signed long offset : 30; unsigned long type : 2; # elif defined(__BIG_ENDIAN_BITFIELD) unsigned long type : 2; signed long offset : 30; -# elif defined(__LITTLE_ENDIAN_BITFIELD) - signed long offset : 30; - unsigned long type : 2; # else # error "Unknown bitfield order for flat files." # endif
Signature · 1 line
2.20.1
Al Viro
maintainerRe: [PATCH 08/17] binfmt_flat: consolidate two version of flat_v2_reloc_t
Quoted 33 lines · Christoph Hellwig
Two branches of the ifdef maze actually have the same content, so merge them.
Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/flat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)include/linux/flat.h +2
-4@@ -69,15 +69,13 @@ struct flat_hdr { typedef union { unsigned long value; struct { -# if defined(mc68000) && !defined(CONFIG_COLDFIRE) +#if defined(__LITTLE_ENDIAN_BITFIELD) || \ + (defined(mc68000) && !defined(CONFIG_COLDFIRE)) signed long offset : 30; unsigned long type : 2; # elif defined(__BIG_ENDIAN_BITFIELD) unsigned long type : 2; signed long offset : 30; -# elif defined(__LITTLE_ENDIAN_BITFIELD) - signed long offset : 30; - unsigned long type : 2; # else # error "Unknown bitfield order for flat files." # endifSignature · 1 line
2.20.1
FWIW, I wonder if keeping that type is worth bothering. Something likeold_reloc(__be32 reloc)
{
u32 v = be32_to_cpu(reloc);
int offset, type;#if (defined(mc68000) && !defined(CONFIG_COLDFIRE)) /* old m68k uses unusual format - type is in lower bits of octet 3 */ type = v % 4; offset = (int)v / 4; #else /* everything else (including coldfire) has it in upper bits of octet 0 */ type = v >> 30; offset = (int)(v << 2) >> 2; /* or (v & 0x1fffffff) - (v & 0x20000000) * 4 */ #endif ...
and to hell with bitfields, aliasing unions, etc. Unless I'm misreading the whole thing, that is... Greg?
Re: [PATCH 08/17] binfmt_flat: consolidate two version of flat_v2_reloc_t
Quoted 53 lines · Al Viro
Quoted 33 lines · Christoph Hellwig
Two branches of the ifdef maze actually have the same content, so merge them.
Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/flat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)include/linux/flat.h +2
-4@@ -69,15 +69,13 @@ struct flat_hdr { typedef union { unsigned long value; struct { -# if defined(mc68000) && !defined(CONFIG_COLDFIRE) +#if defined(__LITTLE_ENDIAN_BITFIELD) || \ + (defined(mc68000) && !defined(CONFIG_COLDFIRE)) signed long offset : 30; unsigned long type : 2; # elif defined(__BIG_ENDIAN_BITFIELD) unsigned long type : 2; signed long offset : 30; -# elif defined(__LITTLE_ENDIAN_BITFIELD) - signed long offset : 30; - unsigned long type : 2; # else # error "Unknown bitfield order for flat files." # endifSignature · 1 line
2.20.1FWIW, I wonder if keeping that type is worth bothering. Something like
old_reloc(__be32 reloc){ u32 v = be32_to_cpu(reloc); int offset, type;#if (defined(mc68000) && !defined(CONFIG_COLDFIRE)) /* old m68k uses unusual format - type is in lower bits of octet 3 */ type = v % 4; offset = (int)v / 4; #else /* everything else (including coldfire) has it in upper bits of octet 0 */ type = v >> 30; offset = (int)(v << 2) >> 2; /* or (v & 0x1fffffff) - (v & 0x20000000) * 4 */ #endif ...
Quoted 2 lines
and to hell with bitfields, aliasing unions, etc. Unless I'm misreading the whole thing, that is... Greg?
I think you are right. This is much better.
The old mc6800 is the odd one out, the rest have it in network order, and this makes that much clearer.
Regards
Greg
Geert Uytterhoeven
maintainerRe: [PATCH 08/17] binfmt_flat: consolidate two version of flat_v2_reloc_t
Hi Greg,
Quoted 54 lines · Greg Ungerer
Quoted 53 lines · Al Viro
Quoted 31 lines · Christoph Hellwig
Two branches of the ifdef maze actually have the same content, so merge them.
Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/flat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)include/linux/flat.h +2
-5@@ -69,15 +69,13 @@ struct flat_hdr { typedef union { unsigned long value; struct { -# if defined(mc68000) && !defined(CONFIG_COLDFIRE) +#if defined(__LITTLE_ENDIAN_BITFIELD) || \ + (defined(mc68000) && !defined(CONFIG_COLDFIRE)) signed long offset : 30; unsigned long type : 2; # elif defined(__BIG_ENDIAN_BITFIELD) unsigned long type : 2; signed long offset : 30; -# elif defined(__LITTLE_ENDIAN_BITFIELD) - signed long offset : 30; - unsigned long type : 2; # else # error "Unknown bitfield order for flat files." # endif --Quoted 2 lines
2.20.1
FWIW, I wonder if keeping that type is worth bothering. Something like
old_reloc(__be32 reloc){ u32 v = be32_to_cpu(reloc); int offset, type;#if (defined(mc68000) && !defined(CONFIG_COLDFIRE)) /* old m68k uses unusual format - type is in lower bits of octet 3 */ type = v % 4; offset = (int)v / 4; #else /* everything else (including coldfire) has it in upper bits of octet 0 */ type = v >> 30; offset = (int)(v << 2) >> 2; /* or (v & 0x1fffffff) - (v & 0x20000000) * 4 */ #endif ...
Quoted 6 lines
Quoted 2 lines
and to hell with bitfields, aliasing unions, etc. Unless I'm misreading the whole thing, that is... Greg?
I think you are right. This is much better.
The old mc6800 is the odd one out, the rest have it in network order, and this makes that much clearer.
Is that correct for Microblaze, which can be big or little endian?
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 08/17] binfmt_flat: consolidate two version of flat_v2_reloc_t
Hi Geert,
Quoted 57 lines · Geert Uytterhoeven
Hi Greg,
Quoted 54 lines · Greg Ungerer
Quoted 53 lines · Al Viro
Quoted 31 lines · Christoph Hellwig
Two branches of the ifdef maze actually have the same content, so merge them.
Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/flat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)include/linux/flat.h +2
-5@@ -69,15 +69,13 @@ struct flat_hdr { typedef union { unsigned long value; struct { -# if defined(mc68000) && !defined(CONFIG_COLDFIRE) +#if defined(__LITTLE_ENDIAN_BITFIELD) || \ + (defined(mc68000) && !defined(CONFIG_COLDFIRE)) signed long offset : 30; unsigned long type : 2; # elif defined(__BIG_ENDIAN_BITFIELD) unsigned long type : 2; signed long offset : 30; -# elif defined(__LITTLE_ENDIAN_BITFIELD) - signed long offset : 30; - unsigned long type : 2; # else # error "Unknown bitfield order for flat files." # endif --Quoted 2 lines
2.20.1
FWIW, I wonder if keeping that type is worth bothering. Something like
old_reloc(__be32 reloc){ u32 v = be32_to_cpu(reloc); int offset, type;#if (defined(mc68000) && !defined(CONFIG_COLDFIRE)) /* old m68k uses unusual format - type is in lower bits of octet 3 */ type = v % 4; offset = (int)v / 4; #else /* everything else (including coldfire) has it in upper bits of octet 0 */ type = v >> 30; offset = (int)(v << 2) >> 2; /* or (v & 0x1fffffff) - (v & 0x20000000) * 4 */ #endif ...
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
and to hell with bitfields, aliasing unions, etc. Unless I'm misreading the whole thing, that is... Greg?
I think you are right. This is much better.
The old mc6800 is the odd one out, the rest have it in network order, and this makes that much clearer.Is that correct for Microblaze, which can be big or little endian?
It is true for all architectures that use flat. All fields inside a flat format binary are store in network order.
The final processing of the relocation entries in the elf2flt converter tool:
for (i=0; i<reloc_len; i++) reloc[i] = htonl(reloc[i]);
Regards
Greg
PATCH 9/17 binfmt_flat: use fixed size type for the on-disk format
In reply to Christoph HellwigSo far binfmt_flat has only been supported on 32-bit platforms, so the variable size of the fields didn't matter. But the upcoming RISC-V nommu port supports 64-bit CPUs, and we now have a conflict between the elf2flt creation tool that always uses 32-bit fields and the kernel that uses (unsigned) long field. Switch to the userspace view as the rest of the binfmt_flat format is completely architecture neutral, and binfmt_flat isn't the right binary format for huge executables to start with.
While we're at it also ensure these fields are using __be types as they big endian and are byte swapped when loaded.
--- include/linux/flat.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
include/linux/flat.h +22 -22
@@ -24,26 +24,26 @@*/ struct flat_hdr { -char magic[4 ]; -unsigned long rev;/* version (as above) */ -unsigned long entry;/* Offset of first executable instruction -with text segment from beginning of file */ -unsigned long data_start;/* Offset of data segment from beginning of -file */ -unsigned long data_end;/* Offset of end of data segment -from beginning of file */ -unsigned long bss_end;/* Offset of end of bss segment from beginning -of file */ +char magic[4 ]; +__be32 rev;/* version (as above) */ +__be32 entry;/* Offset of first executable instruction +with text segment from beginning of file */ +__be32 data_start;/* Offset of data segment from beginning of +file */ +__be32 data_end;/* Offset of end of data segment from beginning +of file */ +__be32 bss_end;/* Offset of end of bss segment from beginning +of file */ /* (It is assumed that data_end through bss_end forms the bss segment.) */ -unsigned long stack_size;/* Size of stack, in bytes */ -unsigned long reloc_start;/* Offset of relocation records from -beginning of file */ -unsigned long reloc_count;/* Number of relocation records */ -unsigned long flags; -unsigned long build_date;/* When the program/library was built */ -unsigned long filler[5 ];/* Reservered, set to zero */ +__be32 stack_size;/* Size of stack, in bytes */ +__be32 reloc_start;/* Offset of relocation records from beginning of +file */ +__be32 reloc_count;/* Number of relocation records */ +__be32 flags; +__be32 build_date;/* When the program/library was built */ +__u32 filler[5 ];/* Reservered, set to zero */ };#define FLAT_FLAG_RAM 0x0001/* load program entirely into RAM */
@@ -67,15 +67,15 @@ struct flat_hdr {#define OLD_FLAT_RELOC_TYPE_BSS 2 typedef union { - unsigned long value; + u32 value; struct { #if defined(__LITTLE_ENDIAN_BITFIELD) || \ (defined(mc68000) && !defined(CONFIG_COLDFIRE)) - signed long offset : 30; - unsigned long type : 2; + s32 offset : 30; + u32 type : 2; # elif defined(__BIG_ENDIAN_BITFIELD) - unsigned long type : 2; - signed long offset : 30; + u32 type : 2; + s32 offset : 30; # else # error "Unknown bitfield order for flat files." # endif
Signature · 1 line
2.20.1
PATCH 10/17 binfmt_flat: add endianess annotations
In reply to Christoph HellwigMost binfmt_flat on-disk fields are big endian. Use the proper __be32 type where applicable.
--- fs/binfmt_flat.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
fs/binfmt_flat.c +16 -10
@@ -421,7 +421,8 @@ static int load_flat_file(struct linux_binprm *bprm,unsigned long textpos, datapos, realdatastart;u32 text_len, data_len, bss_len, stack_len, full_data, flags;unsigned long len, memp, memp_size, extra, rlim; -u32 __user *reloc, *rp; +__be32 __user *reloc; +u32 __user *rp;struct inode *inode;int i, rev, relocs;loff_t fpos;
@@ -594,7 +595,7 @@ static int load_flat_file(struct linux_binprm *bprm, goto err; } - reloc = (u32 __user *) + reloc = (__be32 __user *) (datapos + (ntohl (hdr->reloc_start) - text_len)); memp = realdatastart; memp_size = len;
@@ -619,7 +620,7 @@ static int load_flat_file(struct linux_binprm *bprm, MAX_SHARED_LIBS * sizeof(u32), FLAT_DATA_ALIGN); - reloc = (u32 __user *) + reloc = (__be32 __user *) (datapos + (ntohl (hdr->reloc_start) - text_len)); memp = textpos; memp_size = len;
@@ -785,15 +786,16 @@ static int load_flat_file(struct linux_binprm *bprm,u32 __maybe_unused persistent =0 ;for (i =0 ; i < relocs; i++) {u32 addr, relval; +__be32 tmp;/* * Get the address of the pointer to be * relocated (of course, the address has to be * relocated first). */ -if (get_user (relval, reloc + i)) +if (get_user (tmp, reloc + i))return -EFAULT ; - relval =ntohl (relval); + relval =ntohl (tmp); addr =flat_get_relocate_addr (relval); rp = (u32 __user *)calc_reloc (addr, libinfo, id,1 );if (rp = (u32 __user *)RELOC_FAILED ) {
@@ -812,8 +814,13 @@ static int load_flat_file(struct linux_binprm *bprm,* Do the relocation. PIC relocs in the data section are * already in target order */ -if ((flags &FLAT_FLAG_GOTPIC ) =0 ) - addr =ntohl (addr); +if ((flags &FLAT_FLAG_GOTPIC ) =0 ) { +/* +* Meh, the same value can have a different +* byte order based on a flag.. +*/ + addr =ntohl ((__force __be32 )addr); + } addr =calc_reloc (addr, libinfo, id,0 );if (addr =RELOC_FAILED ) { ret = -ENOEXEC ;
@@ -828,11 +835,10 @@ static int load_flat_file(struct linux_binprm *bprm, } }else {for (i =0 ; i < relocs; i++) { -u32 relval; +__be32 relval;if (get_user (relval, reloc + i))return -EFAULT ; - relval =ntohl (relval); -old_reloc (relval); +old_reloc (ntohl (relval)); } }
Signature · 1 line
2.20.1
PATCH 11/17 binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option
In reply to Christoph HellwigAllow architectures to opt into ARCH_HAS_BINFMT_FLAT support instead of assuming that all nommu ports support the format.
--- arch/arm/Kconfig | 1 + arch/c6x/Kconfig | 1 + arch/h8300/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/xtensa/Kconfig | 1 + fs/Kconfig.binfmt | 5 ++++- 8 files changed, 11 insertions(+), 1 deletion(-)
arch/arm/Kconfig +1 -0
@@ -4,6 +4,7 @@ config ARM default y select ARCH_32BIT_OFF_T select ARCH_CLOCKSOURCE_DATA + select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_ELF_RANDOMIZE
arch/c6x/Kconfig +1 -0
@@ -7,6 +7,7 @@ config C6X def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE select CLKDEV_LOOKUP
arch/h8300/Kconfig +1 -0
@@ -2,6 +2,7 @@ config H8300 def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_BINFMT_FLAT select BINFMT_FLAT_ARGVP_ENVP_ON_STACK select BINFMT_FLAT_OLD_ALWAYS_RAM select GENERIC_ATOMIC64
arch/m68k/Kconfig +1 -0
@@ -3,6 +3,7 @@ config M68K bool default y select ARCH_32BIT_OFF_T + select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select ARCH_NO_COHERENT_DMA_MMAP if !MMU
arch/microblaze/Kconfig +1 -0
@@ -3,6 +3,7 @@ config MICROBLAZE def_bool y select ARCH_32BIT_OFF_T select ARCH_NO_SWAP + select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_DMA_COHERENT_TO_PFN if MMU select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_SYNC_DMA_FOR_CPU
arch/sh/Kconfig +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config SUPERH def_bool y + select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_MIGHT_HAVE_PC_PARPORT
arch/xtensa/Kconfig +1 -0
@@ -2,6 +2,7 @@ config XTENSA def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_NO_COHERENT_DMA_MMAP if !MMU
fs/Kconfig.binfmt +4 -1
@@ -91,9 +91,12 @@ config BINFMT_SCRIPT Most systems will not boot if you say M or N here. If unsure, say Y. +config ARCH_HAS_BINFMT_FLAT + bool + config BINFMT_FLAT bool "Kernel support for flat binaries" - depends on !MMU || ARM || M68K + depends on ARCH_HAS_BINFMT_FLAT help Support uClinux FLAT format binaries.
Signature · 1 line
2.20.1
PATCH 12/17 binfmt_flat: make support for old format binaries optional
In reply to Christoph HellwigNo need to carry the extra code around, given that systems using flat binaries are generally very resource constrained.
--- fs/Kconfig.binfmt | 7 +++++++ fs/binfmt_flat.c | 30 ++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-)
fs/Kconfig.binfmt +7 -0
@@ -106,6 +106,13 @@ config BINFMT_FLAT_ARGVP_ENVP_ON_STACK config BINFMT_FLAT_OLD_ALWAYS_RAM bool +config BINFMT_FLAT_OLD + bool "Enable support for very old legacy flat binaries" + depends on BINFMT_FLAT + help + Support decade old uClinux FLAT format binaries. Unless you know + you have some of those say N here. + config BINFMT_ZFLAT bool "Enable ZFLAT support" depends on BINFMT_FLAT
fs/binfmt_flat.c +22 -8
@@ -374,6 +374,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)/****************************************************************************/ +#ifdef CONFIG_BINFMT_FLAT_OLD static void old_reloc (unsigned long rl) {static const char *segment[] = {"TEXT" ,"DATA" ,"BSS" ,"*UNKNOWN*" };
@@ -411,6 +412,7 @@ static void old_reloc(unsigned long rl) pr_debug("Relocation became %lx\n", val); } +#endif /* CONFIG_BINFMT_FLAT_OLD */ /****************************************************************************/
@@ -461,6 +463,7 @@ static int load_flat_file(struct linux_binprm *bprm,if (flags &FLAT_FLAG_KTRACE )pr_info ("Loading file: %s\n" , bprm->filename); +#ifdef CONFIG_BINFMT_FLAT_OLD if (rev !=FLAT_VERSION && rev !=OLD_FLAT_VERSION ) {pr_err ("bad flat file version 0x%x (supported 0x%lx and 0x%lx)\n" , rev,FLAT_VERSION ,OLD_FLAT_VERSION );
@@ -476,6 +479,23 @@ static int load_flat_file(struct linux_binprm *bprm, goto err; } +/* +* fix up the flags for the older format, there were all kinds +* of endian hacks, this only works for the simple cases +*/ +if (rev =OLD_FLAT_VERSION && + (flags ||IS_ENABLED (CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM ))) + flags =FLAT_FLAG_RAM ; + +#else /* CONFIG_BINFMT_FLAT_OLD */ +if (rev !=FLAT_VERSION ) { +pr_err ("bad flat file version 0x%x (supported 0x%lx)\n" , + rev,FLAT_VERSION ); + ret = -ENOEXEC ; + goto err; + } +#endif /* !CONFIG_BINFMT_FLAT_OLD */ +/* * Make sure the header params are sane. * 28 bits (256 MB) is way more than reasonable in this case.
@@ -487,14 +507,6 @@ static int load_flat_file(struct linux_binprm *bprm, goto err; } -/* -* fix up the flags for the older format, there were all kinds -* of endian hacks, this only works for the simple cases -*/ -if (rev =OLD_FLAT_VERSION && - (flags ||IS_ENABLED (CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM ))) - flags =FLAT_FLAG_RAM ; -#ifndef CONFIG_BINFMT_ZFLAT if (flags & (FLAT_FLAG_GZIP |FLAT_FLAG_GZDATA )) {pr_err ("Support for ZFLAT executables is not enabled.\n" );
@@ -833,6 +845,7 @@ static int load_flat_file(struct linux_binprm *bprm, goto err; } } +#ifdef CONFIG_BINFMT_FLAT_OLD }else {for (i =0 ; i < relocs; i++) {__be32 relval;
@@ -840,6 +853,7 @@ static int load_flat_file(struct linux_binprm *bprm,return -EFAULT ; old_reloc(ntohl(relval)); } +#endif /* CONFIG_BINFMT_FLAT_OLD */ }flush_icache_range (start_code, end_code);
Signature · 1 line
2.20.1
PATCH 13/17 binfmt_flat: provide an asm-generic/flat.h
In reply to Christoph HellwigThis file implements the flat get/put reloc helpers for architectures that do not need to overload the relocs by simply using get_user/put_user.
Note that many nommu architectures currently use {get,put}_unaligned, which looks a little bogus and should probably later be switched over to this version as well.
---
arch/arm/include/asm/Kbuild | 1 +
arch/m68k/include/asm/flat.h | 21 +------------------
.../asm => include/asm-generic}/flat.h | 12 ++++-------
3 files changed, 6 insertions(+), 28 deletions(-)
rename {arch/arm/include/asm => include/asm-generic}/flat.h (73%)arch/arm/include/asm/Kbuild +1 -0
@@ -5,6 +5,7 @@ generic-y += early_ioremap.h generic-y += emergency-restart.h generic-y += exec.h generic-y += extable.h +generic-y += flat.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += local.h
arch/m68k/include/asm/flat.h +1 -20
@@ -6,26 +6,7 @@#ifndef __M68KNOMMU_FLAT_H__#define __M68KNOMMU_FLAT_H__ -#include <linux/uaccess.h> - -static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) -{ -#ifdef CONFIG_CPU_HAS_NO_UNALIGNED -return copy_from_user (addr, rp,4 ) ? -EFAULT :0 ; -#else -return get_user (*addr, rp); -#endif -} - -static inline int flat_put_addr_at_rp (u32 __user *rp,u32 addr,u32 rel) -{ -#ifdef CONFIG_CPU_HAS_NO_UNALIGNED -return copy_to_user (rp, &addr,4 ) ? -EFAULT :0 ; -#else -return put_user (addr, rp); -#endif -} +#include <asm-generic/flat.h> #define FLAT_PLAT_INIT (regs) \ do { \
include/asm-generic/flat.h renamed from arch/arm/include/asm/flat.h +4 -8
@@ -1,15 +1,11 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* -* arch/arm/include/asm/flat.h -- uClinux flat-format executables -*/ - -#ifndef __ARM_FLAT_H__ -#define __ARM_FLAT_H__ +#ifndef _ASM_GENERIC_FLAT_H +#define _ASM_GENERIC_FLAT_H#include <linux/uaccess.h> static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr,u32 *persistent) {#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS return copy_from_user (addr, rp,4 ) ? -EFAULT :0 ;
@@ -27,4 +23,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) #endif } -#endif /* __ARM_FLAT_H__ */ +#endif /* _ASM_GENERIC_FLAT_H */
Signature · 1 line
2.20.1
PATCH 14/17 binfmt_flat: remove the persistent argument from flat_get_addr_from_rp
In reply to Christoph HellwigThe argument is never used.
--- arch/c6x/include/asm/flat.h | 2 +- arch/h8300/include/asm/flat.h | 2 +- arch/microblaze/include/asm/flat.h | 2 +- arch/sh/include/asm/flat.h | 2 +- arch/xtensa/include/asm/flat.h | 2 +- fs/binfmt_flat.c | 4 +--- include/asm-generic/flat.h | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-)
arch/c6x/include/asm/flat.h +1 -1
@@ -5,7 +5,7 @@#include <asm/unaligned.h> static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr) { *addr =get_unaligned ((__force u32 *)rp);return 0 ;
arch/h8300/include/asm/flat.h +1 -1
@@ -17,7 +17,7 @@#define flat_get_relocate_addr (rel) (rel & ~0x00000001)static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr) {u32 val =get_unaligned ((__force u32 *)rp);if (!(flags &FLAT_FLAG_GOTPIC ))
arch/microblaze/include/asm/flat.h +1 -1
@@ -28,7 +28,7 @@*/ static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr) {u32 *p = (__force u32 *)rp;
arch/sh/include/asm/flat.h +1 -1
@@ -12,7 +12,7 @@#include <asm/unaligned.h> static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr) { *addr =get_unaligned ((__force u32 *)rp);return 0 ;
arch/xtensa/include/asm/flat.h +1 -1
@@ -5,7 +5,7 @@#include <asm/unaligned.h> static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr) { *addr =get_unaligned ((__force u32 *)rp);return 0 ;
fs/binfmt_flat.c +1 -3
@@ -795,7 +795,6 @@ static int load_flat_file(struct linux_binprm *bprm,* __start to address 4 so that is okay). */ if (rev >OLD_FLAT_VERSION ) { -u32 __maybe_unused persistent =0 ;for (i =0 ; i < relocs; i++) {u32 addr, relval;__be32 tmp;
@@ -816,8 +815,7 @@ static int load_flat_file(struct linux_binprm *bprm, }/* Get the pointer's value. */ - ret =flat_get_addr_from_rp (rp, relval, flags, - &addr, &persistent); + ret =flat_get_addr_from_rp (rp, relval, flags, &addr);if (unlikely (ret)) goto err;
include/asm-generic/flat.h +1 -1
@@ -5,7 +5,7 @@#include <linux/uaccess.h> static inline int flat_get_addr_from_rp (u32 __user *rp,u32 relval,u32 flags, -u32 *addr,u32 *persistent) +u32 *addr) {#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS return copy_from_user (addr, rp,4 ) ? -EFAULT :0 ;
Signature · 1 line
2.20.1
PATCH 15/17 binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c
In reply to Christoph HellwigMAX_SHARED_LIBS is an implementation detail of the kernel loader, and should be kept away from the file format definition.
--- fs/binfmt_flat.c | 6 ++++++ include/linux/flat.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
fs/binfmt_flat.c +6 -0
@@ -68,6 +68,12 @@#define RELOC_FAILED 0xff00ff01/* Relocation incorrect somewhere */ #define UNLOADED_LIB 0x7ff000ff/* Placeholder for unused library */ +#ifdef CONFIG_BINFMT_SHARED_FLAT +#define MAX_SHARED_LIBS (4) +#else +#define MAX_SHARED_LIBS (1) +#endif +struct lib_info {struct {unsigned long start_code;/* Start of text segment */
include/linux/flat.h +0 -6
@@ -12,12 +12,6 @@#define FLAT_VERSION 0x00000004L -#ifdef CONFIG_BINFMT_SHARED_FLAT -#define MAX_SHARED_LIBS (4) -#else -#define MAX_SHARED_LIBS (1) -#endif -/* * To make everything easier to port and manage cross platform * development, all fields are in network byte order.
Signature · 1 line
2.20.1
Re: [PATCH 15/17] binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c
Hello!
Quoted 14 lines · Christoph Hellwig
MAX_SHARED_LIBSis an implementation detail of the kernel loader, and should be kept away from the file format definition.Signed-off-by Christoph Hellwig <[email protected]>--- fs/binfmt_flat.c | 6 ++++++ include/linux/flat.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)fs/binfmt_flat.c +0
-0
fs/binfmt_flat.c line 75
Quoted 8 lines
fs/binfmt_flat.c +5
-0@@ -68,6 +68,12 @@#define RELOC_FAILED 0xff00ff01/* Relocation incorrect somewhere */ #define UNLOADED_LIB 0x7ff000ff/* Placeholder for unused library */ +#ifdef CONFIG_BINFMT_SHARED_FLAT +#define MAX_SHARED_LIBS (4) +#else +#define MAX_SHARED_LIBS (1) +#endif
Perhaps the time to remove ()?
[...]
MBR, Sergei
PATCH 16/17 binfmt_flat: don't offset the data start
In reply to Christoph HellwigEver since the initial commit of the binfmt_flat shared library support back in the bitkeeper days we've offset the actual in-memory .data start by one field per possible shared library, or 1 in case shared library support isn't enabled. I can't find anything in the loader that actually makes use of it, nor was it present before shared library support it.
--- fs/binfmt_flat.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
fs/binfmt_flat.c +8 -12
@@ -573,7 +573,7 @@ static int load_flat_file(struct linux_binprm *bprm, goto err; } - len = data_len + extra +MAX_SHARED_LIBS *sizeof (unsigned long ); + len = data_len + extra; len =PAGE_ALIGN (len); realdatastart =vm_mmap (NULL ,0 , len,PROT_READ |PROT_WRITE |PROT_EXEC ,MAP_PRIVATE ,0 );
@@ -587,9 +587,7 @@ static int load_flat_file(struct linux_binprm *bprm,vm_munmap (textpos, text_len); goto err; } - datapos =ALIGN (realdatastart + -MAX_SHARED_LIBS *sizeof (unsigned long ), -FLAT_DATA_ALIGN ); + datapos =ALIGN (realdatastart,FLAT_DATA_ALIGN );pr_debug ("Allocated data+bss+stack (%u bytes): %lx\n" , data_len + bss_len + stack_len, datapos);
@@ -619,7 +617,7 @@ static int load_flat_file(struct linux_binprm *bprm, memp_size = len; }else { - len = text_len + data_len + extra +MAX_SHARED_LIBS *sizeof (u32); + len = text_len + data_len + extra; len =PAGE_ALIGN (len); textpos =vm_mmap (NULL ,0 , len,PROT_READ |PROT_EXEC |PROT_WRITE ,MAP_PRIVATE ,0 );
@@ -634,9 +632,7 @@ static int load_flat_file(struct linux_binprm *bprm, } realdatastart = textpos +ntohl (hdr->data_start); - datapos =ALIGN (realdatastart + -MAX_SHARED_LIBS *sizeof (u32), -FLAT_DATA_ALIGN ); + datapos =ALIGN (realdatastart,FLAT_DATA_ALIGN ); reloc = (__be32 __user *) (datapos + (ntohl (hdr->reloc_start) - text_len));
@@ -653,8 +649,9 @@ static int load_flat_file(struct linux_binprm *bprm, (text_len + full_data -sizeof (struct flat_hdr )), 0); -memmove ((void *) datapos, (void *) realdatastart, - full_data); +if (datapos != realdatastart) +memmove ((void *)datapos, (void *)realdatastart, + full_data);#else /* * This is used on MMU systems mainly for testing.
@@ -710,8 +707,7 @@ static int load_flat_file(struct linux_binprm *bprm,if (IS_ERR_VALUE (result)) { ret = result;pr_err ("Unable to read code+data+bss, errno %d\n" , ret); -vm_munmap (textpos, text_len + data_len + extra + -MAX_SHARED_LIBS *sizeof (u32)); +vm_munmap (textpos, text_len + data_len + extra); goto err; } }
Signature · 1 line
2.20.1
PATCH 17/17 riscv: add binfmt_flat support
In reply to Christoph HellwigJust use the generic definitions.
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/Kbuild | 1 + 2 files changed, 2 insertions(+)
arch/riscv/Kconfig +1 -0
@@ -17,6 +17,7 @@ config RISCV select OF select OF_EARLY_FLATTREE select OF_IRQ + select ARCH_HAS_BINFMT_FLAT select ARCH_WANT_FRAME_POINTERS select CLONE_BACKWARDS select COMMON_CLK
arch/riscv/include/asm/Kbuild +1 -0
@@ -5,6 +5,7 @@ generic-y += compat.h generic-y += device.h generic-y += div64.h generic-y += extable.h +generic-y += flat.h generic-y += dma.h generic-y += dma-contiguous.h generic-y += dma-mapping.h
Signature · 1 line
2.20.1
Hi Christoph,
Quoted 9 lines · Christoph Hellwig
below is a larger stash of cleanups for the
binfmt_misccode, preparing for the last patch that now trivially adds RISC-V support, which will be used for the RISC-V nommu series I am about to post.Changes since v2:
- fix the handling of old format flags
- don't pass arguments on stack for RISC-V
- small cleanups forflat_v2_reloc_t
Thanks for doing this work. Tested and works for me on m68k/Coldfire too.
I have pushed these onto the for-next branch of the m68knommu git tree.
Regards
Greg