A while back we added support for targets having memory protection at
a sub-page granularity in TCG: the target returns a CPUTLBEntryFull
with a lg_page_size field that tells TCG how big a block of memory the
translation covers. At the moment we only use this in Arm, for the
M-profile and R-profile MPU which can set protections on small regions
of memory.

However, we forgot about cpu_memory_rw_debug(), which still assumes
that translations cover target-page sized regions. It rounds the input
virtual address down to a page boundary, translates that, and then
puts the offset within the page back in again. This causes problems
for the Arm MPU case, because if the MPU is set up so that the memory
at the rounded-down address isn't within a valid region then we
incorrectly conclude that we can't read the memory at the address we
were actually asked about.
https://gitlab.com/qemu-project/qemu/-/work_items/3292 is a report of
this for the semihosting case, but it applies also to general debug
accesses.

This series fixes this by providing and using a new
cpu_translate_for_debug() function which takes a non-page-aligned
virtual address and returns all of:
 - the exact physical address for that virtual address
 - the memory attributes
 - the lg_page_size the translation is valid for

Changes in v2:
 - I noticed that I'd missed that a vapic.c callsite currently relies
   on the i386 "always return a page-aligned result" behaviour;
   patch 1 is new and makes it work with both "returns the page
   address" and "returns the exact adress"
 - fixed a TARGET_PAGE_BITS/TARGET_PAGE_SIZE mixup pointed out
   in code review
 - in the arm translate_for_debug patch, name a (preexisting) bool
   variable 'fault' rather than 'ret' to help clarify that it is
   true-on-failure
 - the last 7 patches are new, and update callers of
   cpu_get_phys_addr_debug() to use the new cpu_translate_for_debug();
   this means we can remove cpu_get_phys_addr_debug() and
   cpu_get_phys_addr_attrs_debug(), so there is only one API
   now for doing debug virt-to-phys translations

Further cleanup for once this series is accepted:
 - we could convert the 15 targets using get_phys_addr_debug and the
   two using get_phys_addr_attrs_debug to translate_for_debug, so we
   only have one CPU method for phys-to-virt translations instead of
   three

Patches 1, 18, and 19-25 need review.

thanks
-- PMM

Peter Maydell (25):
  hw/i386/vapic: Cope with non-page-aligned return from
    cpu_get_phys_page_debug()
  target/riscv: Make get_phys_page_debug handle non-page-aligned addrs
  target/alpha: Make get_phys_page_debug handle non-page-aligned addrs
  target/microblaze: Make get_phys_page_attrs_debug handle
    non-page-aligned addrs
  target/sparc: Make get_phys_page_debug handle non-page-aligned addrs
  target/x86: Make get_phys_page_attrs_debug handle non-page-aligned
    addrs
  target/s390x: Make get_phys_page_debug handle non-page-aligned addrs
  target/ppc: Make get_phys_page_debug handle non-page-aligned addrs
  target: Rename get_phys_page_debug to get_phys_addr_debug
  target: Rename cpu_get_phys_page_{,attrs_}debug
  hw/core: Update docs for get_phys_addr_{attrs_,}debug
  target/arm: Rename arm_cpu_get_phys_page()
  monitor: hmp_gva2gpa: Don't page-align cpu_get_phys_addr_debug() arg
    and return
  plugins/api.c: Trust cpu_get_phys_addr_debug() return address
  hw/core: Implement new cpu_translate_for_debug()
  hw/core: Implement cpu_get_phys_addr_attrs_debug() with
    cpu_translate_for_debug()
  target/arm: Implement translate_for_debug
  system/physmem: Use translate_for_debug() in cpu_memory_rw_debug()
  hw/i386/vapic.c: Use cpu_translate_for_debug()
  target/sparc: Use cpu_translate_for_debug()
  hw/xtensa: Use cpu_translate_for_debug()
  target/xtensa/xtensa-semi: Use cpu_translate_for_debug()
  monitor/hmp-cmds: Use cpu_translate_for_debug()
  plugins/api.c: Use cpu_translate_for_debug()
  Remove cpu_get_phys_addr_debug() and cpu_get_phys_addr_attrs_debug()

 hw/core/cpu-system.c             | 47 ++++++++++++++++++--------------
 hw/i386/vapic.c                  | 13 +++++----
 hw/xtensa/sim.c                  |  6 +++-
 hw/xtensa/xtfpga.c               |  6 +++-
 include/hw/core/cpu.h            | 40 +++++++++++++++------------
 include/hw/core/sysemu-cpu-ops.h | 39 ++++++++++++++++++++++----
 monitor/hmp-cmds.c               |  8 ++----
 plugins/api.c                    |  8 +++---
 system/physmem.c                 | 38 ++++++++++++++++----------
 target/alpha/cpu.c               |  2 +-
 target/alpha/cpu.h               |  2 +-
 target/alpha/helper.c            |  3 +-
 target/arm/cpu.c                 |  2 +-
 target/arm/cpu.h                 |  3 --
 target/arm/internals.h           |  4 +++
 target/arm/ptw.c                 | 39 +++++++++++++++-----------
 target/avr/cpu.c                 |  2 +-
 target/avr/cpu.h                 |  2 +-
 target/avr/helper.c              |  2 +-
 target/hppa/cpu.c                |  2 +-
 target/hppa/cpu.h                |  2 +-
 target/hppa/mem_helper.c         |  2 +-
 target/i386/cpu.c                |  2 +-
 target/i386/cpu.h                |  2 +-
 target/i386/helper.c             |  4 +--
 target/i386/whpx/whpx-all.c      |  2 +-
 target/loongarch/cpu-mmu.h       |  2 +-
 target/loongarch/cpu.c           |  2 +-
 target/loongarch/cpu_helper.c    |  2 +-
 target/m68k/cpu.c                |  2 +-
 target/m68k/cpu.h                |  2 +-
 target/m68k/helper.c             |  2 +-
 target/microblaze/cpu.c          |  2 +-
 target/microblaze/cpu.h          |  2 +-
 target/microblaze/helper.c       | 11 ++++----
 target/mips/cpu.c                |  2 +-
 target/mips/internal.h           |  2 +-
 target/mips/system/physaddr.c    |  2 +-
 target/or1k/cpu.c                |  2 +-
 target/or1k/cpu.h                |  2 +-
 target/or1k/mmu.c                |  2 +-
 target/ppc/cpu.h                 |  2 +-
 target/ppc/cpu_init.c            |  2 +-
 target/ppc/mmu-hash32.c          |  2 +-
 target/ppc/mmu_common.c          |  4 +--
 target/riscv/cpu.c               |  2 +-
 target/riscv/cpu.h               |  2 +-
 target/riscv/cpu_helper.c        |  4 +--
 target/rx/cpu.c                  |  2 +-
 target/rx/cpu.h                  |  2 +-
 target/rx/helper.c               |  2 +-
 target/s390x/cpu-system.c        |  2 +-
 target/s390x/helper.c            | 20 ++++----------
 target/s390x/s390x-internal.h    |  1 -
 target/sh4/cpu.c                 |  2 +-
 target/sh4/cpu.h                 |  2 +-
 target/sh4/helper.c              |  2 +-
 target/sparc/cpu.c               |  2 +-
 target/sparc/cpu.h               |  2 +-
 target/sparc/mmu_helper.c        | 23 ++++++++++++----
 target/tricore/cpu.c             |  2 +-
 target/tricore/cpu.h             |  2 +-
 target/tricore/helper.c          |  2 +-
 target/xtensa/cpu.c              |  2 +-
 target/xtensa/cpu.h              |  2 +-
 target/xtensa/mmu_helper.c       |  2 +-
 target/xtensa/xtensa-semi.c      |  9 ++++--
 67 files changed, 246 insertions(+), 176 deletions(-)

-- 
2.43.0

> Peter Maydell (25):
>    hw/i386/vapic: Cope with non-page-aligned return from
>      cpu_get_phys_page_debug()
>    target/riscv: Make get_phys_page_debug handle non-page-aligned addrs
>    target/alpha: Make get_phys_page_debug handle non-page-aligned addrs
>    target/microblaze: Make get_phys_page_attrs_debug handle
>      non-page-aligned addrs
>    target/sparc: Make get_phys_page_debug handle non-page-aligned addrs
>    target/x86: Make get_phys_page_attrs_debug handle non-page-aligned
>      addrs
>    target/s390x: Make get_phys_page_debug handle non-page-aligned addrs
>    target/ppc: Make get_phys_page_debug handle non-page-aligned addrs
>    target: Rename get_phys_page_debug to get_phys_addr_debug
>    target: Rename cpu_get_phys_page_{,attrs_}debug
>    hw/core: Update docs for get_phys_addr_{attrs_,}debug
>    target/arm: Rename arm_cpu_get_phys_page()
>    monitor: hmp_gva2gpa: Don't page-align cpu_get_phys_addr_debug() arg
>      and return
>    plugins/api.c: Trust cpu_get_phys_addr_debug() return address
>    hw/core: Implement new cpu_translate_for_debug()
>    hw/core: Implement cpu_get_phys_addr_attrs_debug() with
>      cpu_translate_for_debug()
>    target/arm: Implement translate_for_debug
>    system/physmem: Use translate_for_debug() in cpu_memory_rw_debug()
>    hw/i386/vapic.c: Use cpu_translate_for_debug()
>    target/sparc: Use cpu_translate_for_debug()
>    hw/xtensa: Use cpu_translate_for_debug()
>    target/xtensa/xtensa-semi: Use cpu_translate_for_debug()
>    monitor/hmp-cmds: Use cpu_translate_for_debug()
>    plugins/api.c: Use cpu_translate_for_debug()
>    Remove cpu_get_phys_addr_debug() and cpu_get_phys_addr_attrs_debug()

Series queued via hw-misc tree, thanks.