[for-4.19?,v5,00/10] x86: Make MAX_ALTP2M configurable

Message

Petr Beneš June 2, 2024, 8:04 p.m. UTC

From: Petr Beneš <[e-mail]>

This series introduces the ability to configure the maximum number of altp2m
tables during domain creation. Previously, the limits were hardcoded to a
maximum of 10. This change allows for greater flexibility in environments that
require more or fewer altp2m views.

This enhancement is particularly relevant for users leveraging Xen's features
for virtual machine introspection.

Changes since v4:
- Rebased on top of staging (applying Roger's changes).
- Fix mixed tabs/spaces in xenctrl_stubs.c.
- Add missing OCaml bindings for altp2m_opts.
- Substitute altp2m_opts into an unnamed structure. (This is a preparation for
  the next patch that will introduce the `nr` field.)
- altp2m.opts is then shortened to uint16_t and a new field altp2m.nr is added -
  also uint16_t. This value is then verified by libxl to not exceed the maximum
  uint16_t value.

  This puts a hard limit to number of altp2m to 65535, which is enough, at least
  for the time being. Also, altp2m.opts currently uses only 2 bits. Therefore
  I believe this change is justified.
- Introduction of accessor functions for altp2m arrays and refactoring the code
  to use them.
- Added a check to arm/arch_sanitise_domain_config() to disallow creating
  domains with altp2m.nr != 0.
- Added dummy hvm_altp2m_supported() to avoid build errors when CONFIG_HVM is
  disabled.
- Finally, expose altp2m_count to OCaml bindings (and verify both altp2m_opts
  and altp2m_count fit uint16_t).
- I also removed Christian Lindig from the Acked-by, since I think this change
  is significant enough to require a re-review.

Changes since v3:
- Rebased on top of staging (some functions were moved to altp2m.c).
- Re-added the array_index_nospec() where it was removed.

Changes since v2:
- Changed max_altp2m to nr_altp2m.
- Moved arch-dependent check from xen/common/domain.c to xen/arch/x86/domain.c.
- Replaced min(d->nr_altp2m, MAX_EPTP) occurences for just d->nr_altp2m.
- Replaced array_index_nospec(altp2m_idx, ...) for just altp2m_idx.
- Shortened long lines.
- Removed unnecessary comments in altp2m_vcpu_initialise/destroy.
- Moved nr_altp2m field after max_ fields in xen_domctl_createdomain.
- Removed the commit that adjusted the initial allocation of pages from 256
  to 1024. This means that after these patches, technically, the nr_altp2m will
  be capped to (256 - 1 - vcpus - MAX_NESTEDP2M) instead of MAX_EPTP (512).
  Future work will be needed to fix this.

Petr Beneš (10):
  tools/ocaml: Fix mixed tabs/spaces
  tools/ocaml: Add missing ocaml bindings for altp2m_opts
  xen: Refactor altp2m options into a structured format
  tools/xl: Add altp2m_count parameter
  docs/man: Add altp2m_count parameter to the xl.cfg manual
  x86/altp2m: Introduce accessor functions for safer array indexing
  xen: Make the maximum number of altp2m views configurable for x86
  tools/libxl: Activate the altp2m_count feature
  xen/x86: Disallow creating domains with altp2m enabled and altp2m.nr
    == 0
  tools/ocaml: Add altp2m_count parameter

 docs/man/xl.cfg.5.pod.in             |  14 ++++
 tools/golang/xenlight/helpers.gen.go |   2 +
 tools/golang/xenlight/types.gen.go   |   1 +
 tools/include/libxl.h                |   8 ++
 tools/libs/light/libxl_create.c      |  19 ++++-
 tools/libs/light/libxl_types.idl     |   1 +
 tools/ocaml/libs/xc/xenctrl.ml       |   2 +
 tools/ocaml/libs/xc/xenctrl.mli      |   2 +
 tools/ocaml/libs/xc/xenctrl_stubs.c  |  40 +++++++---
 tools/xl/xl_parse.c                  |   9 +++
 xen/arch/arm/domain.c                |   2 +-
 xen/arch/x86/domain.c                |  45 ++++++++---
 xen/arch/x86/hvm/hvm.c               |  10 ++-
 xen/arch/x86/hvm/vmx/vmx.c           |   6 +-
 xen/arch/x86/include/asm/altp2m.h    |  32 ++++++++
 xen/arch/x86/include/asm/domain.h    |   9 ++-
 xen/arch/x86/include/asm/hvm/hvm.h   |   5 ++
 xen/arch/x86/include/asm/p2m.h       |  11 ++-
 xen/arch/x86/mm/altp2m.c             | 110 ++++++++++++++-------------
 xen/arch/x86/mm/hap/hap.c            |  16 ++--
 xen/arch/x86/mm/mem_access.c         |  25 +++---
 xen/arch/x86/mm/mem_sharing.c        |   4 +-
 xen/arch/x86/mm/p2m-ept.c            |  18 ++---
 xen/arch/x86/mm/p2m.c                |  24 +++---
 xen/common/domain.c                  |   1 +
 xen/include/public/domctl.h          |   7 +-
 xen/include/xen/sched.h              |   2 +
 27 files changed, 290 insertions(+), 135 deletions(-)

--
2.34.1

Comments

Christian Lindig June 4, 2024, 8:42 a.m. UTC | #1

> On 2 Jun 2024, at 21:04, Petr Beneš <[e-mail]> wrote:
> 
> tools/ocaml/libs/xc/xenctrl.ml       |   2 +
> tools/ocaml/libs/xc/xenctrl.mli      |   2 +
> tools/ocaml/libs/xc/xenctrl_stubs.c  |  40 +++++++---

Acked-by: Christian Lindig <[e-mail]>