[v5] Unified CPU type check

[PATCH v5 00/31] Unified CPU type check

Gavin Shan posted 31 patches 1 year ago

Diff against v3 v6 v7 v8 v9
Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231114235628.534334-1-gshan@redhat.com

Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Beniamino Galvani <b.galvani@gmail.com>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, Tyrone Ting <kfting@nuvoton.com>, Hao Wu <wuhaotsh@google.com>, Niek Linnenbank <nieklinnenbank@gmail.com>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <quic_llindhol@quicinc.com>, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Laurent Vivier <laurent@vivier.eu>, Vijai Kumar K <vijai@behindbytes.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Michael Rolnik <mrolnik@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@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>, Stafford Horne <shorne@gmail.com>, Nicholas Piggin <npiggin@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, Yoshinori Sato <ysato@users.sourceforge.jp>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Filippov <jcmvbkbc@gmail.com>

There is a newer version of this series

bsd-user/main.c                       |  5 +-
cpu-target.c                          | 44 ++++++++++++-
hw/arm/bananapi_m2u.c                 | 12 ++--
hw/arm/cubieboard.c                   | 12 ++--
hw/arm/mps2-tz.c                      | 20 ++++--
hw/arm/mps2.c                         | 25 +++++--
hw/arm/msf2-som.c                     | 12 ++--
hw/arm/musca.c                        | 13 ++--
hw/arm/npcm7xx_boards.c               | 13 ++--
hw/arm/orangepi.c                     | 12 ++--
hw/arm/sbsa-ref.c                     | 21 +-----
hw/arm/virt.c                         | 23 ++-----
hw/core/cpu-common.c                  |  8 ++-
hw/core/machine.c                     | 93 ++++++++++++++++-----------
hw/m68k/q800.c                        |  2 +-
hw/riscv/shakti_c.c                   | 11 ++--
include/hw/boards.h                   |  2 +-
include/hw/core/cpu.h                 | 12 ++++
target/alpha/cpu.c                    | 26 +-------
target/alpha/cpu.h                    |  3 -
target/arm/arm-qmp-cmds.c             |  3 +-
target/arm/cpu.c                      |  4 +-
target/arm/cpu.h                      |  3 -
target/arm/helper.c                   | 46 -------------
target/avr/cpu.c                      | 23 +------
target/avr/cpu.h                      |  2 -
target/cris/cpu.c                     | 42 +-----------
target/cris/cpu.h                     |  3 -
target/hexagon/cpu.c                  | 24 +------
target/hexagon/cpu.h                  |  3 -
target/hppa/cpu.c                     | 32 +--------
target/hppa/cpu.h                     |  3 -
target/i386/cpu.c                     |  3 +-
target/loongarch/cpu.c                | 23 +------
target/loongarch/cpu.h                |  4 --
target/loongarch/loongarch-qmp-cmds.c |  3 +-
target/m68k/cpu.c                     |  4 +-
target/m68k/cpu.h                     |  4 --
target/m68k/helper.c                  | 40 ------------
target/mips/cpu-defs.c.inc            |  9 ---
target/mips/cpu.h                     |  4 --
target/mips/sysemu/mips-qmp-cmds.c    |  3 +-
target/openrisc/cpu.c                 | 46 +------------
target/openrisc/cpu.h                 |  3 -
target/ppc/cpu_init.c                 |  3 +-
target/ppc/ppc-qmp-cmds.c             |  3 +-
target/riscv/cpu.c                    | 36 +----------
target/riscv/cpu.h                    |  2 -
target/riscv/riscv-qmp-cmds.c         |  3 +-
target/rx/cpu.c                       | 20 +-----
target/rx/cpu.h                       |  3 -
target/sh4/cpu.c                      | 17 -----
target/sh4/cpu.h                      |  3 -
target/tricore/cpu.c                  |  4 +-
target/tricore/cpu.h                  |  4 --
target/tricore/helper.c               | 22 -------
target/xtensa/cpu.c                   |  4 +-
target/xtensa/cpu.h                   | 10 +--
target/xtensa/helper.c                | 19 +-----
target/xtensa/overlay_tool.h          |  7 +-
60 files changed, 229 insertions(+), 634 deletions(-)

Expand all Fold all

[PATCH v5 00/31] Unified CPU type check

Posted by Gavin Shan 1 year ago

There are two places where the user specified CPU type is checked to see
if it's supported or allowed by the board: machine_run_board_init() and
mc->init(). We don't have to maintain two duplicate sets of logic. This
series intends to move the check to machine_run_board_init() so that we
have unified CPU type check.

PATCH[01-04] consolidate CPUClass::class_by_name() so that the returned
             CPU class is checked for once in cpu_class_by_name()
PATCH[05]    add generic helper cpu_model_from_type() to extract the CPU
             model name from the CPU type name
PATCH[06]    add generic cpu_list(), to be reused by most of the targets
PATCH[07-21] switch to generic cpu_list() for most of the targets
PATCH[22]    use generic helper cpu_model_from_type() for several targets
PATCH[23-31] validate the CPU type in machine_run_board_init() for the
             individual board

v1: https://lists.nongnu.org/archive/html/qemu-arm/2023-07/msg00302.html
v2: https://lists.nongnu.org/archive/html/qemu-arm/2023-07/msg00528.html
v3: https://lists.nongnu.org/archive/html/qemu-arm/2023-09/msg00157.html
v4: https://lists.nongnu.org/archive/html/qemu-arm/2023-11/msg00005.html

Testing
=======

With the following command lines, the output messages are varied before
and after the series is applied.

  ./build/qemu-system-aarch64            \
  -accel tcg -machine virt,gic-version=3 \
  -cpu cortex-a8 -smp maxcpus=2,cpus=1

Before the series is applied:

  qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported

After the series is applied:

  qemu-system-aarch64: Invalid CPU type: cortex-a8-arm-cpu
  The valid models are: cortex-a7, cortex-a15, cortex-a35, cortex-a55,
                        cortex-a72, cortex-a76, a64fx, neoverse-n1,
                        neoverse-v1, cortex-a53, cortex-a57, max

Changelog
=========
v5:
  * PATCH[v5 01] to remove CPU class 'ev67' for alpha            (Ricard/Igor)
  * PATCH[v5 02] to remove object_class_is_abstract() for hppa   (Gavin)
  * Don't move cpu_class_by_name()                               (Richard)
  * PATCH[v5 04] to remove 'oc == NULL' since the check has
    been covered in object_class_dynamic_cast()                  (Igor)
  * Introduce generic cpu_list(), shared by most of the targets  (Richard)
  * Use g_str_has_suffix and g_auto_free                         (Richard)
  * Collect r-bs from Igor and Richard                           (Gavin)
v4:
  * Integrate Philippe's patches where cpu_class_by_name()
    is consolidated and my duplicate code is dropped            (Philippe)
  * Simplified changelog and improvements                       (Thomas)
  * g_assert() on the return value from cpu_model_from_type()
    in is_cpu_type_supported()                                  (Philippe)
  * Collected r-bs from Philippe Mathieu-Daudé, Leif Lindholm,
    Bastian Koppelmann, Daniel Henrique Barboza, Cédric Le Goater,
    Gavin Shan                                                  (Gavin)
v3:
  * Generic helper cpu_model_from_type()                        (Igor)
  * Apply cpu_model_from_type() to the individual targets       (Igor)
  * Implement cpu_list() for the missed targets                 (Gavin)
  * Remove mc->valid_cpu_models                                 (Richard)
  * Separate patch to constify mc->validate_cpu_types           (Gavin)
v2:
  * Constify mc->valid_cpu_types                                (Richard)
  * Print the supported CPU models, instead of typenames        (Peter)
  * Misc improvements for the hleper to do the check            (Igor)
  * More patches to move the check                              (Marcin)

Gavin Shan (30):
  target/alpha: Remove 'ev67' CPU class
  target/hppa: Remove object_class_is_abstract()
  target: Remove 'oc == NULL' check
  cpu: Add helper cpu_model_from_type()
  cpu: Add generic cpu_list()
  target/alpha: Use generic cpu_list()
  target/arm: Use generic cpu_list()
  target/avr: Use generic cpu_list()
  target/cris: Use generic cpu_list()
  target/hexagon: Use generic cpu_list()
  target/hppa: Use generic cpu_list()
  target/loongarch: Use generic cpu_list()
  target/m68k: Use generic cpu_list()
  target/mips: Use generic cpu_list()
  target/openrisc: Use generic cpu_list()
  target/riscv: Use generic cpu_list()
  target/rx: Use generic cpu_list()
  target/sh4: Use generic cpu_list()
  target/tricore: Use generic cpu_list()
  target/xtensa: Use generic cpu_list()
  target: Use generic cpu_model_from_type()
  machine: Constify MachineClass::valid_cpu_types[i]
  machine: Use error handling when CPU type is checked
  machine: Introduce helper is_cpu_type_supported()
  machine: Print CPU model name instead of CPU type name
  hw/arm/virt: Hide host CPU model for tcg
  hw/arm/virt: Check CPU type in machine_run_board_init()
  hw/arm/sbsa-ref: Check CPU type in machine_run_board_init()
  hw/arm: Check CPU type in machine_run_board_init()
  hw/riscv/shakti_c: Check CPU type in machine_run_board_init()

Philippe Mathieu-Daudé (1):
  cpu: Call object_class_dynamic_cast() once in cpu_class_by_name()

 bsd-user/main.c                       |  5 +-
 cpu-target.c                          | 44 ++++++++++++-
 hw/arm/bananapi_m2u.c                 | 12 ++--
 hw/arm/cubieboard.c                   | 12 ++--
 hw/arm/mps2-tz.c                      | 20 ++++--
 hw/arm/mps2.c                         | 25 +++++--
 hw/arm/msf2-som.c                     | 12 ++--
 hw/arm/musca.c                        | 13 ++--
 hw/arm/npcm7xx_boards.c               | 13 ++--
 hw/arm/orangepi.c                     | 12 ++--
 hw/arm/sbsa-ref.c                     | 21 +-----
 hw/arm/virt.c                         | 23 ++-----
 hw/core/cpu-common.c                  |  8 ++-
 hw/core/machine.c                     | 93 ++++++++++++++++-----------
 hw/m68k/q800.c                        |  2 +-
 hw/riscv/shakti_c.c                   | 11 ++--
 include/hw/boards.h                   |  2 +-
 include/hw/core/cpu.h                 | 12 ++++
 target/alpha/cpu.c                    | 26 +-------
 target/alpha/cpu.h                    |  3 -
 target/arm/arm-qmp-cmds.c             |  3 +-
 target/arm/cpu.c                      |  4 +-
 target/arm/cpu.h                      |  3 -
 target/arm/helper.c                   | 46 -------------
 target/avr/cpu.c                      | 23 +------
 target/avr/cpu.h                      |  2 -
 target/cris/cpu.c                     | 42 +-----------
 target/cris/cpu.h                     |  3 -
 target/hexagon/cpu.c                  | 24 +------
 target/hexagon/cpu.h                  |  3 -
 target/hppa/cpu.c                     | 32 +--------
 target/hppa/cpu.h                     |  3 -
 target/i386/cpu.c                     |  3 +-
 target/loongarch/cpu.c                | 23 +------
 target/loongarch/cpu.h                |  4 --
 target/loongarch/loongarch-qmp-cmds.c |  3 +-
 target/m68k/cpu.c                     |  4 +-
 target/m68k/cpu.h                     |  4 --
 target/m68k/helper.c                  | 40 ------------
 target/mips/cpu-defs.c.inc            |  9 ---
 target/mips/cpu.h                     |  4 --
 target/mips/sysemu/mips-qmp-cmds.c    |  3 +-
 target/openrisc/cpu.c                 | 46 +------------
 target/openrisc/cpu.h                 |  3 -
 target/ppc/cpu_init.c                 |  3 +-
 target/ppc/ppc-qmp-cmds.c             |  3 +-
 target/riscv/cpu.c                    | 36 +----------
 target/riscv/cpu.h                    |  2 -
 target/riscv/riscv-qmp-cmds.c         |  3 +-
 target/rx/cpu.c                       | 20 +-----
 target/rx/cpu.h                       |  3 -
 target/sh4/cpu.c                      | 17 -----
 target/sh4/cpu.h                      |  3 -
 target/tricore/cpu.c                  |  4 +-
 target/tricore/cpu.h                  |  4 --
 target/tricore/helper.c               | 22 -------
 target/xtensa/cpu.c                   |  4 +-
 target/xtensa/cpu.h                   | 10 +--
 target/xtensa/helper.c                | 19 +-----
 target/xtensa/overlay_tool.h          |  7 +-
 60 files changed, 229 insertions(+), 634 deletions(-)

-- 
2.41.0