[PATCH v2 00/23] exec: Rework of various headers (user focused)

Philippe Mathieu-Daudé posted 23 patches 1 year, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231212123401.37493-1-philmd@linaro.org
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Riku Voipio <riku.voipio@iki.fi>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Gerd Hoffmann <kraxel@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Alistair Francis <alistair@alistair23.me>, BALATON Zoltan <balaton@eik.bme.hu>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Laurent Vivier <laurent@vivier.eu>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Michael Rolnik <mrolnik@gmail.com>, Brian Cain <bcain@quicinc.com>, Song Gao <gaosong@loongson.cn>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Huacai Chen <chenhuacai@kernel.org>, Chris Wulff <crwulff@gmail.com>, Marek Vasut <marex@denx.de>, Stafford Horne <shorne@gmail.com>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, Palmer Dabbelt <palmer@dabbelt.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liwei1518@gmail.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Ilya Leoshkevich <iii@linux.ibm.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Filippov <jcmvbkbc@gmail.com>
meson.build                                   |  2 +-
accel/tcg/user-retaddr.h                      | 28 +++++++++
bsd-user/bsd-mem.h                            |  1 +
bsd-user/freebsd/target_os_elf.h              |  1 +
bsd-user/freebsd/target_os_stack.h            |  1 +
bsd-user/netbsd/target_os_elf.h               |  1 +
bsd-user/openbsd/target_os_elf.h              |  1 +
bsd-user/qemu.h                               |  1 +
host/include/generic/host/atomic128-cas.h     |  2 +
host/include/generic/host/atomic128-ldst.h    |  2 +
.../generic/host/load-extract-al16-al8.h      |  3 +
include/exec/abi_ptr.h                        | 33 +++++++++++
include/exec/cpu-all.h                        | 59 ++-----------------
include/exec/cpu_ldst.h                       | 52 ++++------------
include/exec/exec-all.h                       |  1 +
include/exec/page-prot-common.h               | 38 ++++++++++++
include/exec/ram_addr.h                       |  1 +
include/exec/translator.h                     |  5 +-
include/exec/tswap.h                          | 12 +++-
include/exec/user/abitypes.h                  |  8 ++-
include/exec/user/guest-base.h                |  6 ++
include/exec/user/tswap-target.h              | 22 +++++++
include/hw/core/cpu.h                         | 11 ----
include/semihosting/uaccess.h                 |  3 +-
target/alpha/cpu-param.h                      |  3 +
target/alpha/cpu.h                            |  3 -
target/arm/cpu-param.h                        |  8 ++-
target/arm/cpu.h                              |  4 +-
target/avr/cpu-param.h                        |  2 +
target/avr/cpu.h                              |  2 -
target/hppa/cpu-param.h                       |  8 +++
target/hppa/cpu.h                             |  6 --
target/i386/cpu-param.h                       |  3 +
target/i386/cpu.h                             |  3 -
target/loongarch/cpu-param.h                  |  2 +
target/loongarch/cpu.h                        |  2 -
target/microblaze/cpu-param.h                 |  3 +
target/microblaze/cpu.h                       |  3 -
target/mips/cpu-param.h                       |  2 +
target/mips/cpu.h                             |  2 -
target/openrisc/cpu-param.h                   |  2 +
target/openrisc/cpu.h                         |  2 -
target/ppc/cpu-param.h                        |  2 +
target/ppc/cpu.h                              |  2 -
target/ppc/internal.h                         |  1 +
target/ppc/mmu-radix64.h                      |  2 +
target/riscv/cpu-param.h                      |  2 +
target/riscv/cpu.h                            |  2 -
target/s390x/cpu-param.h                      |  6 ++
target/s390x/cpu.h                            |  3 -
target/sparc/cpu-param.h                      | 23 ++++++++
target/sparc/cpu.h                            | 23 --------
target/xtensa/cpu-param.h                     |  3 +
target/xtensa/cpu.h                           |  3 -
accel/tcg/cpu-exec.c                          |  3 +
accel/tcg/cputlb.c                            |  2 +
accel/tcg/tb-maint.c                          |  1 +
accel/tcg/tcg-accel-ops.c                     |  2 +
accel/tcg/translator.c                        |  1 +
accel/tcg/user-exec.c                         |  2 +
bsd-user/main.c                               |  1 +
bsd-user/mmap.c                               |  1 +
bsd-user/signal.c                             |  2 +
bsd-user/strace.c                             |  1 +
cpu-target.c                                  |  2 +
disas/disas.c                                 |  1 +
gdbstub/gdbstub.c                             |  1 +
hw/audio/virtio-snd.c                         |  2 +-
hw/core/cpu-sysemu.c                          |  2 +-
hw/core/generic-loader.c                      |  2 +-
hw/display/vga.c                              |  2 +-
hw/ppc/ppc440_bamboo.c                        |  1 +
hw/ppc/sam460ex.c                             |  1 +
hw/ppc/virtex_ml507.c                         |  1 +
hw/virtio/virtio.c                            |  1 +
linux-user/arm/cpu_loop.c                     |  1 +
linux-user/elfload.c                          |  3 +
linux-user/i386/signal.c                      |  1 +
linux-user/main.c                             |  1 +
linux-user/mmap.c                             |  1 +
linux-user/nios2/cpu_loop.c                   |  1 +
linux-user/ppc/signal.c                       |  1 +
linux-user/signal.c                           |  1 +
linux-user/syscall.c                          |  1 +
page-target.c                                 | 43 ++++++++++++++
semihosting/guestfd.c                         |  5 +-
system/physmem.c                              | 36 +----------
target/alpha/helper.c                         |  1 +
target/arm/ptw.c                              |  1 +
target/arm/tcg/m_helper.c                     |  1 +
target/arm/tcg/mte_helper.c                   |  1 +
target/arm/tcg/sve_helper.c                   |  1 +
target/avr/helper.c                           |  1 +
target/cris/mmu.c                             |  1 +
target/hexagon/translate.c                    |  1 +
target/hppa/mem_helper.c                      |  1 +
target/hppa/translate.c                       |  1 +
target/i386/tcg/fpu_helper.c                  |  1 +
target/i386/tcg/sysemu/excp_helper.c          |  1 +
target/loongarch/tlb_helper.c                 |  1 +
target/m68k/helper.c                          |  1 +
target/microblaze/cpu.c                       |  1 +
target/microblaze/helper.c                    |  1 +
target/microblaze/mmu.c                       |  1 +
target/microblaze/translate.c                 |  1 +
target/mips/sysemu/physaddr.c                 |  1 +
target/mips/tcg/sysemu/tlb_helper.c           |  1 +
target/nios2/helper.c                         |  1 +
target/nios2/mmu.c                            |  1 +
target/nios2/translate.c                      |  1 +
target/openrisc/mmu.c                         |  1 +
target/ppc/excp_helper.c                      |  2 +-
target/ppc/mmu-hash32.c                       |  1 +
target/ppc/mmu-hash64.c                       |  1 +
target/ppc/mmu-radix64.c                      |  1 +
target/ppc/mmu_common.c                       |  1 +
target/ppc/mmu_helper.c                       |  1 +
target/riscv/cpu_helper.c                     |  1 +
target/riscv/pmp.c                            |  1 +
target/riscv/vector_helper.c                  |  1 +
target/rx/cpu.c                               |  1 +
target/s390x/mmu_helper.c                     |  1 +
target/s390x/tcg/mem_helper.c                 |  1 +
target/sh4/helper.c                           |  1 +
target/sparc/ldst_helper.c                    |  1 +
target/sparc/mmu_helper.c                     |  1 +
target/tricore/helper.c                       |  1 +
target/xtensa/mmu_helper.c                    |  1 +
target/xtensa/op_helper.c                     |  1 +
129 files changed, 380 insertions(+), 216 deletions(-)
create mode 100644 accel/tcg/user-retaddr.h
create mode 100644 include/exec/abi_ptr.h
create mode 100644 include/exec/page-prot-common.h
create mode 100644 include/exec/user/tswap-target.h
create mode 100644 page-target.c
[PATCH v2 00/23] exec: Rework of various headers (user focused)
Posted by Philippe Mathieu-Daudé 1 year, 11 months ago
Hi,

These patches are extracted from a bigger work where
"exec/{exec,cpu,translate}-all.h" are split in various
specific APIs. This helped:
  - differenciate/build:
      . user VS system
      . target-specific VS generic
    which is necessary for heterogeneous build
  - reduced header pressure
  - clarify APIs

This series is focused on user (vs system) cleanups.
More useful changes will come after.

Since v1:
- Addressed Richard comments
- Added R-b tags

Regards,

Phil.

Philippe Mathieu-Daudé (23):
  exec: Include 'cpu.h' before validating CPUArchState placement
  exec: Expose 'target_page.h' API to user emulation
  target: Define TCG_GUEST_DEFAULT_MO in 'cpu-param.h'
  accel: Include missing 'exec/cpu_ldst.h' header
  gdbstub: Include missing 'hw/core/cpu.h' header
  semihosting/uaccess: Avoid including 'cpu.h'
  semihosting/guestfd: Remove unused 'semihosting/uaccess.h' header
  host/load-extract: Include missing 'qemu/atomic.h' and 'qemu/int128.h'
  host/atomic128: Include missing 'qemu/atomic.h' header
  target/i386: Include missing 'exec/exec-all.h' header
  accel/tcg: Include missing 'hw/core/cpu.h' header
  exec/cpu-all: Remove unused 'qemu/thread.h' header
  exec/cpu-all: Reduce 'qemu/rcu.h' header inclusion
  exec/cpu-all: Remove unused tswapls() definitions
  exec: Declare target_words_bigendian() in 'exec/tswap.h'
  exec: Move [b]tswapl() declarations to 'exec/user/tswap-target.h'
  target/ppc/excp_helper: Avoid 'abi_ptr' in system emulation
  accel/tcg: Un-inline retaddr helpers to 'user-retaddr.h'
  exec/user: Do not include 'cpu.h' in 'abitypes.h'
  exec: Declare abi_ptr type in its own 'abi_ptr.h' header
  exec/cpu-all: Restrict inclusion of 'exec/user/guest-base.h'
  exec/cpu-all: Extract page-protection definitions to
    page-prot-common.h
  exec/cpu_ldst: Avoid including 'cpu.h'

 meson.build                                   |  2 +-
 accel/tcg/user-retaddr.h                      | 28 +++++++++
 bsd-user/bsd-mem.h                            |  1 +
 bsd-user/freebsd/target_os_elf.h              |  1 +
 bsd-user/freebsd/target_os_stack.h            |  1 +
 bsd-user/netbsd/target_os_elf.h               |  1 +
 bsd-user/openbsd/target_os_elf.h              |  1 +
 bsd-user/qemu.h                               |  1 +
 host/include/generic/host/atomic128-cas.h     |  2 +
 host/include/generic/host/atomic128-ldst.h    |  2 +
 .../generic/host/load-extract-al16-al8.h      |  3 +
 include/exec/abi_ptr.h                        | 33 +++++++++++
 include/exec/cpu-all.h                        | 59 ++-----------------
 include/exec/cpu_ldst.h                       | 52 ++++------------
 include/exec/exec-all.h                       |  1 +
 include/exec/page-prot-common.h               | 38 ++++++++++++
 include/exec/ram_addr.h                       |  1 +
 include/exec/translator.h                     |  5 +-
 include/exec/tswap.h                          | 12 +++-
 include/exec/user/abitypes.h                  |  8 ++-
 include/exec/user/guest-base.h                |  6 ++
 include/exec/user/tswap-target.h              | 22 +++++++
 include/hw/core/cpu.h                         | 11 ----
 include/semihosting/uaccess.h                 |  3 +-
 target/alpha/cpu-param.h                      |  3 +
 target/alpha/cpu.h                            |  3 -
 target/arm/cpu-param.h                        |  8 ++-
 target/arm/cpu.h                              |  4 +-
 target/avr/cpu-param.h                        |  2 +
 target/avr/cpu.h                              |  2 -
 target/hppa/cpu-param.h                       |  8 +++
 target/hppa/cpu.h                             |  6 --
 target/i386/cpu-param.h                       |  3 +
 target/i386/cpu.h                             |  3 -
 target/loongarch/cpu-param.h                  |  2 +
 target/loongarch/cpu.h                        |  2 -
 target/microblaze/cpu-param.h                 |  3 +
 target/microblaze/cpu.h                       |  3 -
 target/mips/cpu-param.h                       |  2 +
 target/mips/cpu.h                             |  2 -
 target/openrisc/cpu-param.h                   |  2 +
 target/openrisc/cpu.h                         |  2 -
 target/ppc/cpu-param.h                        |  2 +
 target/ppc/cpu.h                              |  2 -
 target/ppc/internal.h                         |  1 +
 target/ppc/mmu-radix64.h                      |  2 +
 target/riscv/cpu-param.h                      |  2 +
 target/riscv/cpu.h                            |  2 -
 target/s390x/cpu-param.h                      |  6 ++
 target/s390x/cpu.h                            |  3 -
 target/sparc/cpu-param.h                      | 23 ++++++++
 target/sparc/cpu.h                            | 23 --------
 target/xtensa/cpu-param.h                     |  3 +
 target/xtensa/cpu.h                           |  3 -
 accel/tcg/cpu-exec.c                          |  3 +
 accel/tcg/cputlb.c                            |  2 +
 accel/tcg/tb-maint.c                          |  1 +
 accel/tcg/tcg-accel-ops.c                     |  2 +
 accel/tcg/translator.c                        |  1 +
 accel/tcg/user-exec.c                         |  2 +
 bsd-user/main.c                               |  1 +
 bsd-user/mmap.c                               |  1 +
 bsd-user/signal.c                             |  2 +
 bsd-user/strace.c                             |  1 +
 cpu-target.c                                  |  2 +
 disas/disas.c                                 |  1 +
 gdbstub/gdbstub.c                             |  1 +
 hw/audio/virtio-snd.c                         |  2 +-
 hw/core/cpu-sysemu.c                          |  2 +-
 hw/core/generic-loader.c                      |  2 +-
 hw/display/vga.c                              |  2 +-
 hw/ppc/ppc440_bamboo.c                        |  1 +
 hw/ppc/sam460ex.c                             |  1 +
 hw/ppc/virtex_ml507.c                         |  1 +
 hw/virtio/virtio.c                            |  1 +
 linux-user/arm/cpu_loop.c                     |  1 +
 linux-user/elfload.c                          |  3 +
 linux-user/i386/signal.c                      |  1 +
 linux-user/main.c                             |  1 +
 linux-user/mmap.c                             |  1 +
 linux-user/nios2/cpu_loop.c                   |  1 +
 linux-user/ppc/signal.c                       |  1 +
 linux-user/signal.c                           |  1 +
 linux-user/syscall.c                          |  1 +
 page-target.c                                 | 43 ++++++++++++++
 semihosting/guestfd.c                         |  5 +-
 system/physmem.c                              | 36 +----------
 target/alpha/helper.c                         |  1 +
 target/arm/ptw.c                              |  1 +
 target/arm/tcg/m_helper.c                     |  1 +
 target/arm/tcg/mte_helper.c                   |  1 +
 target/arm/tcg/sve_helper.c                   |  1 +
 target/avr/helper.c                           |  1 +
 target/cris/mmu.c                             |  1 +
 target/hexagon/translate.c                    |  1 +
 target/hppa/mem_helper.c                      |  1 +
 target/hppa/translate.c                       |  1 +
 target/i386/tcg/fpu_helper.c                  |  1 +
 target/i386/tcg/sysemu/excp_helper.c          |  1 +
 target/loongarch/tlb_helper.c                 |  1 +
 target/m68k/helper.c                          |  1 +
 target/microblaze/cpu.c                       |  1 +
 target/microblaze/helper.c                    |  1 +
 target/microblaze/mmu.c                       |  1 +
 target/microblaze/translate.c                 |  1 +
 target/mips/sysemu/physaddr.c                 |  1 +
 target/mips/tcg/sysemu/tlb_helper.c           |  1 +
 target/nios2/helper.c                         |  1 +
 target/nios2/mmu.c                            |  1 +
 target/nios2/translate.c                      |  1 +
 target/openrisc/mmu.c                         |  1 +
 target/ppc/excp_helper.c                      |  2 +-
 target/ppc/mmu-hash32.c                       |  1 +
 target/ppc/mmu-hash64.c                       |  1 +
 target/ppc/mmu-radix64.c                      |  1 +
 target/ppc/mmu_common.c                       |  1 +
 target/ppc/mmu_helper.c                       |  1 +
 target/riscv/cpu_helper.c                     |  1 +
 target/riscv/pmp.c                            |  1 +
 target/riscv/vector_helper.c                  |  1 +
 target/rx/cpu.c                               |  1 +
 target/s390x/mmu_helper.c                     |  1 +
 target/s390x/tcg/mem_helper.c                 |  1 +
 target/sh4/helper.c                           |  1 +
 target/sparc/ldst_helper.c                    |  1 +
 target/sparc/mmu_helper.c                     |  1 +
 target/tricore/helper.c                       |  1 +
 target/xtensa/mmu_helper.c                    |  1 +
 target/xtensa/op_helper.c                     |  1 +
 129 files changed, 380 insertions(+), 216 deletions(-)
 create mode 100644 accel/tcg/user-retaddr.h
 create mode 100644 include/exec/abi_ptr.h
 create mode 100644 include/exec/page-prot-common.h
 create mode 100644 include/exec/user/tswap-target.h
 create mode 100644 page-target.c

-- 
2.41.0


Re: [PATCH v2 00/23] exec: Rework of various headers (user focused)
Posted by Philippe Mathieu-Daudé 1 year, 11 months ago
On 12/12/23 13:33, Philippe Mathieu-Daudé wrote:

> Philippe Mathieu-Daudé (23):

>    exec/cpu-all: Remove unused tswapls() definitions
>    exec: Move [b]tswapl() declarations to 'exec/user/tswap-target.h'
>    target/ppc/excp_helper: Avoid 'abi_ptr' in system emulation
>    accel/tcg: Un-inline retaddr helpers to 'user-retaddr.h'
>    exec/user: Do not include 'cpu.h' in 'abitypes.h'
>    exec: Declare abi_ptr type in its own 'abi_ptr.h' header
>    exec/cpu-all: Restrict inclusion of 'exec/user/guest-base.h'

>   include/exec/user/abitypes.h                  |  8 ++-
>   include/exec/user/guest-base.h                |  6 ++
>   include/exec/user/tswap-target.h              | 22 +++++++

Missing:

-- >8 --
diff --git a/MAINTAINERS b/MAINTAINERS
index 695e0bd34f..1341862c2c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3615,6 +3615,7 @@ Overall usermode emulation
  M: Riku Voipio <riku.voipio@iki.fi>
  S: Maintained
  F: accel/tcg/user-exec*.c
+F: include/exec/user/
  F: include/user/
  F: common-user/
---

(Although maybe the M: tag need some update)