From: "Cédric Le Goater" <clg@redhat.com>
To: Eric Auger <eric.auger@redhat.com>,
eric.auger.pro@gmail.com, qemu-devel@nongnu.org,
qemu-arm@nongnu.org, alex.williamson@redhat.com,
jean-philippe@linaro.org, mst@redhat.com, pbonzini@redhat.com
Cc: peter.maydell@linaro.org, peterx@redhat.com, david@redhat.com,
philmd@linaro.org, zhenzhong.duan@intel.com, yi.l.liu@intel.com
Subject: Re: [PATCH v3 12/13] test: Add some tests for range and resv-mem helpers
Date: Mon, 30 Oct 2023 08:48:24 +0100 [thread overview]
Message-ID: <3687e6e6-a81f-495e-8f31-ea2516f2a4ad@redhat.com> (raw)
In-Reply-To: <20231011175516.541374-13-eric.auger@redhat.com>
On 10/11/23 19:52, Eric Auger wrote:
> Add unit tests for both resv_region_list_insert() and
> range_inverse_array().
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>
> ---
>
> v2 -> v3:
> - conversion to new GList based protos
> ---
> tests/unit/test-resv-mem.c | 318 +++++++++++++++++++++++++++++++++++++
> tests/unit/meson.build | 1 +
> 2 files changed, 319 insertions(+)
> create mode 100644 tests/unit/test-resv-mem.c
>
> diff --git a/tests/unit/test-resv-mem.c b/tests/unit/test-resv-mem.c
> new file mode 100644
> index 0000000000..ea3336c39d
> --- /dev/null
> +++ b/tests/unit/test-resv-mem.c
> @@ -0,0 +1,318 @@
> +/*
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + * reserved-region/range.c unit-tests.
> + *
> + * Copyright (C) 2023, Red Hat, Inc.
> + *
> + * Author: Eric Auger <eric.auger@redhat.com>
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/range.h"
> +#include "exec/memory.h"
> +#include "qemu/reserved-region.h"
> +
> +#define DEBUG 0
> +
> +#if DEBUG
> +static void print_ranges(const char *prefix, GList *ranges)
> +{
> + GList *l;
> + int i = 0;
> +
> + if (!g_list_length(ranges)) {
> + printf("%s is void\n", prefix);
> + return;
> + }
> + for (l = ranges; l; l = l->next) {
> + Range *r = (Range *)l->data;
> +
> + printf("%s rev[%i] = [0x%"PRIx64",0x%"PRIx64"]\n",
> + prefix, i, range_lob(r), range_upb(r));
> + i++;
> + }
> +}
> +#endif
> +
> +static void compare_ranges(const char *prefix, GList *ranges,
> + GList *expected)
> +{
> + GList *l, *e;
> + int i = 0;
I dropped this variable. It's unused and clang complained about it.
Thanks,
C.
> +
> +#if DEBUG
> + print_ranges("out", ranges);
> + print_ranges("expected", expected);
> +#endif
> + g_assert_cmpint(g_list_length(ranges), ==, g_list_length(expected));
> + for (l = ranges, e = expected; l ; l = l->next, e = e->next) {
> + Range *r = (Range *)l->data;
> + Range *er = (Range *)e->data;
> +
> + g_assert_true(range_lob(r) == range_lob(er) &&
> + range_upb(r) == range_upb(er));
> + i++;
> + }
> +}
> +
> +static GList *insert_sorted_range(GList *list, uint64_t lob, uint64_t upb)
> +{
> + Range *new = g_new0(Range, 1);
> +
> + range_set_bounds(new, lob, upb);
> + return range_list_insert(list, new);
> +}
> +
> +static void reset(GList **in, GList **out, GList **expected)
> +{
> + g_list_free_full(*in, g_free);
> + g_list_free_full(*out, g_free);
> + g_list_free_full(*expected, g_free);
> + *in = NULL;
> + *out = NULL;
> + *expected = NULL;
> +}
> +
> +static void
> +run_range_inverse_array(const char *prefix, GList **in, GList **expected,
> + uint64_t low, uint64_t high)
> +{
> + GList *out = NULL;
> + range_inverse_array(*in, &out, low, high);
> + compare_ranges(prefix, out, *expected);
> + reset(in, &out, expected);
> +}
> +
> +static void check_range_reverse_array(void)
> +{
> + GList *in = NULL, *expected = NULL;
> +
> + /* test 1 */
> +
> + in = insert_sorted_range(in, 0x10000, UINT64_MAX);
> + expected = insert_sorted_range(expected, 0x0, 0xFFFF);
> + run_range_inverse_array("test1", &in, &expected, 0x0, UINT64_MAX);
> +
> + /* test 2 */
> +
> + in = insert_sorted_range(in, 0x10000, 0xFFFFFFFFFFFF);
> + expected = insert_sorted_range(expected, 0x0, 0xFFFF);
> + expected = insert_sorted_range(expected, 0x1000000000000, UINT64_MAX);
> + run_range_inverse_array("test1", &in, &expected, 0x0, UINT64_MAX);
> +
> + /* test 3 */
> +
> + in = insert_sorted_range(in, 0x0, 0xFFFF);
> + in = insert_sorted_range(in, 0x10000, 0x2FFFF);
> + expected = insert_sorted_range(expected, 0x30000, UINT64_MAX);
> + run_range_inverse_array("test1", &in, &expected, 0x0, UINT64_MAX);
> +
> + /* test 4 */
> +
> + in = insert_sorted_range(in, 0x50000, 0x5FFFF);
> + in = insert_sorted_range(in, 0x60000, 0xFFFFFFFFFFFF);
> + expected = insert_sorted_range(expected, 0x0, 0x4FFFF);
> + expected = insert_sorted_range(expected, 0x1000000000000, UINT64_MAX);
> + run_range_inverse_array("test1", &in, &expected, 0x0, UINT64_MAX);
> +
> + /* test 5 */
> +
> + in = insert_sorted_range(in, 0x0, UINT64_MAX);
> + run_range_inverse_array("test1", &in, &expected, 0x0, UINT64_MAX);
> +
> + /* test 6 */
> + in = insert_sorted_range(in, 0x10000, 0x1FFFF);
> + in = insert_sorted_range(in, 0x30000, 0x6FFFF);
> + in = insert_sorted_range(in, 0x90000, UINT64_MAX);
> + expected = insert_sorted_range(expected, 0x0, 0xFFFF);
> + expected = insert_sorted_range(expected, 0x20000, 0x2FFFF);
> + expected = insert_sorted_range(expected, 0x70000, 0x8FFFF);
> + run_range_inverse_array("test1", &in, &expected, 0x0, UINT64_MAX);
> +}
> +
> +static void check_range_reverse_array_low_end(void)
> +{
> + GList *in = NULL, *expected = NULL;
> +
> + /* test 1 */
> + in = insert_sorted_range(in, 0x0, UINT64_MAX);
> + run_range_inverse_array("test1", &in, &expected, 0x10000, 0xFFFFFF);
> +
> + /* test 2 */
> +
> + in = insert_sorted_range(in, 0x0, 0xFFFF);
> + in = insert_sorted_range(in, 0x20000, 0x2FFFF);
> + expected = insert_sorted_range(expected, 0x40000, 0xFFFFFFFFFFFF);
> + run_range_inverse_array("test2", &in, &expected, 0x40000, 0xFFFFFFFFFFFF);
> +
> + /* test 3 */
> + in = insert_sorted_range(in, 0x0, 0xFFFF);
> + in = insert_sorted_range(in, 0x20000, 0x2FFFF);
> + in = insert_sorted_range(in, 0x1000000000000, UINT64_MAX);
> + expected = insert_sorted_range(expected, 0x40000, 0xFFFFFFFFFFFF);
> + run_range_inverse_array("test3", &in, &expected, 0x40000, 0xFFFFFFFFFFFF);
> +
> + /* test 4 */
> +
> + in = insert_sorted_range(in, 0x0, 0xFFFF);
> + in = insert_sorted_range(in, 0x20000, 0x2FFFF);
> + in = insert_sorted_range(in, 0x1000000000000, UINT64_MAX);
> + expected = insert_sorted_range(expected, 0x30000, 0xFFFFFFFFFFFF);
> + run_range_inverse_array("test4", &in, &expected, 0x20000, 0xFFFFFFFFFFFF);
> +
> + /* test 5 */
> +
> + in = insert_sorted_range(in, 0x2000, 0xFFFF);
> + in = insert_sorted_range(in, 0x20000, 0x2FFFF);
> + in = insert_sorted_range(in, 0x100000000, 0x1FFFFFFFF);
> + expected = insert_sorted_range(expected, 0x1000, 0x1FFF);
> + expected = insert_sorted_range(expected, 0x10000, 0x1FFFF);
> + expected = insert_sorted_range(expected, 0x30000, 0xFFFFFFFF);
> + expected = insert_sorted_range(expected, 0x200000000, 0xFFFFFFFFFFFF);
> + run_range_inverse_array("test5", &in, &expected, 0x1000, 0xFFFFFFFFFFFF);
> +
> + /* test 6 */
> +
> + in = insert_sorted_range(in, 0x10000000 , 0x1FFFFFFF);
> + in = insert_sorted_range(in, 0x100000000, 0x1FFFFFFFF);
> + expected = insert_sorted_range(expected, 0x0, 0xFFFF);
> + run_range_inverse_array("test6", &in, &expected, 0x0, 0xFFFF);
> +}
> +
> +static ReservedRegion *alloc_resv_mem(unsigned type, uint64_t lob, uint64_t upb)
> +{
> + ReservedRegion *r;
> +
> + r = g_new0(ReservedRegion, 1);
> + r->type = type;
> + range_set_bounds(&r->range, lob, upb);
> + return r;
> +}
> +
> +static void print_resv_region_list(const char *prefix, GList *list,
> + uint32_t expected_length)
> +{
> + int i = g_list_length(list);
> +
> + g_assert_cmpint(i, ==, expected_length);
> +#if DEBUG
> + i = 0;
> + for (GList *l = list; l; l = l->next) {
> + ReservedRegion *r = (ReservedRegion *)l->data;
> + Range *range = &r->range;
> +
> + printf("%s item[%d]=[0x%x, 0x%"PRIx64", 0x%"PRIx64"]\n",
> + prefix, i++, r->type, range_lob(range), range_upb(range));
> + }
> +#endif
> +}
> +
> +static void free_resv_region(gpointer data)
> +{
> + ReservedRegion *reg = (ReservedRegion *)data;
> +
> + g_free(reg);
> +}
> +
> +static void check_resv_region_list_insert(void)
> +{
> + ReservedRegion *r[10];
> + GList *l = NULL;
> +
> + r[0] = alloc_resv_mem(0xA, 0, 0xFFFF);
> + r[1] = alloc_resv_mem(0xA, 0x20000, 0x2FFFF);
> + l = resv_region_list_insert(l, r[0]);
> + l = resv_region_list_insert(l, r[1]);
> + print_resv_region_list("test1", l, 2);
> +
> + /* adjacent on left */
> + r[2] = alloc_resv_mem(0xB, 0x0, 0xFFF);
> + l = resv_region_list_insert(l, r[2]);
> + /* adjacent on right */
> + r[3] = alloc_resv_mem(0xC, 0x21000, 0x2FFFF);
> + l = resv_region_list_insert(l, r[3]);
> + print_resv_region_list("test2", l, 4);
> +
> + /* exact overlap of D into C*/
> + r[4] = alloc_resv_mem(0xD, 0x21000, 0x2FFFF);
> + l = resv_region_list_insert(l, r[4]);
> + print_resv_region_list("test3", l, 4);
> +
> + /* in the middle */
> + r[5] = alloc_resv_mem(0xE, 0x22000, 0x23FFF);
> + l = resv_region_list_insert(l, r[5]);
> + print_resv_region_list("test4", l, 6);
> +
> + /* overwrites several existing ones */
> + r[6] = alloc_resv_mem(0xF, 0x10000, 0x2FFFF);
> + l = resv_region_list_insert(l, r[6]);
> + print_resv_region_list("test5", l, 3);
> +
> + /* contiguous at the end */
> + r[7] = alloc_resv_mem(0x0, 0x30000, 0x40000);
> + l = resv_region_list_insert(l, r[7]);
> + print_resv_region_list("test6", l, 4);
> +
> + g_list_free_full(l, free_resv_region);
> + l = NULL;
> +
> + r[0] = alloc_resv_mem(0x0, 0x10000, 0x1FFFF);
> + l = resv_region_list_insert(l, r[0]);
> + /* insertion before the 1st item */
> + r[1] = alloc_resv_mem(0x1, 0x0, 0xFF);
> + l = resv_region_list_insert(l, r[1]);
> + print_resv_region_list("test8", l, 2);
> +
> + /* collision on the left side */
> + r[2] = alloc_resv_mem(0xA, 0x1200, 0x11FFF);
> + l = resv_region_list_insert(l, r[2]);
> + print_resv_region_list("test9", l, 3);
> +
> + /* collision on the right side */
> + r[3] = alloc_resv_mem(0xA, 0x1F000, 0x2FFFF);
> + l = resv_region_list_insert(l, r[3]);
> + print_resv_region_list("test10", l, 4);
> +
> + /* override everything */
> + r[4] = alloc_resv_mem(0xF, 0x0, UINT64_MAX);
> + l = resv_region_list_insert(l, r[4]);
> + print_resv_region_list("test11", l, 1);
> +
> + g_list_free_full(l, free_resv_region);
> + l = NULL;
> +
> + r[0] = alloc_resv_mem(0xF, 0x1000000000000, UINT64_MAX);
> + l = resv_region_list_insert(l, r[0]);
> + print_resv_region_list("test12", l, 1);
> +
> + r[1] = alloc_resv_mem(0xA, 0x0, 0xFFFFFFF);
> + l = resv_region_list_insert(l, r[1]);
> + print_resv_region_list("test12", l, 2);
> +
> + r[2] = alloc_resv_mem(0xB, 0x100000000, 0x1FFFFFFFF);
> + l = resv_region_list_insert(l, r[2]);
> + print_resv_region_list("test12", l, 3);
> +
> + r[3] = alloc_resv_mem(0x0, 0x010000000, 0x2FFFFFFFF);
> + l = resv_region_list_insert(l, r[3]);
> + print_resv_region_list("test12", l, 3);
> +
> + g_list_free_full(l, free_resv_region);
> +}
> +
> +int main(int argc, char **argv)
> +{
> + g_test_init(&argc, &argv, NULL);
> +
> + g_test_add_func("/resv-mem/range_reverse_array",
> + check_range_reverse_array);
> + g_test_add_func("/resv-mem/range_reverse_array_low_end",
> + check_range_reverse_array_low_end);
> + g_test_add_func("/resv-mem/resv_region_list_insert",
> + check_resv_region_list_insert);
> +
> + g_test_run();
> +
> + return 0;
> +}
> diff --git a/tests/unit/meson.build b/tests/unit/meson.build
> index f33ae64b8d..e6c51e7a86 100644
> --- a/tests/unit/meson.build
> +++ b/tests/unit/meson.build
> @@ -21,6 +21,7 @@ tests = {
> 'test-opts-visitor': [testqapi],
> 'test-visitor-serialization': [testqapi],
> 'test-bitmap': [],
> + 'test-resv-mem': [],
> # all code tested by test-x86-cpuid is inside topology.h
> 'test-x86-cpuid': [],
> 'test-cutils': [],
next prev parent reply other threads:[~2023-10-30 7:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 17:52 [PATCH v3 00/13] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space Eric Auger
2023-10-11 17:52 ` [PATCH v3 01/13] memory: Let ReservedRegion use Range Eric Auger
2023-10-11 17:52 ` [PATCH v3 02/13] memory: Introduce memory_region_iommu_set_iova_ranges Eric Auger
2023-10-18 22:07 ` Peter Xu
2023-10-11 17:52 ` [PATCH v3 03/13] vfio: Collect container iova range info Eric Auger
2023-10-18 19:07 ` Alex Williamson
2023-10-19 6:39 ` Eric Auger
2023-10-11 17:52 ` [PATCH v3 04/13] virtio-iommu: Rename reserved_regions into prop_resv_regions Eric Auger
2023-10-11 17:52 ` [PATCH v3 05/13] range: Make range_compare() public Eric Auger
2023-10-11 17:52 ` [PATCH v3 06/13] util/reserved-region: Add new ReservedRegion helpers Eric Auger
2023-10-11 17:52 ` [PATCH v3 07/13] virtio-iommu: Introduce per IOMMUDevice reserved regions Eric Auger
2023-10-11 17:52 ` [PATCH v3 08/13] range: Introduce range_inverse_array() Eric Auger
2023-10-11 17:52 ` [PATCH v3 09/13] virtio-iommu: Record whether a probe request has been issued Eric Auger
2023-10-11 17:52 ` [PATCH v3 10/13] virtio-iommu: Implement set_iova_ranges() callback Eric Auger
2023-10-11 17:52 ` [PATCH v3 11/13] virtio-iommu: Consolidate host reserved regions and property set ones Eric Auger
2023-10-11 17:52 ` [PATCH v3 12/13] test: Add some tests for range and resv-mem helpers Eric Auger
2023-10-30 7:48 ` Cédric Le Goater [this message]
2023-10-11 17:52 ` [PATCH v3 13/13] vfio: Remove 64-bit IOVA address space assumption Eric Auger
2023-10-18 21:42 ` Alex Williamson
2023-10-19 6:37 ` Eric Auger
2023-10-18 13:37 ` [PATCH v3 00/13] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space Michael S. Tsirkin
2023-10-19 9:07 ` YangHang Liu
2023-10-19 9:08 ` Eric Auger
2023-10-19 11:07 ` Cédric Le Goater
2023-10-19 11:20 ` Michael S. Tsirkin
2023-10-19 13:51 ` Eric Auger
2023-10-19 17:40 ` Cédric Le Goater
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=3687e6e6-a81f-495e-8f31-ea2516f2a4ad@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=david@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=eric.auger@redhat.com \
--cc=jean-philippe@linaro.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=yi.l.liu@intel.com \
--cc=zhenzhong.duan@intel.com \
/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).