[PATCH 0/3] bsd-user: image_info cleanups

[PATCH 0/3] bsd-user: image_info cleanups

[Richard Henderson]

This mirrors some changes I've posted for linux-user,
removing stuff from image_info which is unused.


r~


Richard Henderson (3):
  bsd-user: Remove ELF_START_MMAP and image_info.start_mmap
  bsd-user: Remove image_info.mmap
  bsd-user: Remove image_info.start_brk

 bsd-user/arm/target_arch_elf.h    | 1 -
 bsd-user/i386/target_arch_elf.h   | 1 -
 bsd-user/qemu.h                   | 3 ---
 bsd-user/x86_64/target_arch_elf.h | 1 -
 bsd-user/elfload.c                | 4 +---
 bsd-user/main.c                   | 2 --
 6 files changed, 1 insertion(+), 11 deletions(-)

-- 
2.34.1

[PATCH 1/3] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap

[Richard Henderson]

The start_mmap value is write-only.
Remove the field and the defines that populated it.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/arm/target_arch_elf.h    | 1 -
 bsd-user/i386/target_arch_elf.h   | 1 -
 bsd-user/qemu.h                   | 1 -
 bsd-user/x86_64/target_arch_elf.h | 1 -
 bsd-user/elfload.c                | 1 -
 5 files changed, 5 deletions(-)

diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h
index 935bce347f..b1c0fd2b32 100644
--- a/bsd-user/arm/target_arch_elf.h
+++ b/bsd-user/arm/target_arch_elf.h
@@ -20,7 +20,6 @@
 #ifndef TARGET_ARCH_ELF_H
 #define TARGET_ARCH_ELF_H
 
-#define ELF_START_MMAP 0x80000000
 #define ELF_ET_DYN_LOAD_ADDR    0x500000
 
 #define elf_check_arch(x) ((x) == EM_ARM)
diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h
index cbcd1f08e2..4ac27b02e7 100644
--- a/bsd-user/i386/target_arch_elf.h
+++ b/bsd-user/i386/target_arch_elf.h
@@ -20,7 +20,6 @@
 #ifndef TARGET_ARCH_ELF_H
 #define TARGET_ARCH_ELF_H
 
-#define ELF_START_MMAP 0x80000000
 #define ELF_ET_DYN_LOAD_ADDR    0x01001000
 #define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
 
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8f2d6a3c78..178114b423 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -52,7 +52,6 @@ struct image_info {
     abi_ulong end_data;
     abi_ulong start_brk;
     abi_ulong brk;
-    abi_ulong start_mmap;
     abi_ulong mmap;
     abi_ulong rss;
     abi_ulong start_stack;
diff --git a/bsd-user/x86_64/target_arch_elf.h b/bsd-user/x86_64/target_arch_elf.h
index b244711888..e51c2faf08 100644
--- a/bsd-user/x86_64/target_arch_elf.h
+++ b/bsd-user/x86_64/target_arch_elf.h
@@ -20,7 +20,6 @@
 #ifndef TARGET_ARCH_ELF_H
 #define TARGET_ARCH_ELF_H
 
-#define ELF_START_MMAP 0x2aaaaab000ULL
 #define ELF_ET_DYN_LOAD_ADDR    0x01021000
 #define elf_check_arch(x) (((x) == ELF_ARCH))
 
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 1f650bdde8..38a3439d2c 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
     /* OK, This is the point of no return */
     info->end_data = 0;
     info->end_code = 0;
-    info->start_mmap = (abi_ulong)ELF_START_MMAP;
     info->mmap = 0;
     elf_entry = (abi_ulong) elf_ex.e_entry;
 
-- 
2.34.1

[PATCH 2/3] bsd-user: Remove image_info.mmap

[Richard Henderson]

This value is unused.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/qemu.h    | 1 -
 bsd-user/elfload.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 178114b423..898fe3e8b3 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -52,7 +52,6 @@ struct image_info {
     abi_ulong end_data;
     abi_ulong start_brk;
     abi_ulong brk;
-    abi_ulong mmap;
     abi_ulong rss;
     abi_ulong start_stack;
     abi_ulong entry;
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 38a3439d2c..2d39e59258 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
     /* OK, This is the point of no return */
     info->end_data = 0;
     info->end_code = 0;
-    info->mmap = 0;
     elf_entry = (abi_ulong) elf_ex.e_entry;
 
     /* XXX Join this with PT_INTERP search? */
-- 
2.34.1

[PATCH 3/3] bsd-user: Remove image_info.start_brk

[Richard Henderson]

This has the same value is image_info.brk, which is also logged,
and is otherwise unused.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/qemu.h    | 1 -
 bsd-user/elfload.c | 2 +-
 bsd-user/main.c    | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 898fe3e8b3..61501c321b 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -50,7 +50,6 @@ struct image_info {
     abi_ulong end_code;
     abi_ulong start_data;
     abi_ulong end_data;
-    abi_ulong start_brk;
     abi_ulong brk;
     abi_ulong rss;
     abi_ulong start_stack;
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 2d39e59258..baf2f63d2f 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -811,7 +811,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
                                        bprm->stringp, &elf_ex, load_addr,
                                        et_dyn_addr, interp_load_addr, info);
     info->load_addr = reloc_func_desc;
-    info->start_brk = info->brk = elf_brk;
+    info->brk = elf_brk;
     info->start_stack = bprm->p;
     info->load_bias = 0;
 
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 381bb18df8..f913cb55a7 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -553,8 +553,6 @@ int main(int argc, char **argv)
             fprintf(f, "page layout changed following binary load\n");
             page_dump(f);
 
-            fprintf(f, "start_brk   0x" TARGET_ABI_FMT_lx "\n",
-                    info->start_brk);
             fprintf(f, "end_code    0x" TARGET_ABI_FMT_lx "\n",
                     info->end_code);
             fprintf(f, "start_code  0x" TARGET_ABI_FMT_lx "\n",
-- 
2.34.1

Re: [PATCH 1/3] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 3007 bytes --]

On Fri, Aug 18, 2023 at 11:57 AM Richard Henderson <
richard.henderson@linaro.org> wrote:

> The start_mmap value is write-only.
> Remove the field and the defines that populated it.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>

Reviewed-by: Warner Losh <imp@bsdimp.com>

This one won't interfere with anything, but unless I hear otherwise, I'll
queue it.
It applies to the blitz branch (though it needs a few more targets there),
and none
of these files are being modified by Kariim Taha, my gsoc student.

Warner

> ---
>  bsd-user/arm/target_arch_elf.h    | 1 -
>  bsd-user/i386/target_arch_elf.h   | 1 -
>  bsd-user/qemu.h                   | 1 -
>  bsd-user/x86_64/target_arch_elf.h | 1 -
>  bsd-user/elfload.c                | 1 -
>  5 files changed, 5 deletions(-)
>
> diff --git a/bsd-user/arm/target_arch_elf.h
> b/bsd-user/arm/target_arch_elf.h
> index 935bce347f..b1c0fd2b32 100644
> --- a/bsd-user/arm/target_arch_elf.h
> +++ b/bsd-user/arm/target_arch_elf.h
> @@ -20,7 +20,6 @@
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>
> -#define ELF_START_MMAP 0x80000000
>  #define ELF_ET_DYN_LOAD_ADDR    0x500000
>
>  #define elf_check_arch(x) ((x) == EM_ARM)
> diff --git a/bsd-user/i386/target_arch_elf.h
> b/bsd-user/i386/target_arch_elf.h
> index cbcd1f08e2..4ac27b02e7 100644
> --- a/bsd-user/i386/target_arch_elf.h
> +++ b/bsd-user/i386/target_arch_elf.h
> @@ -20,7 +20,6 @@
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>
> -#define ELF_START_MMAP 0x80000000
>  #define ELF_ET_DYN_LOAD_ADDR    0x01001000
>  #define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
>
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 8f2d6a3c78..178114b423 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -52,7 +52,6 @@ struct image_info {
>      abi_ulong end_data;
>      abi_ulong start_brk;
>      abi_ulong brk;
> -    abi_ulong start_mmap;
>      abi_ulong mmap;
>      abi_ulong rss;
>      abi_ulong start_stack;
> diff --git a/bsd-user/x86_64/target_arch_elf.h
> b/bsd-user/x86_64/target_arch_elf.h
> index b244711888..e51c2faf08 100644
> --- a/bsd-user/x86_64/target_arch_elf.h
> +++ b/bsd-user/x86_64/target_arch_elf.h
> @@ -20,7 +20,6 @@
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>
> -#define ELF_START_MMAP 0x2aaaaab000ULL
>  #define ELF_ET_DYN_LOAD_ADDR    0x01021000
>  #define elf_check_arch(x) (((x) == ELF_ARCH))
>
> diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
> index 1f650bdde8..38a3439d2c 100644
> --- a/bsd-user/elfload.c
> +++ b/bsd-user/elfload.c
> @@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
> target_pt_regs *regs,
>      /* OK, This is the point of no return */
>      info->end_data = 0;
>      info->end_code = 0;
> -    info->start_mmap = (abi_ulong)ELF_START_MMAP;
>      info->mmap = 0;
>      elf_entry = (abi_ulong) elf_ex.e_entry;
>
> --
> 2.34.1
>
>

[-- Attachment #2: Type: text/html, Size: 3892 bytes --]

Re: [PATCH 2/3] bsd-user: Remove image_info.mmap

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

On Fri, Aug 18, 2023 at 11:57 AM Richard Henderson <
richard.henderson@linaro.org> wrote:

> This value is unused.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>]
>

Reviewed by: Warner Losh <imp@bsdimp.com>

Same comments as patch 1/3.

Warner


> ---
>  bsd-user/qemu.h    | 1 -
>  bsd-user/elfload.c | 1 -
>  2 files changed, 2 deletions(-)
>
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 178114b423..898fe3e8b3 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -52,7 +52,6 @@ struct image_info {
>      abi_ulong end_data;
>      abi_ulong start_brk;
>      abi_ulong brk;
> -    abi_ulong mmap;
>      abi_ulong rss;
>      abi_ulong start_stack;
>      abi_ulong entry;
> diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
> index 38a3439d2c..2d39e59258 100644
> --- a/bsd-user/elfload.c
> +++ b/bsd-user/elfload.c
> @@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
> target_pt_regs *regs,
>      /* OK, This is the point of no return */
>      info->end_data = 0;
>      info->end_code = 0;
> -    info->mmap = 0;
>      elf_entry = (abi_ulong) elf_ex.e_entry;
>
>      /* XXX Join this with PT_INTERP search? */
> --
> 2.34.1
>
>

[-- Attachment #2: Type: text/html, Size: 2007 bytes --]

Re: [PATCH 3/3] bsd-user: Remove image_info.start_brk

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 2242 bytes --]

On Fri, Aug 18, 2023 at 11:57 AM Richard Henderson <
richard.henderson@linaro.org> wrote:

> This has the same value is image_info.brk, which is also logged,
> and is otherwise unused.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>

Reviewed-by: Warner Losh <imp@bsdimp.com>

Same comments as 1/3.

Forgot on 1/3 to mention I'm planning on doing a pull request right after
the
release (subject to our release engineer's ok) and can include this there.

Warner


> ---
>  bsd-user/qemu.h    | 1 -
>  bsd-user/elfload.c | 2 +-
>  bsd-user/main.c    | 2 --
>  3 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 898fe3e8b3..61501c321b 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -50,7 +50,6 @@ struct image_info {
>      abi_ulong end_code;
>      abi_ulong start_data;
>      abi_ulong end_data;
> -    abi_ulong start_brk;
>      abi_ulong brk;
>      abi_ulong rss;
>      abi_ulong start_stack;
> diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
> index 2d39e59258..baf2f63d2f 100644
> --- a/bsd-user/elfload.c
> +++ b/bsd-user/elfload.c
> @@ -811,7 +811,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
> target_pt_regs *regs,
>                                         bprm->stringp, &elf_ex, load_addr,
>                                         et_dyn_addr, interp_load_addr,
> info);
>      info->load_addr = reloc_func_desc;
> -    info->start_brk = info->brk = elf_brk;
> +    info->brk = elf_brk;
>      info->start_stack = bprm->p;
>      info->load_bias = 0;
>
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index 381bb18df8..f913cb55a7 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -553,8 +553,6 @@ int main(int argc, char **argv)
>              fprintf(f, "page layout changed following binary load\n");
>              page_dump(f);
>
> -            fprintf(f, "start_brk   0x" TARGET_ABI_FMT_lx "\n",
> -                    info->start_brk);
>              fprintf(f, "end_code    0x" TARGET_ABI_FMT_lx "\n",
>                      info->end_code);
>              fprintf(f, "start_code  0x" TARGET_ABI_FMT_lx "\n",
> --
> 2.34.1
>
>

[-- Attachment #2: Type: text/html, Size: 3255 bytes --]

Re: [PATCH 0/3] bsd-user: image_info cleanups

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

These all look good. Right now I'm planning on queueing them for the next
pull request I have, which is all the reviewed changes from my GSoC
student's work and one submission from another user in the bsd-user fork (I
think, that one's up in the air). So next week sometime after the release
(since last time I did a pull request on a late rc, it caused rebase issues
and there's no reason for me not to wait).

Warner

On Fri, Aug 18, 2023 at 11:57 AM Richard Henderson <
richard.henderson@linaro.org> wrote:

> This mirrors some changes I've posted for linux-user,
> removing stuff from image_info which is unused.
>
>
> r~
>
>
> Richard Henderson (3):
>   bsd-user: Remove ELF_START_MMAP and image_info.start_mmap
>   bsd-user: Remove image_info.mmap
>   bsd-user: Remove image_info.start_brk
>
>  bsd-user/arm/target_arch_elf.h    | 1 -
>  bsd-user/i386/target_arch_elf.h   | 1 -
>  bsd-user/qemu.h                   | 3 ---
>  bsd-user/x86_64/target_arch_elf.h | 1 -
>  bsd-user/elfload.c                | 4 +---
>  bsd-user/main.c                   | 2 --
>  6 files changed, 1 insertion(+), 11 deletions(-)
>
> --
> 2.34.1
>
>

[-- Attachment #2: Type: text/html, Size: 1584 bytes --]

Re: [PATCH 3/3] bsd-user: Remove image_info.start_brk

[Richard Henderson]

On 8/18/23 11:22, Warner Losh wrote:
> Forgot on 1/3 to mention I'm planning on doing a pull request right after the
> release (subject to our release engineer's ok) and can include this there.

Excellent, thanks.

r~

Re: [PATCH 0/3] bsd-user: image_info cleanups

[Philippe Mathieu-Daudé]

On 18/8/23 19:57, Richard Henderson wrote:

> Richard Henderson (3):
>    bsd-user: Remove ELF_START_MMAP and image_info.start_mmap
>    bsd-user: Remove image_info.mmap
>    bsd-user: Remove image_info.start_brk

Series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 0/3] bsd-user: image_info cleanups

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

On Sat, Aug 19, 2023 at 4:44 AM Philippe Mathieu-Daudé <philmd@linaro.org>
wrote:

> On 18/8/23 19:57, Richard Henderson wrote:
>
> > Richard Henderson (3):
> >    bsd-user: Remove ELF_START_MMAP and image_info.start_mmap
> >    bsd-user: Remove image_info.mmap
> >    bsd-user: Remove image_info.start_brk
>
> Series:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>

Queued for post release freeze pull request.

[-- Attachment #2: Type: text/html, Size: 866 bytes --]