From: Thomas Huth <thuth@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-devel@nongnu.org,
"Gustavo Romero" <gustavo.romero@linaro.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
qemu-arm@nongnu.org, alex.bennee@linaro.org,
Paolo Bonzini <pbonzini@redhat.com>,
Anton Kochkov <anton.kochkov@proton.me>,
richard.henderson@linaro.org,
Peter Maydell <peter.maydell@linaro.org>
Subject: Re: [PATCH v2 6/6] tests/qtest: Add ivshmem-flat test
Date: Mon, 19 Feb 2024 15:04:52 +0100 [thread overview]
Message-ID: <91aad72f-825f-47c1-a253-cefead336553@redhat.com> (raw)
In-Reply-To: <20240216144456.34992-7-philmd@linaro.org>
On 16/02/2024 15.44, Philippe Mathieu-Daudé wrote:
> From: Gustavo Romero <gustavo.romero@linaro.org>
>
> Add qtest for the ivshmem-flat device.
>
> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
> Message-ID: <20231127052024.435743-4-gustavo.romero@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> tests/qtest/ivshmem-flat-test.c | 320 ++++++++++++++++++++++++++++++++
> tests/qtest/meson.build | 2 +
> 2 files changed, 322 insertions(+)
> create mode 100644 tests/qtest/ivshmem-flat-test.c
>
> diff --git a/tests/qtest/ivshmem-flat-test.c b/tests/qtest/ivshmem-flat-test.c
> new file mode 100644
> index 0000000000..5489a0d915
> --- /dev/null
> +++ b/tests/qtest/ivshmem-flat-test.c
> @@ -0,0 +1,320 @@
> +/*
> + * Inter-VM Shared Memory Flat Device qtests
> + *
> + * SPDX-FileCopyrightText: 2023 Linaro Ltd.
> + * SPDX-FileContributor: Gustavo Romero <gustavo.romero@linaro.org>
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + */
> +
> +#include "ivshmem-utils.h"
> +
> +#define IVSHMEM_FLAT_MMR_ADDR 0x400FF000
> +#define IVSHMEM_FLAT_SHM_ADDR 0x40100000
> +#define SHM_SIZE 131072 /* 128k */
> +
> +static ServerThread thread;
> +
> +uint32_t *shm_ptr;
> +char *shm_rel_path;
> +char *server_socket_path;
> +
> +static void cleanup(void)
> +{
> + if (shm_ptr) {
> + munmap(shm_ptr, SHM_SIZE);
> + shm_ptr = NULL;
> + }
> +
> + if (shm_rel_path) {
> + shm_unlink(shm_rel_path);
> + shm_rel_path = NULL;
> + }
> +
> + if (server_socket_path) {
> + unlink(server_socket_path);
> + server_socket_path = NULL;
> + }
> +}
> +
> +static void abort_handler(void *data)
> +{
> + test_ivshmem_server_stop(&thread);
> + cleanup();
> +}
> +
> +/*
> + * Check if exactly 1 positive pulse (low->high->low) on 'irq' IRQ line happens
> + * in 'timeout' second(s). 'irq' must be intercepted using qtest_irq_intercept_*
> + * before this function can be used on it. It returns 0 when pulse is detected,
> + * otherwise 1.
> + */
> +static int test_ivshmem_flat_irq_positive_pulse(QTestState *qts, int irq,
> + int timeout)
> +{
> + uint64_t num_raises = 0;
> + uint64_t num_lows = 0;
> + uint64_t end_time;
> +
> + end_time = g_get_monotonic_time() + timeout * G_TIME_SPAN_SECOND;
> + do {
> + num_raises = qtest_get_irq_raised_counter(qts, 0);
> + if (num_raises) {
> + num_lows = qtest_get_irq_lowered_counter(qts, 0);
> + /* Check for 1 raise and 1 low IRQ event. */
> + if (num_raises == num_lows && num_lows == 1) {
> + return 0;
> + } else {
> + g_message("%s: Timeout expired", __func__);
> + return 1;
> + }
> + }
> + qtest_clock_step(qts, 10000);
> + } while (g_get_monotonic_time() < end_time);
> +
> + return 1;
> +}
The timeout stuff looks like it will be quite sensitive to slow CI runners.
Timeout is set to 2 seconds in most callers - but on very loaded systems, it
can easily happen that a job gets interrupted for two seconds.
I think you should either increase the 2 seconds to something bigger (maybe
use a #define for it), or instead of using g_get_monotonic_time(), rather
loop a certain number of iterations and use a g_sleep(10000) in the loop
body - that will also relax the host CPU while the test waits for QEMU to
progress?
> +static inline uint32_t read_reg(QTestState *qts, enum Reg reg)
> +{
> + uint32_t v;
> +
> + qtest_memread(qts, IVSHMEM_FLAT_MMR_ADDR + reg, &v, sizeof(v));
> +
> + return v;
> +}
> +
> +static inline void write_reg(QTestState *qts, enum Reg reg, uint32_t v)
> +{
> + qtest_memwrite(qts, IVSHMEM_FLAT_MMR_ADDR + reg, &v, sizeof(v));
> +}
> +
> +/*
> + * Setup a test VM with ivshmem-flat device attached, IRQ properly set, and
> + * connected to the ivshmem-server.
> + */
> +static QTestState *setup_vm(void)
> +{
> + QTestState *qts;
> + const char *cmd_line;
> +
> + cmd_line = g_strdup_printf("-machine lm3s6965evb "
Could you please add a check, either in meson.build or in main(), to make
sure that the lm3s6965evb machine is really available when running this
test? ... it might have been disabled in the build ...
> + "-chardev socket,path=%s,id=ivshm "
> + "-device ivshmem-flat,chardev=ivshm,"
> + "x-irq-qompath='/machine/unattached/device[1]/nvic/unnamed-gpio-in[0]',"
> + "x-bus-qompath='/sysbus',shmem-size=%d",
> + server_socket_path, SHM_SIZE);
> + qts = qtest_init(cmd_line);
> +
> + return qts;
> +}
Thomas
next prev parent reply other threads:[~2024-02-19 14:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 14:44 [PATCH v2 0/6] Add ivshmem-flat device Philippe Mathieu-Daudé
2024-02-16 14:44 ` [PATCH v2 1/6] hw/misc/ivshmem: " Philippe Mathieu-Daudé
2024-02-16 14:44 ` [PATCH v2 2/6] hw/misc/ivshmem-flat: Allow device to wire itself on sysbus Philippe Mathieu-Daudé
2024-02-20 15:50 ` Gustavo Romero
2024-02-20 16:02 ` Gustavo Romero
2024-02-16 14:44 ` [PATCH v2 3/6] hw/arm: Allow some machines to use the ivshmem-flat device Philippe Mathieu-Daudé
2024-02-16 14:44 ` [PATCH v2 4/6] hw/misc/ivshmem: Rename ivshmem to ivshmem-pci Philippe Mathieu-Daudé
2024-02-16 14:44 ` [PATCH v2 5/6] tests/qtest: Reorganize common code in ivshmem-test Philippe Mathieu-Daudé
2024-02-19 13:54 ` Thomas Huth
2024-02-16 14:44 ` [PATCH v2 6/6] tests/qtest: Add ivshmem-flat test Philippe Mathieu-Daudé
2024-02-19 14:04 ` Thomas Huth [this message]
2024-02-20 16:01 ` Gustavo Romero
2024-02-20 15:42 ` [PATCH v2 0/6] Add ivshmem-flat device Gustavo Romero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=91aad72f-825f-47c1-a253-cefead336553@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=anton.kochkov@proton.me \
--cc=gustavo.romero@linaro.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).