From nobody Thu Oct 30 22:53:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=proton.me ARC-Seal: i=1; a=rsa-sha256; t=1753727712; cv=none; d=zohomail.com; s=zohoarc; b=G3CEMr3MOwa7fDTCL8B3v3yc03sR8XUJ1c6PgvH8BNrDvHZ8uy7ih1QAWAlVUZjDu1yyEQ/1aEgkY/jBE22x24FLzfy8di82Hokz8nynANPJymCQTLCntg70uP7B+13lNxrccUNR0mjVy5O9i4B53STfXH4UUkCvYtJ/BE5UQ0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753727712; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Kkee9yPi/A5pFcbgNosE6/d978QjMzrrxAMWcphEntw=; b=fgJ+b75qPAb5DRKtBTFQbDg3z2wdsytMfd8EvJxr07wEFSWDJm3w6MBQNHwXmOcFyyV4Szi6dBtrsKdpvC8LE0vJs+1x+VnykZnWI45a59YeNq5mPTWCQMW14SQvLQ0bfRy/UOH3YuiHr5xywAk/b57qOdNoZ+/OTklii0/ZN/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1753727712668136.35107523940064; Mon, 28 Jul 2025 11:35:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1061853.1427459 (Exim 4.92) (envelope-from ) id 1ugSgb-00028Q-OD; Mon, 28 Jul 2025 18:34:57 +0000 Received: by outflank-mailman (output) from mailman id 1061853.1427459; Mon, 28 Jul 2025 18:34:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ugSgb-00028H-LG; Mon, 28 Jul 2025 18:34:57 +0000 Received: by outflank-mailman (input) for mailman id 1061853; Mon, 28 Jul 2025 18:34:56 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ugSga-00027E-D3 for xen-devel@lists.xenproject.org; Mon, 28 Jul 2025 18:34:56 +0000 Received: from mail-10630.protonmail.ch (mail-10630.protonmail.ch [79.135.106.30]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8e6b1c19-6be1-11f0-a31e-13f23c93f187; Mon, 28 Jul 2025 20:34:55 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8e6b1c19-6be1-11f0-a31e-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=bxkwdy6lvjbhtiukrww63ixtzu.protonmail; t=1753727693; x=1753986893; bh=Kkee9yPi/A5pFcbgNosE6/d978QjMzrrxAMWcphEntw=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=PFv7yLtaYQSDka8bWJsYsXZH0JxxRCUSJpTqPNr2OM/Dmu9M3XIc+wIZMbUCqCx2R sAHVhRVG0tP4YPs2l3PFGzqxaWcWdHWRO5DP/IYNAJnJPe3NACuNm3uiLiPzO2zm2O Yj+s/uqVlEgP7isq+Azt12txc88d7puvbvCb/4/bpqUgRb4cYY+HZyYylXuHZVZ3g2 VHhVOrGIiKpkrkVO6DhCpXIM6sWZPukLo99GDSJvduAneLkUcwWxTx9cx/+gjnZYGu beD/dMAUIT3JB+tBoUhGD69+lWh5v8KOo4efRu5eTlKt6gdK9L0fpZzUUViw6pCDD9 n1KHIzdqK7GRw== Date: Mon, 28 Jul 2025 18:34:49 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: alejandro.garciavallejo@amd.com, andrew.cooper3@citrix.com, anthony.perard@vates.tech, jbeulich@suse.com, julien@xen.org, michal.orzel@amd.com, roger.pau@citrix.com, sstabellini@kernel.org, dmukhin@ford.com Subject: [PATCH v11 2/3] tools/tests: introduce unit tests for domain ID allocator Message-ID: <20250728183427.1013975-3-dmukhin@ford.com> In-Reply-To: <20250728183427.1013975-1-dmukhin@ford.com> References: <20250728183427.1013975-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 7037d3d047e58841d0bd8456a50b6c5ad283c157 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1753727714697116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin =20 Introduce some basic infrastructure for doing domain ID allocation unit tes= ts, and add a few tests that ensure correctness of the domain ID allocator in dom0less and non-dom0less scenarios. Signed-off-by: Denis Mukhin --- Changes since v10: - new patch --- tools/tests/Makefile | 2 +- tools/tests/domid/.gitignore | 2 + tools/tests/domid/Makefile | 69 ++++++++++++++ tools/tests/domid/include/xen/domain.h | 124 +++++++++++++++++++++++++ tools/tests/domid/test-domid.c | 88 ++++++++++++++++++ 5 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 tools/tests/domid/.gitignore create mode 100644 tools/tests/domid/Makefile create mode 100644 tools/tests/domid/include/xen/domain.h create mode 100644 tools/tests/domid/test-domid.c diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 36928676a666..ff1666425436 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -1,7 +1,7 @@ XEN_ROOT =3D $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -SUBDIRS-y :=3D +SUBDIRS-y :=3D domid SUBDIRS-y +=3D resource SUBDIRS-$(CONFIG_X86) +=3D cpu-policy SUBDIRS-$(CONFIG_X86) +=3D tsx diff --git a/tools/tests/domid/.gitignore b/tools/tests/domid/.gitignore new file mode 100644 index 000000000000..91ac43232518 --- /dev/null +++ b/tools/tests/domid/.gitignore @@ -0,0 +1,2 @@ +*.o +test-domid-* diff --git a/tools/tests/domid/Makefile b/tools/tests/domid/Makefile new file mode 100644 index 000000000000..e0b6a0e0a49c --- /dev/null +++ b/tools/tests/domid/Makefile @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Unit tests for domain ID allocator. +# +# There are two flavors of the test: +# - default; domain ID can be reused. +# - dom0less: each domain ID can be allocated only once. +# +# Copyright 2025 Ford Motor Company + +XEN_ROOT=3D$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +TESTS :=3D test-domid-default test-domid-CONFIG_DOM0LESS_BOOT + +vpath domid.c $(XEN_ROOT)/xen/common/ + +.PHONY: all +all: $(TESTS) + +.PHONY: run +run: $(TESTS) + $(foreach t,$(TESTS),./$(t);) + +.PHONY: clean +clean: + $(RM) -- *.o $(TESTS) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + $(RM) -- *~ + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) test-domid-* $(DESTDIR)$(LIBEXEC)/tests + +.PHONY: uninstall +uninstall: + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/test-domid-* + +CFLAGS +=3D -D__XEN_TOOLS__ +CFLAGS +=3D $(APPEND_CFLAGS) +CFLAGS +=3D $(CFLAGS_xeninclude) +CFLAGS +=3D -I./include/ + +LDFLAGS +=3D $(APPEND_LDFLAGS) + +# default (no dom0less) scenario +domid-default.o: domid.c + $(CC) $(CFLAGS) -c $^ -o $@ $(LDFLAGS) + +test-domid-default.o: test-domid.c + $(CC) $(CFLAGS) -c $^ -o $@ $(LDFLAGS) + +test-domid-default: domid-default.o test-domid-default.o + $(CC) $^ -o $@ $(LDFLAGS) + +# dom0less scenario +domid-CONFIG_DOM0LESS_BOOT.o: domid.c + $(CC) $(CFLAGS) -DCONFIG_DOM0LESS_BOOT -c $^ -o $@ $(LDFLAGS) + +test-domid-CONFIG_DOM0LESS_BOOT.o: test-domid.c + $(CC) $(CFLAGS) -DCONFIG_DOM0LESS_BOOT -c $^ -o $@ $(LDFLAGS) + +test-domid-CONFIG_DOM0LESS_BOOT: domid-CONFIG_DOM0LESS_BOOT.o test-domid-C= ONFIG_DOM0LESS_BOOT.o + $(CC) -DCONFIG_DOM0LESS_BOOT $^ -o $@ $(LDFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/domid/include/xen/domain.h b/tools/tests/domid/inc= lude/xen/domain.h new file mode 100644 index 000000000000..465568c0dd02 --- /dev/null +++ b/tools/tests/domid/include/xen/domain.h @@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit test harness for domain ID allocator. + * + * Copyright 2025 Ford Motor Company + */ + +#ifndef _TEST_HARNESS_ +#define _TEST_HARNESS_ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define BUG_ON(x) assert(!(x)) +#define ASSERT(x) assert(x) + +#define __xen_mk_uint(x) x ## U +#define xen_mk_uint(x) __xen_mk_uint(x) + +#define DOMID_FIRST_RESERVED xen_mk_uint(10) +#define DOMID_INVALID xen_mk_uint(11) + +#define DEFINE_SPINLOCK(x) unsigned long *(x) +#define spin_lock(x) ((*(x))++) +#define spin_unlock(x) ((*(x))--) + +#define BITS_PER_LONG sizeof(unsigned long) +#define BITS_PER_WORD (8U * BITS_PER_LONG) +#define BITS_TO_LONGS(bits) \ + (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG) +#define DECLARE_BITMAP(name, bits) \ + unsigned long name[BITS_TO_LONGS(bits)] + +static inline int __test_and_set_bit(unsigned int nr, unsigned long *addr) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D addr + (nr / BITS_PER_WORD); + int old =3D (*p & mask) !=3D 0; + + *p |=3D mask; + + return old; +} + +static inline void __set_bit(unsigned int nr, volatile unsigned long *addr) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D (unsigned long *)addr + (nr / BITS_PER_WORD); + + *p |=3D mask; +} + +static inline void __clear_bit(unsigned int nr, volatile unsigned long *ad= dr) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D (unsigned long *)addr + (nr / BITS_PER_WORD); + + *p &=3D ~mask; +} + +static inline unsigned long find_next_zero_bit(const unsigned long *addr, + unsigned long size, + unsigned long offset) +{ + unsigned long idx =3D offset / BITS_PER_WORD; + unsigned long bit =3D offset % BITS_PER_WORD; + + if (offset >=3D size) + return size; + + while (offset < size) + { + unsigned long val =3D addr[idx] | (~0UL >> (BITS_PER_WORD - bit)); + + if (~val) + { + unsigned long pos =3D __builtin_ffsl(~val); + + if (pos > 0) + { + unsigned long rc =3D idx * BITS_PER_WORD + (pos - 1); + + if (rc < size) + return rc; + } + } + + offset =3D (idx + 1) * BITS_PER_WORD; + idx++; + bit =3D 0; + } + + return size; +} + +#define printk printf + +#define cf_check + +typedef bool spinlock_t; +typedef uint16_t domid_t; + +/* See include/xen/domain.h */ +extern domid_t domid_alloc(domid_t domid); +extern void domid_free(domid_t domid); + +#endif /* _TEST_HARNESS_ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/tests/domid/test-domid.c b/tools/tests/domid/test-domid.c new file mode 100644 index 000000000000..f077d77be0df --- /dev/null +++ b/tools/tests/domid/test-domid.c @@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for domain ID allocator. + * + * Copyright 2025 Ford Motor Company + */ + +/* Local test include replicating hypervisor includes. */ +#include + +int main(int argc, char **argv) +{ + domid_t expected, allocated; + + printk("%s DOMID_FIRST_RESERVED=3D%u DOMID_INVALID=3D%u\n", + argv[0], DOMID_FIRST_RESERVED, DOMID_INVALID); + + /* Test ID#0 cannot be allocated twice. */ + allocated =3D domid_alloc(0); + printk("expected %u allocated %u\n", 0, allocated); + ASSERT(allocated =3D=3D 0); + allocated =3D domid_alloc(0); + printk("expected %u allocated %u\n", DOMID_INVALID, allocated); + ASSERT(allocated =3D=3D DOMID_INVALID); + + /* Ensure ID is not allocated. */ + domid_free(0); + + /* + * Test that that two consecutive calls of domid_alloc(DOMID_INVALID) + * will never return the same ID. + * NB: ID#0 is reserved and shall not be allocated by + * domid_alloc(DOMID_INVALID). + */ + for ( expected =3D 0; expected < DOMID_FIRST_RESERVED - 1; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + printk("expected %u allocated %u\n", expected + 1, allocated); + ASSERT(allocated =3D=3D expected + 1); + } + for ( expected =3D 0; expected < DOMID_FIRST_RESERVED; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + printk("expected %u allocated %u\n", DOMID_INVALID, allocated); + ASSERT(allocated =3D=3D DOMID_INVALID); + } + + /* Re-allocate first ID from [1..DOMID_FIRST_RESERVED - 1]. */ +#ifdef CONFIG_DOM0LESS_BOOT + /* Each ID is allowed to be allocated only once. */ + expected =3D DOMID_INVALID; +#else + expected =3D 1; +#endif + domid_free(1); + allocated =3D domid_alloc(DOMID_INVALID); + printk("expected %u allocated %u\n", expected, allocated); + ASSERT(allocated =3D=3D expected); + + /* Re-allocate last ID from [1..DOMID_FIRST_RESERVED - 1]. */ +#ifdef CONFIG_DOM0LESS_BOOT + /* Each ID is allowed to be allocated only once. */ + expected =3D DOMID_INVALID; +#else + expected =3D DOMID_FIRST_RESERVED - 1; +#endif + domid_free(DOMID_FIRST_RESERVED - 1); + allocated =3D domid_alloc(DOMID_INVALID); + printk("expected %u allocated %u\n", expected, allocated); + ASSERT(allocated =3D=3D expected); + + /* Allocate an invalid ID. */ + expected =3D DOMID_INVALID; + allocated =3D domid_alloc(DOMID_FIRST_RESERVED); + printk("expected %u allocated %u\n", expected, allocated); + ASSERT(allocated =3D=3D expected); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ --=20 2.34.1