Re: [kvm-unit-tests PATCH v6 06/13] arm/arm64: ITS: Introspection tests

[Andrew Jones]

On Wed, Mar 11, 2020 at 02:51:10PM +0100, Eric Auger wrote:
> Detect the presence of an ITS as part of the GICv3 init
> routine, initialize its base address and read few registers
> the IIDR, the TYPER to store its dimensioning parameters.
> Parse the BASER registers. As part of the init sequence we
> also init all the requested tables.
> 
> This is our first ITS test, belonging to a new "its" group.
> 
> Signed-off-by: Eric Auger <address@hidden>
> 
> ---
> v5 -> v6:
> - fix some GENMASK_ULL and tabs
> 
> v4 -> v5:
> - Moved test_its_introspection() stub from
>   lib/arm/asm/gic-v3-its.h back to arm/gic.c
> - 32b its_init does report_abort()
> - remove kerneldoc style comment
> - remove alloc_lpi_tables from its_init()
> 
> v3 -> v4:
> - fixed some typos, refine trace msgs
> - move its files to lib/arm64 instead of lib/arm
> - create lib/arm/asm/gic-v3-its.h containing stubs
> - rework gic_get_dt_bases
> - rework baser parsing
> - move table allocation to init routine
> - use get_order()
> 
> v2 -> v3:
> - updated dates and changed author
> - squash "arm/arm64: ITS: Test BASER" into this patch but
>   removes setup_baser which will be introduced later.
> - only compile on aarch64
> - restrict the new test to aarch64
> 
> v1 -> v2:
> - clean GITS_TYPER macros and unused fields in typer struct
> - remove memory attribute related macros
> - remove everything related to memory attributes
> - s/dev_baser/coll_baser/ in report_info
> - add extra line
> - removed index filed in its_baser
> ---
>  arm/Makefile.arm64         |  1 +
>  arm/gic.c                  | 48 ++++++++++++++++++
>  arm/unittests.cfg          |  7 +++
>  lib/arm/asm/gic-v3-its.h   | 22 +++++++++
>  lib/arm/gic.c              | 34 +++++++++++--
>  lib/arm64/asm/gic-v3-its.h | 92 +++++++++++++++++++++++++++++++++++
>  lib/arm64/gic-v3-its.c     | 99 ++++++++++++++++++++++++++++++++++++++
>  7 files changed, 298 insertions(+), 5 deletions(-)
>  create mode 100644 lib/arm/asm/gic-v3-its.h
>  create mode 100644 lib/arm64/asm/gic-v3-its.h
>  create mode 100644 lib/arm64/gic-v3-its.c
> 
> diff --git a/arm/Makefile.arm64 b/arm/Makefile.arm64
> index 6d3dc2c..60182ae 100644
> --- a/arm/Makefile.arm64
> +++ b/arm/Makefile.arm64
> @@ -19,6 +19,7 @@ endef
>  cstart.o = $(TEST_DIR)/cstart64.o
>  cflatobjs += lib/arm64/processor.o
>  cflatobjs += lib/arm64/spinlock.o
> +cflatobjs += lib/arm64/gic-v3-its.o
>  
>  OBJDIRS += lib/arm64
>  
> diff --git a/arm/gic.c b/arm/gic.c
> index 2f904b0..649ed81 100644
> --- a/arm/gic.c
> +++ b/arm/gic.c
> @@ -16,6 +16,7 @@
>  #include <asm/processor.h>
>  #include <asm/delay.h>
>  #include <asm/gic.h>
> +#include <asm/gic-v3-its.h>
>  #include <asm/smp.h>
>  #include <asm/barrier.h>
>  #include <asm/io.h>
> @@ -517,6 +518,49 @@ static void gic_test_mmio(void)
>               test_targets(nr_irqs);
>  }
>  
> +#if defined(__arm__)
> +
> +static void test_its_introspection(void) {}
> +
> +#else /* __aarch64__ */
> +
> +static void test_its_introspection(void)
> +{
> +     struct its_baser *dev_baser = &its_data.device_baser;
> +     struct its_baser *coll_baser = &its_data.coll_baser;
> +     struct its_typer *typer = &its_data.typer;
> +
> +     if (!gicv3_its_base()) {
> +             report_skip("No ITS, skip ...");
> +             return;
> +     }
> +
> +     /* IIDR */
> +     report(test_readonly_32(gicv3_its_base() + GITS_IIDR, false),
> +            "GITS_IIDR is read-only"),
> +
> +     /* TYPER */
> +     report(test_readonly_32(gicv3_its_base() + GITS_TYPER, false),
> +            "GITS_TYPER is read-only");
> +
> +     report(typer->phys_lpi, "ITS supports physical LPIs");
> +     report_info("vLPI support: %s", typer->virt_lpi ? "yes" : "no");
> +     report_info("ITT entry size = 0x%x", typer->ite_size);
> +     report_info("Bit Count: EventID=%d DeviceId=%d CollId=%d",
> +                 typer->eventid_bits, typer->deviceid_bits,
> +                 typer->collid_bits);
> +     report(typer->eventid_bits && typer->deviceid_bits &&
> +            typer->collid_bits, "ID spaces");
> +     report_info("Target address format %s",
> +                     typer->pta ? "Redist base address" : "PE #");
> +
> +     report(dev_baser && coll_baser, "detect device and collection BASER");
> +     report_info("device table entry_size = 0x%x", dev_baser->esz);
> +     report_info("collection table entry_size = 0x%x", coll_baser->esz);
> +}
> +
> +#endif
> +
>  int main(int argc, char **argv)
>  {
>       if (!gic_init()) {
> @@ -548,6 +592,10 @@ int main(int argc, char **argv)
>               report_prefix_push(argv[1]);
>               gic_test_mmio();
>               report_prefix_pop();
> +     } else if (strcmp(argv[1], "its-introspection") == 0) {
> +             report_prefix_push(argv[1]);
> +             test_its_introspection();
> +             report_prefix_pop();
>       } else {
>               report_abort("Unknown subtest '%s'", argv[1]);
>       }
> diff --git a/arm/unittests.cfg b/arm/unittests.cfg
> index 017958d..23d378e 100644
> --- a/arm/unittests.cfg
> +++ b/arm/unittests.cfg
> @@ -122,6 +122,13 @@ smp = $MAX_SMP
>  extra_params = -machine gic-version=3 -append 'active'
>  groups = gic
>  
> +[its-introspection]
> +file = gic.flat
> +smp = $MAX_SMP
> +extra_params = -machine gic-version=3 -append 'its-introspection'
> +groups = its
> +arch = arm64
> +
>  # Test PSCI emulation
>  [psci]
>  file = psci.flat
> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h
> new file mode 100644
> index 0000000..2167099
> --- /dev/null
> +++ b/lib/arm/asm/gic-v3-its.h
> @@ -0,0 +1,22 @@
> +/*
> + * ITS 32-bit stubs
> + *
> + * Copyright (C) 2020, Red Hat Inc, Eric Auger <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2.
> + */
> +
> +#ifndef _ASMARM_GIC_V3_ITS_H_
> +#define _ASMARM_GIC_V3_ITS_H_
> +
> +/* dummy its_data struct to allow gic_get_dt_bases() call */
> +struct its_data {
> +     void *base;
> +};
> +
> +static inline void its_init(void)
> +{
> +     report_abort("not supported on 32-bit");

This is supposed to be an assert_msg() (no report_* functions in lib
code), but it should never fire anyway, because the test code should
just not call its_init() on 32-bit arm. I.e. the assert is there not
to report to test runners what's going on, but to stop developers
from calling it when they shouldn't.

I can fix stuff like this up myself on merge to arm/queue though.