Introduce KUnit tests for TTM subsystem
Subsystems (3)
cover Introduce KUnit tests for TTM subsystem
This series introduces KUnit[1] tests for TTM (Translation Table Manager) subsystem, a memory manager used by graphics drivers to create and manage memory buffers across different memory domains, such as system memory or VRAM.
Unit tests implemented here cover two data structures:
- ttm_device -- referred as a buffer object device, which stores resource managers and page pools
- ttm_pool -- a struct of pools (ttm_pool_type) of different page orders and caching attributes, with pages that can be reused on the next buffer allocation
Use kunit_tool script to manually run the tests:
$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/ttm/tests
To build a kernel with TTM KUnit tests, enable CONFIG_DRM_TTM_KUNIT_TEST symbol.
As for now, tests are architecture-agnostic (i.e. KUnit runner uses UML kernel), which means that we have limited coverage in some places. For example, we can't fully test the initialization of global page pools, such as global_write_combined. It is to be decided if we want to stick to UML or use CONFIG_X86 (at least to some extent).
These patches are just a beginning of the work to improve the test coverage of TTM. Feel free to suggest changes, test cases or priorities.
Many thanks,
Karolina
--------------------------------
[1] - https://www.kernel.org/doc/html/latest/dev-tools/kunit/index.html
Karolina Stolarek (3):
drm/ttm: Introduce KUnit tests
drm/ttm/tests: Add tests for ttm_device
drm/ttm/tests: Add tests for ttm_pool
drivers/gpu/drm/Kconfig | 15 + drivers/gpu/drm/ttm/Makefile | 1 + drivers/gpu/drm/ttm/tests/.kunitconfig | 4 + drivers/gpu/drm/ttm/tests/Makefile | 6 + drivers/gpu/drm/ttm/tests/ttm_device_test.c | 213 ++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 80 ++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 34 ++ drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 401 ++++++++++++++++++ 8 files changed, 754 insertions(+) create mode 100644 drivers/gpu/drm/ttm/tests/.kunitconfig create mode 100644 drivers/gpu/drm/ttm/tests/Makefile create mode 100644 drivers/gpu/drm/ttm/tests/ttm_device_test.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h create mode 100644 drivers/gpu/drm/ttm/tests/ttm_pool_test.c
Signature · 1 line
2.25.1
RFC PATCH 1/3 drm/ttm: Introduce KUnit tests
Add an initial version of unit tests for ttm_device struct, together with helper functions.
--- drivers/gpu/drm/Kconfig | 15 ++++++ drivers/gpu/drm/ttm/Makefile | 1 + drivers/gpu/drm/ttm/tests/.kunitconfig | 4 ++ drivers/gpu/drm/ttm/tests/Makefile | 5 ++ drivers/gpu/drm/ttm/tests/ttm_device_test.c | 54 +++++++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 53 ++++++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 29 ++++++++++ 7 files changed, 161 insertions(+) create mode 100644 drivers/gpu/drm/ttm/tests/.kunitconfig create mode 100644 drivers/gpu/drm/ttm/tests/Makefile create mode 100644 drivers/gpu/drm/ttm/tests/ttm_device_test.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
drivers/gpu/drm/Kconfig +15 -0
@@ -194,6 +194,21 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_TTM_KUNIT_TEST + tristate "KUnit tests for TTM" if !KUNIT_ALL_TESTS + default n + depends on DRM && KUNIT + select DRM_TTM + select DRM_EXPORT_FOR_TESTS if m + select DRM_KUNIT_TEST_HELPERS + default KUNIT_ALL_TESTS + help + Enables unit tests for TTM, a GPU memory manager subsystem used + to manage memory buffers. This option is mostly useful for kernel + developers. + + If in doubt, say "N". + config DRM_BUDDY tristate depends on DRM
drivers/gpu/drm/ttm/Makefile +1 -0
@@ -8,3 +8,4 @@ ttm-y := ttm_tt.o ttm_bo.o ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm-$(CONFIG_AGP) += ttm_agp_backend.o obj-$(CONFIG_DRM_TTM) += ttm.o +obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += tests/
drivers/gpu/drm/ttm/tests/.kunitconfig new file +4 -0
@@ -0,0 +1,4 @@ +CONFIG_KUNIT=y +CONFIG_DRM=y +CONFIG_DRM_KUNIT_TEST_HELPERS=y +CONFIG_DRM_TTM_KUNIT_TEST=y
drivers/gpu/drm/ttm/tests/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 AND MIT + +obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += \ + ttm_device_test.o \ + ttm_kunit_helpers.o
drivers/gpu/drm/ttm/tests/ttm_device_test.c new file +54 -0
54 lines not on this page · raw message
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c new file +53 -0
53 lines not on this page · raw message
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 AND MIT */ +/* +* Copyright © 2023 Intel Corporation +*/ +#ifndef TTM_KUNIT_HELPERS_H +#define TTM_KUNIT_HELPERS_H + +#include <drm/drm_drv.h> +#include <drm/ttm/ttm_device.h> + +#include <drm/drm_kunit_helpers.h> +#include <kunit/test.h> + +extern struct ttm_device_funcs ttm_dev_funcs; + +struct ttm_test_devices_priv { +struct drm_device *drm; +struct device *dev; +}; + +int ttm_kunit_helper_alloc_device (struct kunit *test, +struct ttm_device *ttm, +bool use_dma_alloc, +bool use_dma32); + +int ttm_test_devices_init (struct kunit *test); +void ttm_test_devices_fini (struct kunit *test); + +#endif // TTM_KUNIT_HELPERS_H
Signature · 1 line
2.25.1
kernel test robot
build botRe: [RFC PATCH 1/3] drm/ttm: Introduce KUnit tests
kernel test robot noticed the following build errors:
Hi Karolina,
[This is a private test report for your RFC patch.] kernel test robot noticed the following build errors:
[auto build test ERROR on drm-misc/drm-misc-next]
[also build test ERROR on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.4-rc6 next-20230609] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Karolina-Stolarek/drm-ttm-tests-Add-tests-for-ttm_device/20230612-210534 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/8f9cfbbd05dda1a3e9914285d76c793442b1065e.1686563485.git.karolina.stolarek%40intel.com patch subject: [RFC PATCH 1/3] drm/ttm: Introduce KUnit tests config: powerpc-allmodconfig (https://download.01.org/0day-ci/archive/20230613/[email protected]/config) compiler: powerpc-linux-gcc (GCC) 12.3.0
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
git remote add drm-misc git://anongit.freedesktop.org/drm/drm-misc
git fetch drm-misc drm-misc-next
git checkout drm-misc/drm-misc-next
b4 shazam https://lore.kernel.org/r/8f9cfbbd05dda1a3e9914285d76c793442b1065e.1686563485.git.karolina.stolarek@intel.com
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=powerpc olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>, old ones prefixed by <<):
ERROR: modpost: missing MODULE_LICENSE() in drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.o
>> ERROR: modpost: "ttm_kunit_helper_alloc_device" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined! >> ERROR: modpost: "ttm_dev_funcs" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined! >> ERROR: modpost: "ttm_test_devices_init" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined! >> ERROR: modpost: "ttm_test_devices_fini" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined!
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
RFC PATCH 2/3 drm/ttm/tests: Add tests for ttm_device
In reply to Karolina StolarekTest initialization and cleanup of the ttm_device struct, including some error paths. Verify the creation of page pools if use_dma_alloc param is true.
--- drivers/gpu/drm/ttm/tests/ttm_device_test.c | 159 ++++++++++++++++++++ 1 file changed, 159 insertions(+)
drivers/gpu/drm/ttm/tests/ttm_device_test.c +159 -0
@@ -8,6 +8,13 @@#include <ttm_kunit_helpers.h> +struct ttm_device_test_case { +const char *description; +bool use_dma_alloc; +bool use_dma32; +bool pools_init_expected; +}; +static void ttm_device_init_basic (struct kunit *test) {struct ttm_test_devices_priv *priv = test->priv;
@@ -37,8 +44,160 @@ static void ttm_device_init_basic(struct kunit *test)ttm_device_fini (ttm_dev); } +static void ttm_device_init_multiple (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct ttm_device *ttm_devs; +unsigned int i, num_dev =3 ; +int err; + + ttm_devs =kunit_kcalloc (test, num_dev,sizeof (*ttm_devs),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, ttm_devs); + +for (i =0 ; i < num_dev; i++) { + err =ttm_kunit_helper_alloc_device (test, &ttm_devs[i], + false, false); +KUNIT_ASSERT_EQ (test, err,0 ); + +KUNIT_EXPECT_PTR_EQ (test, ttm_devs[i].dev_mapping, + priv->drm->anon_inode->i_mapping); +KUNIT_ASSERT_NOT_NULL (test, ttm_devs[i].wq); +KUNIT_EXPECT_PTR_EQ (test, ttm_devs[i].funcs, &ttm_dev_funcs); +KUNIT_ASSERT_NOT_NULL (test, ttm_devs[i].man_drv[TTM_PL_SYSTEM ]); + } + +KUNIT_ASSERT_EQ (test,list_count_nodes (&ttm_devs[0 ].device_list), num_dev); + +for (i =0 ; i < num_dev; i++) +ttm_device_fini (&ttm_devs[i]); +} + +static void ttm_device_fini_basic (struct kunit *test) +{ +struct ttm_device *ttm_dev; +struct ttm_resource_manager *man; +int err; + + ttm_dev =kunit_kzalloc (test,sizeof (*ttm_dev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, ttm_dev); + + err =ttm_kunit_helper_alloc_device (test, ttm_dev, false, false); +KUNIT_ASSERT_EQ (test, err,0 ); + + man =ttm_manager_type (ttm_dev,TTM_PL_SYSTEM ); +KUNIT_ASSERT_NOT_NULL (test, man); + +ttm_device_fini (ttm_dev); + +KUNIT_ASSERT_FALSE (test, man->use_type); +KUNIT_ASSERT_TRUE (test,list_empty (&man->lru[0 ])); +KUNIT_ASSERT_NULL (test, ttm_dev->man_drv[TTM_PL_SYSTEM ]); +} + +static void ttm_device_init_no_vma_man (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct drm_device *drm = priv->drm; +struct ttm_device *ttm_dev; +struct drm_vma_offset_manager *vma_man; +int err; + + ttm_dev =kunit_kzalloc (test,sizeof (*ttm_dev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, ttm_dev); + +/* Let's pretend there's no VMA manager allocated */ + vma_man = drm->vma_offset_manager; + drm->vma_offset_manager =NULL ; + + err =ttm_kunit_helper_alloc_device (test, ttm_dev, false, false); +KUNIT_EXPECT_EQ (test, err, -EINVAL ); + +/* Bring the manager back for a graceful cleanup */ + drm->vma_offset_manager = vma_man; +} + +static const struct ttm_device_test_case ttm_device_cases[] = { + { + .description ="No DMA allocations, no DMA32 required" , + .use_dma_alloc = false, + .use_dma32 = false, + .pools_init_expected = false, + }, + { + .description ="DMA allocations, DMA32 required" , + .use_dma_alloc = true, + .use_dma32 = true, + .pools_init_expected = true, + }, + { + .description ="No DMA allocations, DMA32 required" , + .use_dma_alloc = false, + .use_dma32 = true, + .pools_init_expected = false, + }, + { + .description ="DMA allocations, no DMA32 required" , + .use_dma_alloc = true, + .use_dma32 = false, + .pools_init_expected = true, + }, +}; + +static void ttm_device_case_desc (const struct ttm_device_test_case *t,char *desc) +{ +strscpy (desc, t->description,KUNIT_PARAM_DESC_SIZE ); +} + +KUNIT_ARRAY_PARAM (ttm_device, ttm_device_cases, ttm_device_case_desc); + +static void ttm_device_init_pools (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +const struct ttm_device_test_case *params = test->param_value; +struct ttm_device *ttm_dev; +struct ttm_pool *pool; +struct ttm_pool_type pt; +int err; + + ttm_dev =kunit_kzalloc (test,sizeof (*ttm_dev),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, ttm_dev); + + err =ttm_kunit_helper_alloc_device (test, ttm_dev, + params->use_dma_alloc, + params->use_dma32); +KUNIT_ASSERT_EQ (test, err,0 ); + + pool = &ttm_dev->pool; +KUNIT_ASSERT_NOT_NULL (test, pool); +KUNIT_EXPECT_PTR_EQ (test, pool->dev, priv->dev); +KUNIT_EXPECT_EQ (test, pool->use_dma_alloc, params->use_dma_alloc); +KUNIT_EXPECT_EQ (test, pool->use_dma32, params->use_dma32); + +if (params->pools_init_expected) { +for (int i =0 ; i <TTM_NUM_CACHING_TYPES ; ++i) { +for (int j =0 ; j <=MAX_ORDER ; ++j) { + pt = pool->caching[i].orders[j]; +KUNIT_EXPECT_PTR_EQ (test, pt.pool, pool); +KUNIT_EXPECT_EQ (test, pt.caching, i); +KUNIT_EXPECT_EQ (test, pt.order, j); + +if (params->use_dma_alloc) { +KUNIT_ASSERT_FALSE (test, +list_empty (&pt.pages)); + } + } + } + } + +ttm_device_fini (ttm_dev); +} +static struct kunit_case ttm_device_test_cases[] = {KUNIT_CASE (ttm_device_init_basic), +KUNIT_CASE (ttm_device_init_multiple), +KUNIT_CASE (ttm_device_fini_basic), +KUNIT_CASE (ttm_device_init_no_vma_man), +KUNIT_CASE_PARAM (ttm_device_init_pools, ttm_device_gen_params), {} };
Signature · 1 line
2.25.1
RFC PATCH 3/3 drm/ttm/tests: Add tests for ttm_pool
In reply to Karolina StolarekAdd KUnit tests that exercise page allocation using page pools and freeing pages, either by returning them to the pool or freeing them. Add a basic test for ttm_pool cleanup. Introduce helpers to create a dummy ttm_buffer_object.
--- drivers/gpu/drm/ttm/tests/Makefile | 1 + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 27 ++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 5 + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 401 ++++++++++++++++++ 4 files changed, 434 insertions(+) create mode 100644 drivers/gpu/drm/ttm/tests/ttm_pool_test.c
drivers/gpu/drm/ttm/tests/Makefile +1 -0
@@ -2,4 +2,5 @@ obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += \ ttm_device_test.o \ + ttm_pool_test.o \ ttm_kunit_helpers.o
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +27 -0
@@ -24,6 +24,33 @@ int ttm_kunit_helper_alloc_device(struct kunit *test,return err; } +struct ttm_buffer_object *ttm_kunit_helper_ttm_bo_init (struct kunit *test, +size_t size) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct drm_gem_object *gem_obj; +struct ttm_buffer_object *bo; + + gem_obj =kunit_kzalloc (test,sizeof (*gem_obj),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, gem_obj); + +drm_gem_private_object_init (priv->drm, gem_obj, size); + + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + + bo->sg =NULL ; + bo->base = *gem_obj; + +return bo; +} + +void ttm_kunit_helper_ttm_bo_fini (struct ttm_buffer_object *bo) +{ +drm_gem_object_release (&bo->base); +ttm_bo_put (bo); +} +int ttm_test_devices_init (struct kunit *test) {struct ttm_test_devices_priv *priv;
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +5 -0
@@ -7,6 +7,7 @@#include <drm/drm_drv.h> #include <drm/ttm/ttm_device.h> +#include <drm/ttm/ttm_bo.h> #include <drm/drm_kunit_helpers.h> #include <kunit/test.h>
@@ -23,6 +24,10 @@ int ttm_kunit_helper_alloc_device(struct kunit *test,bool use_dma_alloc, bool use_dma32); +struct ttm_buffer_object *ttm_kunit_helper_ttm_bo_init (struct kunit *test, +size_t size); +void ttm_kunit_helper_ttm_bo_fini (struct ttm_buffer_object *bo); +int ttm_test_devices_init (struct kunit *test);void ttm_test_devices_fini (struct kunit *test);
drivers/gpu/drm/ttm/tests/ttm_pool_test.c new file +401 -0
401 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [RFC PATCH 3/3] drm/ttm/tests: Add tests for ttm_pool
Hi Christian,
I have a question about how ttm_pool_alloc should handle a request for order > MAX_ORDER. Could you take a look at my comment below? Thanks a lot.
Quoted 221 lines · Karolina Stolarek
Add KUnit tests that exercise page allocation using page pools and freeing pages, either by returning them to the pool or freeing them. Add a basic test for
ttm_poolcleanup. Introduce helpers to create a dummyttm_buffer_object.Signed-off-by Karolina Stolarek <[email protected]>--- drivers/gpu/drm/ttm/tests/Makefile | 1 + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 27 ++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 5 + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 401 ++++++++++++++++++ 4 files changed, 434 insertions(+)create mode 100644
drivers/gpu/drm/ttm/tests/ttm_pool_test.cdrivers/gpu/drm/ttm/tests/Makefile +1
-0@@ -2,4 +2,5 @@ obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += \ ttm_device_test.o \ + ttm_pool_test.o \ ttm_kunit_helpers.odrivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +27
-0@@ -24,6 +24,33 @@ int ttm_kunit_helper_alloc_device(struct kunit *test,return err; } +struct ttm_buffer_object *ttm_kunit_helper_ttm_bo_init (struct kunit *test, +size_t size) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct drm_gem_object *gem_obj; +struct ttm_buffer_object *bo; + + gem_obj =kunit_kzalloc (test,sizeof (*gem_obj),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, gem_obj); + +drm_gem_private_object_init (priv->drm, gem_obj, size); + + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + + bo->sg =NULL ; + bo->base = *gem_obj; + +return bo; +} + +void ttm_kunit_helper_ttm_bo_fini (struct ttm_buffer_object *bo) +{ +drm_gem_object_release (&bo->base); +ttm_bo_put (bo); +} +int ttm_test_devices_init (struct kunit *test) {struct ttm_test_devices_priv *priv;drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +5
-0@@ -7,6 +7,7 @@#include <drm/drm_drv.h> #include <drm/ttm/ttm_device.h> +#include <drm/ttm/ttm_bo.h> #include <drm/drm_kunit_helpers.h> #include <kunit/test.h> @@ -23,6 +24,10 @@ int ttm_kunit_helper_alloc_device(struct kunit *test,bool use_dma_alloc, bool use_dma32); +struct ttm_buffer_object *ttm_kunit_helper_ttm_bo_init (struct kunit *test, +size_t size); +void ttm_kunit_helper_ttm_bo_fini (struct ttm_buffer_object *bo); +int ttm_test_devices_init (struct kunit *test);void ttm_test_devices_fini (struct kunit *test);drivers/gpu/drm/ttm/tests/ttm_pool_test.c new file +130
-0@@ -0,0 +1,401 @@ +// SPDX-License-Identifier: GPL-2.0 AND MIT +/* +* Copyright © 2023 Intel Corporation +*/ +#include <linux/mm.h> + +#include <drm/ttm/ttm_tt.h> +#include <drm/ttm/ttm_pool.h> + +#include <ttm_kunit_helpers.h> + +struct ttm_pool_test_case { +const char *description; +unsigned int order; +bool use_dma_alloc; +}; + +static struct ttm_operation_ctx simple_ctx = { + .interruptible = true, + .no_wait_gpu = false, +}; + +static struct ttm_tt *mock_ttm_tt_init (struct kunit *test, +uint32_t page_flags, +enum ttm_caching caching, +size_t size) +{ +struct ttm_tt *tt; +struct ttm_buffer_object *bo; +int err; + + bo =ttm_kunit_helper_ttm_bo_init (test, size); +KUNIT_ASSERT_NOT_NULL (test, bo); + + tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, tt); + + err =ttm_tt_init (tt, bo, page_flags, caching,0 ); +KUNIT_ASSERT_EQ (test, err,0 ); + +/* We don't need this BO later, release it */ +ttm_kunit_helper_ttm_bo_fini (bo); + +return tt; +} + +static struct ttm_pool *ttm_pool_pre_populated (struct kunit *test, +size_t size, +enum ttm_caching caching) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct ttm_pool *pool; +struct ttm_tt *tt; +int err; +unsigned long order =__fls (size /PAGE_SIZE ); + + tt =mock_ttm_tt_init (test, order, caching, size); +KUNIT_ASSERT_NOT_NULL (test, tt); + + pool =kunit_kzalloc (test,sizeof (*pool),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, pool); + +ttm_pool_init (pool, priv->dev, true, false); + + err =ttm_pool_alloc (pool, tt, &simple_ctx); +KUNIT_ASSERT_EQ (test, err,0 ); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); + +return pool; +} + +static const struct ttm_pool_test_case ttm_pool_basic_cases[] = { + { + .description ="One page" , + .order =0 , + }, + { + .description ="More than one page" , + .order =2 , + }, + { + .description ="Above the allocation limit" , + .order =MAX_ORDER +1 , + }, + { + .description ="One page, with coherent DMA mappings enabled" , + .order =0 , + .use_dma_alloc = true, + }, + { + .description ="Above the allocation limit, with coherent DMA mappings enabled" , + .order =MAX_ORDER +1 , + .use_dma_alloc = true, + }, +}; + +static void ttm_pool_alloc_case_desc (const struct ttm_pool_test_case *t, +char *desc) +{ +strscpy (desc, t->description,KUNIT_PARAM_DESC_SIZE ); +} + +KUNIT_ARRAY_PARAM (ttm_pool_alloc_basic, ttm_pool_basic_cases, + ttm_pool_alloc_case_desc); + +static void ttm_pool_alloc_basic (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +const struct ttm_pool_test_case *params = test->param_value; +struct ttm_tt *tt; +struct ttm_pool *pool; +struct page *fst_page, *last_page; +int err; +enum ttm_caching caching = ttm_uncached; +unsigned int expected_num_pages =1 << params->order; +size_t size = expected_num_pages *PAGE_SIZE ; + + tt =mock_ttm_tt_init (test,0 , caching, size); +KUNIT_ASSERT_NOT_NULL (test, tt); + + pool =kunit_kzalloc (test,sizeof (*pool),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, pool); + +ttm_pool_init (pool, priv->dev, params->use_dma_alloc, false); + + err =ttm_pool_alloc (pool, tt, &simple_ctx); +KUNIT_ASSERT_EQ (test, err,0 ); +KUNIT_ASSERT_EQ (test, tt->num_pages, expected_num_pages);
drivers/gpu/drm/ttm/tests/ttm_pool_test.c line 140
Quoted 10 lines
drivers/gpu/drm/ttm/tests/ttm_pool_test.c new file +10
-0+ + fst_page = tt->pages[0 ]; + last_page = tt->pages[tt->num_pages -1 ]; + +if (params->order <=MAX_ORDER ) { +if (params->use_dma_alloc) { +KUNIT_ASSERT_NOT_NULL (test, (void *)fst_page->private); +KUNIT_ASSERT_NOT_NULL (test, (void *)last_page->private); + }else { +KUNIT_ASSERT_EQ (test, fst_page->private, params->order);
For order = 2 case, I expected the private payload for the last page to be equal 2, but it was 0. Is my test setup wrong, or am I misunderstanding something?
drivers/gpu/drm/ttm/tests/ttm_pool_test.c line 145
Quoted 5 lines
drivers/gpu/drm/ttm/tests/ttm_pool_test.c new file +5
-0+ } + }else { +if (params->use_dma_alloc) { +KUNIT_ASSERT_NOT_NULL (test, (void *)fst_page->private); +KUNIT_ASSERT_NULL (test, (void *)last_page->private);
It makes sense that we don't DMA alloc here, but I wonder if we should at least warn that there are pages with no dma addresses. We asked for coherent mappings and that condition couldn't be satisfied. Maybe this is expected, just wanted to double-check.
All the best,
Karolina
Quoted 256 lines
drivers/gpu/drm/ttm/tests/ttm_pool_test.c new file +256
-0+ }else { +/* +* We expect to alloc one big block, followed by +* order 0 blocks +*/ +KUNIT_ASSERT_EQ (test, fst_page->private, + min_t(unsigned int, MAX_ORDER, + params->order)); +KUNIT_ASSERT_EQ (test, last_page->private,0 ); + } + } + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); +ttm_pool_fini (pool); +} + +static void ttm_pool_alloc_basic_dma_addr (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +const struct ttm_pool_test_case *params = test->param_value; +struct ttm_tt *tt; +struct ttm_pool *pool; +struct ttm_buffer_object *bo; +dma_addr_t dma1, dma2; +int err; +enum ttm_caching caching = ttm_uncached; +unsigned int expected_num_pages =1 << params->order; +size_t size = expected_num_pages *PAGE_SIZE ; + + tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, tt); + + bo =ttm_kunit_helper_ttm_bo_init (test, size); +KUNIT_ASSERT_NOT_NULL (test, bo); + + err =ttm_sg_tt_init (tt, bo,0 , caching); +KUNIT_ASSERT_EQ (test, err,0 ); + + pool =kunit_kzalloc (test,sizeof (*pool),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, pool); + +ttm_pool_init (pool, priv->dev, true, false); + + err =ttm_pool_alloc (pool, tt, &simple_ctx); +KUNIT_ASSERT_EQ (test, err,0 ); +KUNIT_ASSERT_EQ (test, tt->num_pages, expected_num_pages); + + dma1 = tt->dma_address[0 ]; + dma2 = tt->dma_address[tt->num_pages -1 ]; + +KUNIT_ASSERT_NOT_NULL (test, (void *)dma1); +KUNIT_ASSERT_NOT_NULL (test, (void *)dma2); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); +ttm_pool_fini (pool); +} + +static void ttm_pool_alloc_order_caching_match (struct kunit *test) +{ +struct ttm_tt *tt; +struct ttm_pool *pool; +struct ttm_pool_type *pt; +enum ttm_caching caching = ttm_uncached; +unsigned int order =0 ; +size_t size =PAGE_SIZE ; +int err; + + pool =ttm_pool_pre_populated (test, size, caching); + + pt = &pool->caching[caching].orders[order]; +KUNIT_ASSERT_FALSE (test,list_empty (&pt->pages)); + + tt =mock_ttm_tt_init (test,0 , caching, size); +KUNIT_ASSERT_NOT_NULL (test, tt); + + err =ttm_pool_alloc (pool, tt, &simple_ctx); +KUNIT_ASSERT_EQ (test, err,0 ); + +KUNIT_ASSERT_TRUE (test,list_empty (&pt->pages)); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); +ttm_pool_fini (pool); +} + +static void ttm_pool_alloc_caching_mismatch (struct kunit *test) +{ +struct ttm_tt *tt; +struct ttm_pool *pool; +struct ttm_pool_type *pt_pool, *pt_tt; +int err; +enum ttm_caching tt_caching = ttm_uncached; +enum ttm_caching pool_caching = ttm_cached; +size_t size =PAGE_SIZE ; +unsigned int order =0 ; + + pool =ttm_pool_pre_populated (test, size, pool_caching); + + pt_pool = &pool->caching[pool_caching].orders[order]; + pt_tt = &pool->caching[tt_caching].orders[order]; + + tt =mock_ttm_tt_init (test,0 , tt_caching, size); +KUNIT_ASSERT_NOT_NULL (test, tt); + +KUNIT_ASSERT_FALSE (test,list_empty (&pt_pool->pages)); +KUNIT_ASSERT_TRUE (test,list_empty (&pt_tt->pages)); + + err =ttm_pool_alloc (pool, tt, &simple_ctx); +KUNIT_ASSERT_EQ (test, err,0 ); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); + +KUNIT_ASSERT_FALSE (test,list_empty (&pt_pool->pages)); +KUNIT_ASSERT_FALSE (test,list_empty (&pt_tt->pages)); + +ttm_pool_fini (pool); +} + +static void ttm_pool_alloc_order_mismatch (struct kunit *test) +{ +struct ttm_tt *tt; +struct ttm_pool *pool; +struct ttm_pool_type *pt_pool, *pt_tt; +int err; +enum ttm_caching caching = ttm_uncached; +unsigned int order =2 ; +size_t fst_size = (1 << order) *PAGE_SIZE ; +size_t snd_size =PAGE_SIZE ; + + pool =ttm_pool_pre_populated (test, fst_size, caching); + + pt_pool = &pool->caching[caching].orders[order]; + pt_tt = &pool->caching[caching].orders[0 ]; + + tt =mock_ttm_tt_init (test,0 , caching, snd_size); +KUNIT_ASSERT_NOT_NULL (test, tt); + +KUNIT_ASSERT_FALSE (test,list_empty (&pt_pool->pages)); +KUNIT_ASSERT_TRUE (test,list_empty (&pt_tt->pages)); + + err =ttm_pool_alloc (pool, tt, &simple_ctx); +KUNIT_ASSERT_EQ (test, err,0 ); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); + +KUNIT_ASSERT_FALSE (test,list_empty (&pt_pool->pages)); +KUNIT_ASSERT_FALSE (test,list_empty (&pt_tt->pages)); + +ttm_pool_fini (pool); +} + +static void ttm_pool_free_dma_alloc (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct ttm_tt *tt; +struct ttm_pool *pool; +struct ttm_pool_type *pt; +enum ttm_caching caching = ttm_uncached; +unsigned int order =2 ; +size_t size = (1 << order) *PAGE_SIZE ; + + tt =mock_ttm_tt_init (test,0 , caching, size); +KUNIT_ASSERT_NOT_NULL (test, tt); + + pool =kunit_kzalloc (test,sizeof (*pool),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, pool); + +ttm_pool_init (pool, priv->dev, true, false); +ttm_pool_alloc (pool, tt, &simple_ctx); + + pt = &pool->caching[caching].orders[order]; +KUNIT_ASSERT_TRUE (test,list_empty (&pt->pages)); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); + +KUNIT_ASSERT_FALSE (test,list_empty (&pt->pages)); + +ttm_pool_fini (pool); +} + +static void ttm_pool_free_no_dma_alloc (struct kunit *test) +{ +struct ttm_test_devices_priv *priv = test->priv; +struct ttm_tt *tt; +struct ttm_pool *pool; +struct ttm_pool_type *pt; +enum ttm_caching caching = ttm_uncached; +unsigned int order =2 ; +size_t size = (1 << order) *PAGE_SIZE ; + + tt =mock_ttm_tt_init (test,0 , caching, size); +KUNIT_ASSERT_NOT_NULL (test, tt); + + pool =kunit_kzalloc (test,sizeof (*pool),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, pool); + +ttm_pool_init (pool, priv->dev, false, false); +ttm_pool_alloc (pool, tt, &simple_ctx); + + pt = &pool->caching[caching].orders[order]; +KUNIT_ASSERT_TRUE (test,list_is_singular (&pt->pages)); + +ttm_pool_free (pool, tt); +ttm_tt_fini (tt); + +KUNIT_ASSERT_TRUE (test,list_is_singular (&pt->pages)); + +ttm_pool_fini (pool); +} + +static void ttm_pool_fini_basic (struct kunit *test) +{ +struct ttm_pool *pool; +struct ttm_pool_type *pt; +enum ttm_caching caching = ttm_uncached; +unsigned int order =0 ; +size_t size =PAGE_SIZE ; + + pool =ttm_pool_pre_populated (test, size, caching); + pt = &pool->caching[caching].orders[order]; + +KUNIT_ASSERT_FALSE (test,list_empty (&pt->pages)); + +ttm_pool_fini (pool); + +KUNIT_ASSERT_TRUE (test,list_empty (&pt->pages)); +} + +static struct kunit_case ttm_pool_test_cases[] = { +KUNIT_CASE_PARAM (ttm_pool_alloc_basic, ttm_pool_alloc_basic_gen_params), +KUNIT_CASE_PARAM (ttm_pool_alloc_basic_dma_addr, + ttm_pool_alloc_basic_gen_params), +KUNIT_CASE (ttm_pool_alloc_order_caching_match), +KUNIT_CASE (ttm_pool_alloc_caching_mismatch), +KUNIT_CASE (ttm_pool_alloc_order_mismatch), +KUNIT_CASE (ttm_pool_free_dma_alloc), +KUNIT_CASE (ttm_pool_free_no_dma_alloc), +KUNIT_CASE (ttm_pool_fini_basic), + {} +}; + +static struct kunit_suite ttm_pool_test_suite = { + .name ="ttm_pool" , + .init = ttm_test_devices_init, + .exit = ttm_test_devices_fini, + .test_cases = ttm_pool_test_cases, +}; + +kunit_test_suites (&ttm_pool_test_suite); + +MODULE_LICENSE ("GPL" );
kernel test robot
build botRe: [RFC PATCH 3/3] drm/ttm/tests: Add tests for ttm_pool
In reply to Karolina Stolarekkernel test robot noticed the following build errors:
Hi Karolina,
[This is a private test report for your RFC patch.] kernel test robot noticed the following build errors:
[auto build test ERROR on drm-misc/drm-misc-next]
[also build test ERROR on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.4-rc6] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Karolina-Stolarek/drm-ttm-tests-Add-tests-for-ttm_device/20230612-210534 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/042feb7cc902f7fd78daf131a691d4afc14d3d8c.1686563485.git.karolina.stolarek%40intel.com patch subject: [RFC PATCH 3/3] drm/ttm/tests: Add tests for ttm_pool config: powerpc-allmodconfig (https://download.01.org/0day-ci/archive/20230613/[email protected]/config) compiler: powerpc-linux-gcc (GCC) 12.3.0
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
git remote add drm-misc git://anongit.freedesktop.org/drm/drm-misc
git fetch drm-misc drm-misc-next
git checkout drm-misc/drm-misc-next
b4 shazam https://lore.kernel.org/r/042feb7cc902f7fd78daf131a691d4afc14d3d8c.1686563485.git.karolina.stolarek@intel.com
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=powerpc olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>, old ones prefixed by <<):
ERROR: modpost: missing MODULE_LICENSE() in drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.o
ERROR: modpost: "ttm_kunit_helper_alloc_device" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined!
ERROR: modpost: "ttm_dev_funcs" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined!
ERROR: modpost: "ttm_test_devices_init" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined!
ERROR: modpost: "ttm_test_devices_fini" [drivers/gpu/drm/ttm/tests/ttm_device_test.ko] undefined!
>> ERROR: modpost: "ttm_kunit_helper_ttm_bo_init" [drivers/gpu/drm/ttm/tests/ttm_pool_test.ko] undefined! >> ERROR: modpost: "ttm_kunit_helper_ttm_bo_fini" [drivers/gpu/drm/ttm/tests/ttm_pool_test.ko] undefined! >> ERROR: modpost: "ttm_pool_init" [drivers/gpu/drm/ttm/tests/ttm_pool_test.ko] undefined! >> ERROR: modpost: "ttm_pool_fini" [drivers/gpu/drm/ttm/tests/ttm_pool_test.ko] undefined! >> ERROR: modpost: "ttm_test_devices_init" [drivers/gpu/drm/ttm/tests/ttm_pool_test.ko] undefined! >> ERROR: modpost: "ttm_test_devices_fini" [drivers/gpu/drm/ttm/tests/ttm_pool_test.ko] undefined!
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki