From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6944C4332F for ; Mon, 30 Oct 2023 07:49:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxN0l-0003tF-Rd; Mon, 30 Oct 2023 03:48:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxN0k-0003t2-SH for qemu-devel@nongnu.org; Mon, 30 Oct 2023 03:48:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxN0i-0004yg-CK for qemu-devel@nongnu.org; Mon, 30 Oct 2023 03:48:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698652110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/guRBi6ajR+ayqdAktCr4JvRYGgzSk5QYCj2qcjmyT8=; b=FUAxdu6E5DqPPpPfYd0prXDl/1f3iNhO1Nk+jVOSwwwQgmiSD0OVxn+yTf9vD68WIanqwK +gv79n5sbCuU4C/6YEORG3K4iCXrvo1xlArLN4qHhDda5LO3bqSeFe+hn9xkTEkvgrp9IC HYofHpXo6yMB+l+LivLY96p3UQf9lYc= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-ntc8AOBTPyy9jL974wkqOA-1; Mon, 30 Oct 2023 03:48:28 -0400 X-MC-Unique: ntc8AOBTPyy9jL974wkqOA-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7789a691086so544332885a.0 for ; Mon, 30 Oct 2023 00:48:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698652108; x=1699256908; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/guRBi6ajR+ayqdAktCr4JvRYGgzSk5QYCj2qcjmyT8=; b=wJlspU0/WsJvJVWXTbT9rJQfezsmvUw1+i2BUcMV57MmsjIBmVAq0/7pkffHjXpb5f OqLShb/DY241G3s978Zq7jqewK8+lMbV6O1PuvG+ppfYgFehBsAOkF+lqxpQ7urXI4Pd aVYV6nf4GRO5jw0O0WkOY0kIiUrunw7ZEo/TCrhNTpZ5ve30UyXcDN91j2P5uNOLPI8K X1XPcPNIMlvSWQev3GiMcgYZko4s49pehsCCuVtQ7GIvBIsMeS3OwOklYtWZ6puyvStD Gq8NGvLHO4QVAdEuVzUmFC6Y/UpMUoC52Sz412kjLMb5zzdYj3PcNQKjOBeT6ImgJAVL wQ0Q== X-Gm-Message-State: AOJu0YxjxLuOPqwrOCBgx2HGFooFJn+SdlsSH1fRO8OWvZy7RKqt+l1v nJmC22rH148MHOfbXv4WITN8vGxDpdbcLDz7+RdEDsLNY9XLt5SLYfv75jIxVNZpIRACmf5QDXN xQMgsBBJD02dUimw= X-Received: by 2002:a05:620a:1b86:b0:778:92d6:db0f with SMTP id dv6-20020a05620a1b8600b0077892d6db0fmr8701080qkb.20.1698652108178; Mon, 30 Oct 2023 00:48:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGC9rpayP0FDPm0niO4FhDz472dBPRiG5sbxvOq6KmGINR4+9lHvokczeCxQ0HL5xVTmB4IDg== X-Received: by 2002:a05:620a:1b86:b0:778:92d6:db0f with SMTP id dv6-20020a05620a1b8600b0077892d6db0fmr8701059qkb.20.1698652107886; Mon, 30 Oct 2023 00:48:27 -0700 (PDT) Received: from ?IPV6:2a01:e0a:280:24f0:3f78:514a:4f03:fdc0? ([2a01:e0a:280:24f0:3f78:514a:4f03:fdc0]) by smtp.gmail.com with ESMTPSA id bm7-20020a05620a198700b00774376e6475sm3112977qkb.6.2023.10.30.00.48.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Oct 2023 00:48:27 -0700 (PDT) Message-ID: <3687e6e6-a81f-495e-8f31-ea2516f2a4ad@redhat.com> Date: Mon, 30 Oct 2023 08:48:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 12/13] test: Add some tests for range and resv-mem helpers Content-Language: en-US To: Eric Auger , 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 References: <20231011175516.541374-1-eric.auger@redhat.com> <20231011175516.541374-13-eric.auger@redhat.com> From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20231011175516.541374-13-eric.auger@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.478, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 > > --- > > 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 > + */ > + > +#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': [],