From:   Andrew Jones <drjones@redhat.com>
To:     kvm@vger.kernel.org
Cc:     pbonzini@redhat.com, Andre Przywara <andre.przywara@arm.com>
Subject: [PULL 01/10] arm: gic: check_acked: add test description
Date:   Thu, 24 Oct 2019 15:06:52 +0200
Message-Id: <20191024130701.31238-2-drjones@redhat.com>
In-Reply-To: <20191024130701.31238-1-drjones@redhat.com>
References: <20191024130701.31238-1-drjones@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: kvm-owner@vger.kernel.org
Precedence: bulk

From: Andre Przywara <andre.przywara@arm.com>

At the moment the check_acked() IRQ helper function just prints a
generic "Completed" or "Timed out" message, without given a more
detailed test description.

To be able to tell the different IRQ tests apart, and also to allow
re-using it more easily, add a "description" parameter string,
which is prefixing the output line. This gives more information on what
exactly was tested.

This also splits the variable output part of the line (duration of IRQ
delivery) into a separate INFO: line, to not confuse testing frameworks.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 arm/gic.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/arm/gic.c b/arm/gic.c
index ed5642e74f70..2ec4070fbaf9 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -60,7 +60,7 @@ static void stats_reset(void)
 =09smp_wmb();
 }
=20
-static void check_acked(cpumask_t *mask)
+static void check_acked(const char *testname, cpumask_t *mask)
 {
 =09int missing =3D 0, extra =3D 0, unexpected =3D 0;
 =09int nr_pass, cpu, i;
@@ -88,7 +88,9 @@ static void check_acked(cpumask_t *mask)
 =09=09=09}
 =09=09}
 =09=09if (nr_pass =3D=3D nr_cpus) {
-=09=09=09report("Completed in %d ms", !bad, ++i * 100);
+=09=09=09report("%s", !bad, testname);
+=09=09=09if (i)
+=09=09=09=09report_info("took more than %d ms", i * 100);
 =09=09=09return;
 =09=09}
 =09}
@@ -105,8 +107,9 @@ static void check_acked(cpumask_t *mask)
 =09=09}
 =09}
=20
-=09report("Timed-out (5s). ACKS: missing=3D%d extra=3D%d unexpected=3D%d",
-=09       false, missing, extra, unexpected);
+=09report("%s", false, testname);
+=09report_info("Timed-out (5s). ACKS: missing=3D%d extra=3D%d unexpected=
=3D%d",
+=09=09    missing, extra, unexpected);
 }
=20
 static void check_spurious(void)
@@ -185,7 +188,7 @@ static void ipi_test_self(void)
 =09cpumask_clear(&mask);
 =09cpumask_set_cpu(smp_processor_id(), &mask);
 =09gic->ipi.send_self();
-=09check_acked(&mask);
+=09check_acked("IPI: self", &mask);
 =09report_prefix_pop();
 }
=20
@@ -200,7 +203,7 @@ static void ipi_test_smp(void)
 =09for (i =3D smp_processor_id() & 1; i < nr_cpus; i +=3D 2)
 =09=09cpumask_clear_cpu(i, &mask);
 =09gic_ipi_send_mask(IPI_IRQ, &mask);
-=09check_acked(&mask);
+=09check_acked("IPI: directed", &mask);
 =09report_prefix_pop();
=20
 =09report_prefix_push("broadcast");
@@ -208,7 +211,7 @@ static void ipi_test_smp(void)
 =09cpumask_copy(&mask, &cpu_present_mask);
 =09cpumask_clear_cpu(smp_processor_id(), &mask);
 =09gic->ipi.send_broadcast();
-=09check_acked(&mask);
+=09check_acked("IPI: broadcast", &mask);
 =09report_prefix_pop();
 }
=20
--=20
2.21.0