Improve test coverage of TTM
Subsystems (3)
v13 cover Improve test coverage of TTM
Introduce tests for ttm_bo_validate()/ttm_bo_init_validate() that exercise simple BO placement as well as eviction (including the case where the evict domain also requires eviction to fit the incoming buffer). Prepare KUnit helpers to handle such scenarios and add a mock VRAM manager. This series also includes some updates to the helpers and more definitions used to define "special" memory domains (e.g., one that can't allocate resources or is busy), as well as drive-by fixes for the tests.
There are a couple of areas in which this test suite can be improved. Suggestions for future work can be found in the TODO file.
Use kunit_tool script to manually run all the tests:
$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/ttm/tests
To build a kernel with TTM KUnit tests, use a UML configuration, enable CONFIG_KUNIT, and then select CONFIG_DRM_TTM_KUNIT_TEST.
Many thanks,
Karolina
v13 (all suggestions by Thomas):
- Drop CONFIG_DRM_BUDDY=y from .kunitconfig
- Remove ttm_bo_wait_ctx(bo, ctx) call from the mock move, it's not needed
- Update MODULE_LICENSE descriptions (also respectively, 11/12)
- Use u32 and u64 types instead uint(32|64)_t (also respectively, 12/12)
- Update TODO to describe how the mock manager can be rewritten
v12:
- Rewrite "drm/ttm/tests: Fix a warning in ttm_bo_unreserve_bulk" patch to extend ttm_bo_kunit_init() helper to accept a dma_resv object and update calls to that helper (Christian)
- Update drm_buddy_free_list() calls with an extra argument
v11:
- Delete CONFIG_DRM_KUNIT_TEST_HELPERS from .kunitconfig file, as it gets automatically selected when TTM KUnit tests are enabled
- Call ttm_bo_put() in ttm_bo_validate_pinned() test case (Matt)
- Fix a copy-paste mistake in ttm_mem_type_cases definition (Matt)
- Update mock_move definition to do a hop on VRAM -> sysmem move and delete a dummy multihop domain. Fix the eviction tests accordingly (Matt)
- Update ttm_bo_validate_swapout() to use TT domain instead of VRAM
- Update eviction test cases to create TT domain, so they can perform multihop
- Update TODO file, as it got outdated already
Karolina Stolarek (12):
drm/ttm/tests: Fix a warning in ttm_bo_unreserve_bulk drm/ttm/tests: Delete unnecessary config option drm/ttm/tests: Set DMA mask in KUnit device drm/ttm/tests: Use an init function from the helpers lib drm/ttm/tests: Test simple BO creation and validation drm/ttm/tests: Add tests with mock resource managers drm/ttm/tests: Add test cases dependent on fence signaling drm/ttm/tests: Add eviction testing drm/ttm/tests: Add tests for ttm_tt_populate drm/ttm/tests: Add TODO file
drm/ttm/tests: Correct modules' licenses drm/ttm/tests: Use u32 and u64 over uint*_t types
drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/ttm/tests/.kunitconfig | 1 - drivers/gpu/drm/ttm/tests/Makefile | 2 + drivers/gpu/drm/ttm/tests/TODO | 27 + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 54 +- .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 1224 +++++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_device_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 180 ++- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 17 +- drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 233 ++++ drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 30 + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 8 +- drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 20 +- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 168 ++- drivers/gpu/drm/ttm/ttm_tt.c | 3 + 15 files changed, 1882 insertions(+), 88 deletions(-) create mode 100644 drivers/gpu/drm/ttm/tests/TODO create mode 100644 drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.h
Signature · 1 line
2.34.1
PATCH v13 1/12 drm/ttm/tests: Fix a warning in ttm_bo_unreserve_bulk
BOs in a bulk move have to share the same reservation object. That is not the case in the ttm_bo_unreserve_bulk subtest. Update ttm_bo_kunit_init() helper to accept dma_resv object so we can define buffer objects that share the same resv. Update calls to that helper accordingly.
--- drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 40 +++++++++++-------- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 7 +++- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 3 +- drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 4 +- drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 20 +++++----- 6 files changed, 45 insertions(+), 31 deletions(-)
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +24 -16
@@ -56,7 +56,7 @@ static void ttm_bo_reserve_optimistic_no_ticket(struct kunit *test)struct ttm_buffer_object *bo;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_bo_reserve (bo, params->interruptible, params->no_wait,NULL );KUNIT_ASSERT_EQ (test, err,0 );
@@ -71,7 +71,7 @@ static void ttm_bo_reserve_locked_no_sleep(struct kunit *test)bool no_wait = true;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL );/* Let's lock it beforehand */ dma_resv_lock (bo->base.resv,NULL );
@@ -92,7 +92,7 @@ static void ttm_bo_reserve_no_wait_ticket(struct kunit *test)ww_acquire_init (&ctx, &reservation_ww_class); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_bo_reserve (bo, interruptible, no_wait, &ctx);KUNIT_ASSERT_EQ (test, err, -EBUSY );
@@ -110,7 +110,7 @@ static void ttm_bo_reserve_double_resv(struct kunit *test)ww_acquire_init (&ctx, &reservation_ww_class); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_bo_reserve (bo, interruptible, no_wait, &ctx);KUNIT_ASSERT_EQ (test, err,0 );
@@ -138,8 +138,8 @@ static void ttm_bo_reserve_deadlock(struct kunit *test)bool no_wait = false;int err; - bo1 =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); - bo2 =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo1 =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo2 =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL );ww_acquire_init (&ctx1, &reservation_ww_class);mutex_lock (&bo2->base.resv->lock.base);
@@ -208,7 +208,7 @@ static void ttm_bo_reserve_interrupted(struct kunit *test)struct task_struct *task;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); task =kthread_create (threaded_ttm_bo_reserve, bo,"ttm-bo-reserve" );
@@ -249,7 +249,7 @@ static void ttm_bo_unreserve_basic(struct kunit *test)KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); bo->priority = bo_prio; err =ttm_resource_alloc (bo, place, &res1);
@@ -288,7 +288,7 @@ static void ttm_bo_unreserve_pinned(struct kunit *test)KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); place =ttm_place_kunit_init (test, mem_type,0 );dma_resv_lock (bo->base.resv,NULL );
@@ -321,6 +321,7 @@ static void ttm_bo_unreserve_bulk(struct kunit *test)struct ttm_resource *res1, *res2;struct ttm_device *ttm_dev;struct ttm_place *place; +struct dma_resv *resv;uint32_t mem_type =TTM_PL_SYSTEM ;unsigned int bo_priority =0 ;int err;
@@ -332,12 +333,17 @@ static void ttm_bo_unreserve_bulk(struct kunit *test) ttm_dev =kunit_kzalloc (test,sizeof (*ttm_dev),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, ttm_dev); + resv =kunit_kzalloc (test,sizeof (*resv),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, ttm_dev); + err =ttm_device_kunit_init (priv, ttm_dev, false, false);KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo1 =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); - bo2 =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); +dma_resv_init (resv); + + bo1 =ttm_bo_kunit_init (test, test->priv,BO_SIZE , resv); + bo2 =ttm_bo_kunit_init (test, test->priv,BO_SIZE , resv);dma_resv_lock (bo1->base.resv,NULL );ttm_bo_set_bulk_move (bo1, &lru_bulk_move);
@@ -363,6 +369,8 @@ static void ttm_bo_unreserve_bulk(struct kunit *test)ttm_resource_free (bo1, &res1);ttm_resource_free (bo2, &res2); + +dma_resv_fini (resv); }static void ttm_bo_put_basic (struct kunit *test)
@@ -384,7 +392,7 @@ static void ttm_bo_put_basic(struct kunit *test)KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); bo->type = ttm_bo_type_device; err =ttm_resource_alloc (bo, place, &res);
@@ -445,7 +453,7 @@ static void ttm_bo_put_shared_resv(struct kunit *test)dma_fence_signal (fence); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); bo->type = ttm_bo_type_device; bo->base.resv = external_resv;
@@ -467,7 +475,7 @@ static void ttm_bo_pin_basic(struct kunit *test)KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL );for (int i =0 ; i < no_pins; i++) {dma_resv_lock (bo->base.resv,NULL );
@@ -502,7 +510,7 @@ static void ttm_bo_pin_unpin_resource(struct kunit *test)KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_resource_alloc (bo, place, &res);KUNIT_ASSERT_EQ (test, err,0 );
@@ -553,7 +561,7 @@ static void ttm_bo_multiple_pin_one_unpin(struct kunit *test)KUNIT_ASSERT_EQ (test, err,0 ); priv->ttm_dev = ttm_dev; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_resource_alloc (bo, place, &res);KUNIT_ASSERT_EQ (test, err,0 );
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +6 -1
@@ -51,7 +51,8 @@ EXPORT_SYMBOL_GPL(ttm_device_kunit_init);struct ttm_buffer_object *ttm_bo_kunit_init (struct kunit *test,struct ttm_test_devices *devs, -size_t size) +size_t size, +struct dma_resv *obj) {struct drm_gem_object gem_obj = { };struct ttm_buffer_object *bo;
@@ -61,6 +62,10 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test,KUNIT_ASSERT_NOT_NULL (test, bo); bo->base = gem_obj; + +if (obj) + bo->base.resv = obj; + err =drm_gem_object_init (devs->drm, &bo->base, size);KUNIT_ASSERT_EQ (test, err,0 );
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +2 -1
@@ -28,7 +28,8 @@ int ttm_device_kunit_init(struct ttm_test_devices *priv, bool use_dma32);struct ttm_buffer_object *ttm_bo_kunit_init (struct kunit *test,struct ttm_test_devices *devs, -size_t size); +size_t size, +struct dma_resv *obj);struct ttm_place *ttm_place_kunit_init (struct kunit *test,uint32_t mem_type,uint32_t flags);
drivers/gpu/drm/ttm/tests/ttm_pool_test.c +2 -2
@@ -57,7 +57,7 @@ static struct ttm_tt *ttm_tt_kunit_init(struct kunit *test,struct ttm_tt *tt;int err; - bo =ttm_bo_kunit_init (test, priv->devs, size); + bo =ttm_bo_kunit_init (test, priv->devs, size,NULL );KUNIT_ASSERT_NOT_NULL (test, bo); priv->mock_bo = bo;
@@ -209,7 +209,7 @@ static void ttm_pool_alloc_basic_dma_addr(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, devs, size); + bo =ttm_bo_kunit_init (test, devs, size,NULL );KUNIT_ASSERT_NOT_NULL (test, bo); err =ttm_sg_tt_init (tt, bo,0 , caching);
drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1 -1
@@ -54,7 +54,7 @@ static void ttm_init_test_mocks(struct kunit *test,/* Make sure we have what we need for a good BO mock */ KUNIT_ASSERT_NOT_NULL (test, priv->devs->ttm_dev); - priv->bo =ttm_bo_kunit_init (test, priv->devs, size); + priv->bo =ttm_bo_kunit_init (test, priv->devs, size,NULL ); priv->place =ttm_place_kunit_init (test, mem_type, flags); }
drivers/gpu/drm/ttm/tests/ttm_tt_test.c +10 -10
@@ -63,7 +63,7 @@ static void ttm_tt_init_basic(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, test->priv, params->size); + bo =ttm_bo_kunit_init (test, test->priv, params->size,NULL ); err =ttm_tt_init (tt, bo, page_flags, caching, extra_pages);KUNIT_ASSERT_EQ (test, err,0 );
@@ -89,7 +89,7 @@ static void ttm_tt_init_misaligned(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, test->priv, size); + bo =ttm_bo_kunit_init (test, test->priv, size,NULL );/* Make the object size misaligned */ bo->base.size +=1 ;
@@ -110,7 +110,7 @@ static void ttm_tt_fini_basic(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_tt_init (tt, bo,0 , caching,0 );KUNIT_ASSERT_EQ (test, err,0 );
@@ -130,7 +130,7 @@ static void ttm_tt_fini_sg(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_sg_tt_init (tt, bo,0 , caching);KUNIT_ASSERT_EQ (test, err,0 );
@@ -151,7 +151,7 @@ static void ttm_tt_fini_shmem(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_tt_init (tt, bo,0 , caching,0 );KUNIT_ASSERT_EQ (test, err,0 );
@@ -168,7 +168,7 @@ static void ttm_tt_create_basic(struct kunit *test)struct ttm_buffer_object *bo;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); bo->type = ttm_bo_type_device;dma_resv_lock (bo->base.resv,NULL );
@@ -187,7 +187,7 @@ static void ttm_tt_create_invalid_bo_type(struct kunit *test)struct ttm_buffer_object *bo;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); bo->type = ttm_bo_type_sg +1 ;dma_resv_lock (bo->base.resv,NULL );
@@ -208,7 +208,7 @@ static void ttm_tt_create_ttm_exists(struct kunit *test) tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, tt); - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); err =ttm_tt_init (tt, bo,0 , caching,0 );KUNIT_ASSERT_EQ (test, err,0 );
@@ -239,7 +239,7 @@ static void ttm_tt_create_failed(struct kunit *test)struct ttm_buffer_object *bo;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL );/* Update ttm_device_funcs so we don't alloc ttm_tt */ devs->ttm_dev->funcs = &ttm_dev_empty_funcs;
@@ -257,7 +257,7 @@ static void ttm_tt_destroy_basic(struct kunit *test)struct ttm_buffer_object *bo;int err; - bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ); + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL );dma_resv_lock (bo->base.resv,NULL ); err =ttm_tt_create (bo, false);
Signature · 1 line
2.34.1
PATCH v13 2/12 drm/ttm/tests: Delete unnecessary config option
In reply to Karolina StolarekDRM KUnit helpers are selected automatically when TTM tests are enabled, so there's no need to do it directly in the .kunitconfig file.
--- drivers/gpu/drm/ttm/tests/.kunitconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/ttm/tests/.kunitconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_KUNIT=y CONFIG_DRM=y -CONFIG_DRM_KUNIT_TEST_HELPERS=y CONFIG_DRM_TTM_KUNIT_TEST=y
Signature · 1 line
2.34.1
PATCH v13 3/12 drm/ttm/tests: Set DMA mask in KUnit device
In reply to Karolina StolarekIn commit d393acce7b3f ("drm/tests: Switch to kunit devices"), DRM test helpers migrated away from using a dummy platform driver in favour of KUnit device. This means that DMA masks for the device are not set but are required by ttm_pool_alloc tests.
Set the DMA mask for coherent mappings to unblock testing.
--- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +3 -0
@@ -103,6 +103,9 @@ struct ttm_test_devices *ttm_test_devices_basic(struct kunit *test) devs->dev =drm_kunit_helper_alloc_device (test);KUNIT_ASSERT_NOT_ERR_OR_NULL (test, devs->dev); +/* Set mask for alloc_coherent mappings to enable ttm_pool_alloc testing */ + devs->dev->coherent_dma_mask =-1 ; + devs->drm =__drm_kunit_helper_alloc_drm_device (test, devs->dev,sizeof (*devs->drm),0 ,DRIVER_GEM );
Signature · 1 line
2.34.1
PATCH v13 4/12 drm/ttm/tests: Use an init function from the helpers lib
In reply to Karolina StolarekAdd a new helper function that also initializes the device. Use it in ttm_tt test suite and delete the local definition.
--- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 14 ++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 1 + drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 15 +-------------- 3 files changed, 16 insertions(+), 14 deletions(-)
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +14 -0
@@ -158,6 +158,20 @@ int ttm_test_devices_init(struct kunit *test) }EXPORT_SYMBOL_GPL (ttm_test_devices_init); +int ttm_test_devices_all_init (struct kunit *test) +{ +struct ttm_test_devices *priv; + + priv =kunit_kzalloc (test,sizeof (*priv),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, priv); + + priv =ttm_test_devices_all (test); + test->priv = priv; + +return 0 ; +} +EXPORT_SYMBOL_GPL (ttm_test_devices_all_init); +void ttm_test_devices_fini (struct kunit *test) {ttm_test_devices_put (test, test->priv);
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +1 -0
@@ -40,6 +40,7 @@ void ttm_test_devices_put(struct kunit *test, struct ttm_test_devices *devs);/* Generic init/fini for tests that only need DRM/TTM devices */ int ttm_test_devices_init (struct kunit *test); +int ttm_test_devices_all_init (struct kunit *test);void ttm_test_devices_fini (struct kunit *test);#endif // TTM_KUNIT_HELPERS_H
drivers/gpu/drm/ttm/tests/ttm_tt_test.c +1 -14
@@ -15,19 +15,6 @@ struct ttm_tt_test_case {uint32_t extra_pages_num; }; -static int ttm_tt_test_init (struct kunit *test) -{ -struct ttm_test_devices *priv; - - priv =kunit_kzalloc (test,sizeof (*priv),GFP_KERNEL ); -KUNIT_ASSERT_NOT_NULL (test, priv); - - priv =ttm_test_devices_all (test); - test->priv = priv; - -return 0 ; -} -static const struct ttm_tt_test_case ttm_tt_init_basic_cases[] = { { .description ="Page-aligned size" ,
@@ -285,7 +272,7 @@ static struct kunit_case ttm_tt_test_cases[] = {static struct kunit_suite ttm_tt_test_suite = { .name ="ttm_tt" , - .init = ttm_tt_test_init, + .init = ttm_test_devices_all_init, .exit = ttm_test_devices_fini, .test_cases = ttm_tt_test_cases, };
Signature · 1 line
2.34.1
PATCH v13 5/12 drm/ttm/tests: Test simple BO creation and validation
In reply to Karolina StolarekAdd tests for ttm_bo_init_reserved() and ttm_bo_validate() that use sys manager. Define a simple move function in ttm_device_funcs. Expose destroy callback of the buffer object to make testing of ttm_bo_init_reserved() behaviour easier.
--- drivers/gpu/drm/ttm/tests/Makefile | 1 + .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 213 ++++++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 14 +- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 1 + 4 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c
drivers/gpu/drm/ttm/tests/Makefile +1 -0
@@ -6,4 +6,5 @@ obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += \ ttm_resource_test.o \ ttm_tt_test.o \ ttm_bo_test.o \ + ttm_bo_validate_test.o \ ttm_kunit_helpers.o
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c new file +213 -0
213 lines not on this page · raw message
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +13 -1
@@ -22,13 +22,19 @@ static void ttm_tt_simple_destroy(struct ttm_device *bdev, struct ttm_tt *ttm)kfree (ttm); } -static void dummy_ttm_bo_destroy (struct ttm_buffer_object *bo) +static int mock_move (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx, +struct ttm_resource *new_mem, +struct ttm_place *hop) { + bo->resource = new_mem; +return 0 ; }struct ttm_device_funcs ttm_dev_funcs = { .ttm_tt_create = ttm_tt_simple_create, .ttm_tt_destroy = ttm_tt_simple_destroy, + .move = mock_move, };EXPORT_SYMBOL_GPL (ttm_dev_funcs);
@@ -93,6 +99,12 @@ struct ttm_place *ttm_place_kunit_init(struct kunit *test, }EXPORT_SYMBOL_GPL (ttm_place_kunit_init); +void dummy_ttm_bo_destroy (struct ttm_buffer_object *bo) +{ +drm_gem_object_release (&bo->base); +} +EXPORT_SYMBOL_GPL (dummy_ttm_bo_destroy); +struct ttm_test_devices *ttm_test_devices_basic (struct kunit *test) {struct ttm_test_devices *devs;
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +1 -0
@@ -32,6 +32,7 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test, struct dma_resv *obj);struct ttm_place *ttm_place_kunit_init (struct kunit *test,uint32_t mem_type,uint32_t flags); +void dummy_ttm_bo_destroy (struct ttm_buffer_object *bo);struct ttm_test_devices *ttm_test_devices_basic (struct kunit *test);struct ttm_test_devices *ttm_test_devices_all (struct kunit *test);
Signature · 1 line
2.34.1
PATCH v13 6/12 drm/ttm/tests: Add tests with mock resource managers
In reply to Karolina StolarekAdd mock resource manager to test ttm_bo_validate() with non-system placements. Update KConfig entry to enable DRM Buddy allocator, used by the mock manager. Update move function to do more than just assign a resource.
--- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/ttm/tests/Makefile | 1 + .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 273 ++++++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 32 +- drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 206 +++++++++++++ drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 29 ++ 6 files changed, 540 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.c create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.h
drivers/gpu/drm/Kconfig +1 -0
@@ -235,6 +235,7 @@ config DRM_TTM_KUNIT_TEST default n depends on DRM && KUNIT && MMU && (UML || COMPILE_TEST) select DRM_TTM + select DRM_BUDDY select DRM_EXPORT_FOR_TESTS if m select DRM_KUNIT_TEST_HELPERS default KUNIT_ALL_TESTS
drivers/gpu/drm/ttm/tests/Makefile +1 -0
@@ -7,4 +7,5 @@ obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += \ ttm_tt_test.o \ ttm_bo_test.o \ ttm_bo_validate_test.o \ + ttm_mock_manager.o \ ttm_kunit_helpers.o
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +273 -0
314 lines not on this page · raw message
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +30 -2
@@ -27,8 +27,36 @@ static int mock_move(struct ttm_buffer_object *bo, bool evict,struct ttm_resource *new_mem, struct ttm_place *hop) { - bo->resource = new_mem; -return 0 ; + struct ttm_resource *old_mem = bo->resource; + +if (!old_mem || (old_mem->mem_type ==TTM_PL_SYSTEM && !bo->ttm)) { +ttm_bo_move_null (bo, new_mem); +return 0 ; + } + +if (bo->resource->mem_type ==TTM_PL_VRAM && + new_mem->mem_type ==TTM_PL_SYSTEM ) { + hop->mem_type =TTM_PL_TT ; + hop->flags =TTM_PL_FLAG_TEMPORARY ; + hop->fpfn =0 ; + hop->lpfn =0 ; +return -EMULTIHOP ; + } + +if (old_mem->mem_type ==TTM_PL_SYSTEM && + new_mem->mem_type ==TTM_PL_TT ) { +ttm_bo_move_null (bo, new_mem); +return 0 ; + } + +if (old_mem->mem_type ==TTM_PL_TT && + new_mem->mem_type ==TTM_PL_SYSTEM ) { +ttm_resource_free (bo, &bo->resource); +ttm_bo_assign_mem (bo, new_mem); +return 0 ; + } + +return ttm_bo_move_memcpy (bo, ctx, new_mem); } struct ttm_device_funcs ttm_dev_funcs = {
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +206 -0
206 lines not on this page · raw message
drivers/gpu/drm/ttm/tests/ttm_mock_manager.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 AND MIT */ +/* +* Copyright © 2023 Intel Corporation +*/ +#ifndef TTM_MOCK_MANAGER_H +#define TTM_MOCK_MANAGER_H + +#include <drm/drm_buddy.h> + +struct ttm_mock_manager { +struct ttm_resource_manager man; +struct drm_buddy mm; +u64 default_page_size; +/* protects allocations of mock buffer objects */ +struct mutex lock; +}; + +struct ttm_mock_resource { +struct ttm_resource base; +struct list_head blocks; +unsigned long flags; +}; + +int ttm_mock_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size); +int ttm_bad_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size); +void ttm_mock_manager_fini (struct ttm_device *bdev,u32 mem_type); +void ttm_bad_manager_fini (struct ttm_device *bdev,u32 mem_type); + +#endif // TTM_MOCK_MANAGER_H
Signature · 1 line
2.34.1
Re: [PATCH v13 06/12] drm/ttm/tests: Add tests with mock resource managers
Quoted 430 lines · Karolina Stolarek
Add mock resource manager to test
ttm_bo_validate()with non-system placements. Update KConfig entry to enable DRM Buddy allocator, used by the mock manager. Update move function to do more than just assign a resource.Signed-off-by Karolina Stolarek <[email protected]>---
drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/ttm/tests/Makefile | 1 + .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 273
++++++++++++++++++
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 32 +- drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 206 +++++++++++++ drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 29 ++6 files changed, 540 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/ttm/tests/ttm_mock_manager.ccreate mode 100644drivers/gpu/drm/ttm/tests/ttm_mock_manager.hdrivers/gpu/drm/Kconfig +0
-0@@ -235,6 +235,7 @@ config DRM_TTM_KUNIT_TESTdefault n
depends on DRM && KUNIT && MMU && (UML ||COMPILE_TEST) selectDRM_TTM
+ selectDRM_BUDDY
selectDRM_EXPORT_FOR_TESTSif m
selectDRM_KUNIT_TEST_HELPERS
defaultKUNIT_ALL_TESTSdrivers/gpu/drm/ttm/tests/Makefile +1
-0@@ -7,4 +7,5 @@ obj-$(CONFIG_DRM_TTM_KUNIT_TEST) += \ ttm_tt_test.o \ ttm_bo_test.o \ ttm_bo_validate_test.o \ + ttm_mock_manager.o \ttm_kunit_helpers.o
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +0
-0@@ -8,12 +8,15 @@ #include <drm/ttm/ttm_tt.h>
#include "ttm_kunit_helpers.h"
+#include "ttm_mock_manager.h"
#defineBO_SIZESZ_4K
+#defineMANAGER_SIZESZ_1M
structttm_bo_validate_test_case{
const char *description;
enumttm_bo_typebo_type;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+u32 mem_type;bool
with_ttm;
};drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +0
-0@@ -102,6 +105,49 @@ static void ttm_bo_init_reserved_sys_man(struct kunit *test) ttm_bo_put(bo); }drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +3
-0+static void ttm_bo_init_reserved_mock_man (struct kunit *test) +{ + const struct ttm_bo_validate_test_case *params = test-Quoted 1 line
param_value;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +11
-0+enum ttm_bo_type bo_type = params->bo_type; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_operation_ctx ctx = { }; +struct ttm_placement *placement; +u32 mem_type =TTM_PL_VRAM ; +struct ttm_buffer_object *bo; +struct ttm_place *place; +int err; + + ttm_mock_manager_init(priv->ttm_dev, mem_type,
MANAGER_SIZE);drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +10
-0+ + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + +drm_gem_private_object_init (priv->drm, &bo->base, size); + + err = ttm_bo_init_reserved(priv->ttm_dev, bo, bo_type,placement,
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +13
-0+ PAGE_SIZE, &ctx, NULL, NULL, + &dummy_ttm_bo_destroy); +dma_resv_unlock (bo->base.resv); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test,kref_read (&bo->kref),1 ); +KUNIT_EXPECT_PTR_EQ (test, bo->bdev, priv->ttm_dev); +KUNIT_EXPECT_EQ (test, bo->type, bo_type); +KUNIT_EXPECT_EQ (test, ctx.bytes_moved, size); + +if (bo_type != ttm_bo_type_kernel) + KUNIT_EXPECT_TRUE(test, + drm_mm_node_allocated(&bo-Quoted 1 line
base.vma_node.vm_node));
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +6
-0+ +ttm_resource_free (bo, &bo->resource); +ttm_bo_put (bo); +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +} +static void
ttm_bo_init_reserved_resv(struct kunit *test){
enumttm_bo_typebo_type=ttm_bo_type_device;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +0
-0@@ -136,6 +182,51 @@ static void ttm_bo_init_reserved_resv(struct kunit *test) ttm_bo_put(bo); }drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +3
-0+static void ttm_bo_validate_basic (struct kunit *test) +{ + const struct ttm_bo_validate_test_case *params = test-Quoted 1 line
param_value;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +13
-0+u32 fst_mem =TTM_PL_SYSTEM , snd_mem =TTM_PL_VRAM ; +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +struct ttm_placement *fst_placement, *snd_placement; +struct ttm_test_devices *priv = test->priv; +struct ttm_place *fst_place, *snd_place; +u32 size =ALIGN (SZ_8K ,PAGE_SIZE ); +struct ttm_buffer_object *bo; +int err; + +ttm_mock_manager_init (priv->ttm_dev, snd_mem,MANAGER_SIZE ); + + fst_place =ttm_place_kunit_init (test, fst_mem,0 ); + fst_placement = ttm_placement_kunit_init(test, fst_place,1);
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +7
-0+ + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + +drm_gem_private_object_init (priv->drm, &bo->base, size); + + err = ttm_bo_init_reserved(priv->ttm_dev, bo, params-Quoted 1 line
bo_type,drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ fst_placement, PAGE_SIZE,
&ctx_init, NULL,drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +4
-0+ NULL, &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); + + snd_place = ttm_place_kunit_init(test, snd_mem,
DRM_BUDDY_TOPDOWN_ALLOCATION);drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ snd_placement = ttm_placement_kunit_init(test, snd_place,1);
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +16
-0+ + err =ttm_bo_validate (bo, snd_placement, &ctx_val); +dma_resv_unlock (bo->base.resv); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved, bo->base.size); +KUNIT_EXPECT_NOT_NULL (test, bo->ttm); +KUNIT_EXPECT_TRUE (test,ttm_tt_is_populated (bo->ttm)); +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, snd_mem); +KUNIT_EXPECT_EQ (test, bo->resource->placement, +DRM_BUDDY_TOPDOWN_ALLOCATION ); + +ttm_bo_put (bo); +ttm_mock_manager_fini (priv->ttm_dev, snd_mem); +} +static void
ttm_bo_validate_invalid_placement(struct kunit *test){
enumttm_bo_typebo_type=ttm_bo_type_device;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +0
-0@@ -162,6 +253,36 @@ static void ttm_bo_validate_invalid_placement(struct kunit *test) ttm_bo_put(bo); }drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +30
-0+static void ttm_bo_validate_failed_alloc (struct kunit *test) +{ +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_operation_ctx ctx = { }; +struct ttm_placement *placement; +u32 mem_type =TTM_PL_VRAM ; +struct ttm_buffer_object *bo; +struct ttm_place *place; +int err; + + bo =ttm_bo_kunit_init (test, test->priv, size,NULL ); + bo->type = bo_type; + +ttm_bad_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + +ttm_bo_reserve (bo, false, false,NULL ); + err =ttm_bo_validate (bo, placement, &ctx); +dma_resv_unlock (bo->base.resv); + +KUNIT_EXPECT_EQ (test, err, -ENOMEM ); + +ttm_bo_put (bo); +ttm_bad_manager_fini (priv->ttm_dev, mem_type); +} +static void
ttm_bo_validate_pinned(struct kunit *test){
enumttm_bo_typebo_type=ttm_bo_type_device;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +0
-0@@ -193,11 +314,163 @@ static void ttm_bo_validate_pinned(struct kunit *test) ttm_bo_put(bo); }
+static const structttm_bo_validate_test_casettm_mem_type_cases[] = {drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +16
-0+ { + .description = "System manager", + .mem_type = TTM_PL_SYSTEM, + }, + { + .description = "VRAM manager", + .mem_type = TTM_PL_VRAM, + }, +}; + +KUNIT_ARRAY_PARAM (ttm_bo_validate_mem, ttm_mem_type_cases, + ttm_bo_validate_case_desc); + +static void ttm_bo_validate_same_placement (struct kunit *test) +{ + const struct ttm_bo_validate_test_case *params = test-Quoted 1 line
param_value;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +13
-0+struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_placement *placement; +struct ttm_buffer_object *bo; +struct ttm_place *place; +int err; + + place =ttm_place_kunit_init (test, params->mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + +if (params->mem_type !=TTM_PL_SYSTEM ) + ttm_mock_manager_init(priv->ttm_dev, params-Quoted 1 line
mem_type,MANAGER_SIZE);drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +7
-0+ + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + +drm_gem_private_object_init (priv->drm, &bo->base, size); + + err = ttm_bo_init_reserved(priv->ttm_dev, bo, params-Quoted 1 line
bo_type,drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ placement, PAGE_SIZE, &ctx_init,NULL,
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +13
-0+ NULL, &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); + + err =ttm_bo_validate (bo, placement, &ctx_val); +dma_resv_unlock (bo->base.resv); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved,0 ); + +ttm_bo_put (bo); + +if (params->mem_type !=TTM_PL_SYSTEM ) + ttm_mock_manager_fini(priv->ttm_dev, params-Quoted 1 line
mem_type);drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +20
-0+} + +static void ttm_bo_validate_busy_placement (struct kunit *test) +{ +u32 fst_mem =TTM_PL_VRAM , snd_mem =TTM_PL_VRAM +1 ; +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +struct ttm_placement *placement_init, *placement_val; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_place *init_place, places[2 ]; +struct ttm_resource_manager *man; +struct ttm_buffer_object *bo; +int err; + +ttm_bad_manager_init (priv->ttm_dev, fst_mem,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, snd_mem,MANAGER_SIZE ); + + init_place =ttm_place_kunit_init (test,TTM_PL_SYSTEM ,0 ); + placement_init = ttm_placement_kunit_init(test, init_place,1);
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +7
-0+ + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + +drm_gem_private_object_init (priv->drm, &bo->base, size); + + err = ttm_bo_init_reserved(priv->ttm_dev, bo, bo_type,
placement_init,drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +5
-0+ PAGE_SIZE, &ctx_init, NULL, NULL, + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); + + places[0] = (struct ttm_place){ .mem_type = fst_mem, .flags=
TTM_PL_FLAG_DESIRED};drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ places[1] = (struct ttm_place){ .mem_type = snd_mem, .flags=
TTM_PL_FLAG_FALLBACK};drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +11
-0+ placement_val =ttm_placement_kunit_init (test, places,2 ); + + err =ttm_bo_validate (bo, placement_val, &ctx_val); +dma_resv_unlock (bo->base.resv); + + man =ttm_manager_type (priv->ttm_dev, snd_mem); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved, bo->base.size); +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, snd_mem); + KUNIT_ASSERT_TRUE(test, list_is_singular(&man->lru[bo-Quoted 1 line
priority]));
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +9
-0+ +ttm_bo_put (bo); +ttm_bad_manager_fini (priv->ttm_dev, fst_mem); +ttm_mock_manager_fini (priv->ttm_dev, snd_mem); +} + +static void ttm_bo_validate_multihop (struct kunit *test) +{ + const struct ttm_bo_validate_test_case *params = test-Quoted 1 line
param_value;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +3
-0+struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +struct ttm_placement *placement_init, *placement_val; + u32 fst_mem = TTM_PL_VRAM, tmp_mem = TTM_PL_TT, final_mem =
TTM_PL_SYSTEM;drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +11
-0+struct ttm_test_devices *priv = test->priv; +struct ttm_place *fst_place, *final_place; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_buffer_object *bo; +int err; + +ttm_mock_manager_init (priv->ttm_dev, fst_mem,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, tmp_mem,MANAGER_SIZE ); + + fst_place =ttm_place_kunit_init (test, fst_mem,0 ); + placement_init = ttm_placement_kunit_init(test, fst_place,1);
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +7
-0+ + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + +drm_gem_private_object_init (priv->drm, &bo->base, size); + + err = ttm_bo_init_reserved(priv->ttm_dev, bo, params-Quoted 1 line
bo_type,drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ placement_init, PAGE_SIZE,
&ctx_init, NULL,drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +5
-0+ NULL, &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); + + final_place =ttm_place_kunit_init (test, final_mem,0 ); + placement_val = ttm_placement_kunit_init(test, final_place,1);
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +14
-0+ + err =ttm_bo_validate (bo, placement_val, &ctx_val); +dma_resv_unlock (bo->base.resv); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved, size *2 ); +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, final_mem); + +ttm_bo_put (bo); + +ttm_mock_manager_fini (priv->ttm_dev, fst_mem); +ttm_mock_manager_fini (priv->ttm_dev, tmp_mem); +} +static struct
kunit_casettm_bo_validate_test_cases[] = {KUNIT_CASE_PARAM(ttm_bo_init_reserved_sys_man, ttm_bo_types_gen_params),drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ KUNIT_CASE_PARAM(ttm_bo_init_reserved_mock_man,
ttm_bo_types_gen_params),
KUNIT_CASE(ttm_bo_init_reserved_resv),drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +1
-0+ KUNIT_CASE_PARAM(ttm_bo_validate_basic,
ttm_bo_types_gen_params),KUNIT_CASE(ttm_bo_validate_invalid_placement),drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +3
-0+KUNIT_CASE_PARAM (ttm_bo_validate_same_placement, + ttm_bo_validate_mem_gen_params), + KUNIT_CASE(ttm_bo_validate_failed_alloc),
KUNIT_CASE(ttm_bo_validate_pinned),drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +2
-0+KUNIT_CASE (ttm_bo_validate_busy_placement), + KUNIT_CASE_PARAM(ttm_bo_validate_multihop,
ttm_bo_types_gen_params),
{}
};drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +16
-2@@ -27,8 +27,36 @@ static int mock_move(struct ttm_buffer_object *bo, bool evict, struct ttm_resource *new_mem, struct ttm_place *hop) { - bo->resource = new_mem; -return 0 ; +struct ttm_resource *old_mem = bo->resource; + +if (!old_mem || (old_mem->mem_type ==TTM_PL_SYSTEM && !bo- >ttm)) { +ttm_bo_move_null (bo, new_mem); +return 0 ; + } + +if (bo->resource->mem_type ==TTM_PL_VRAM && + new_mem->mem_type == TTM_PL_SYSTEM) { + hop->mem_type =TTM_PL_TT ; + hop->flags =TTM_PL_FLAG_TEMPORARY ; + hop->fpfn =0 ; + hop->lpfn =0 ; +return -EMULTIHOP ; + } +
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c static int mock_move(struct ttm_buffer_object *bo, · line 57
Quoted 10 lines
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +10
-0+if (old_mem->mem_type ==TTM_PL_SYSTEM && + new_mem->mem_type == TTM_PL_TT) { +ttm_bo_move_null (bo, new_mem); +return 0 ; + } + +if (old_mem->mem_type ==TTM_PL_TT && + new_mem->mem_type == TTM_PL_SYSTEM) { +ttm_resource_free (bo, &bo->resource); +ttm_bo_assign_mem (bo, new_mem);
This above is equivalent to ttm_bo_move_null(). Replace or coalesce with the if-statement above.
With that,
Please also send last version to the intel-xe list. IIRC that will trigger the KUNIT run with the new subtests!
Thanks,
Thomas
Quoted 265 lines
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +4
-0+return 0 ; + } + +return ttm_bo_move_memcpy (bo, ctx, new_mem); }
structttm_device_funcsttm_dev_funcs= {drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +77
-0@@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0 AND MIT +/* +* Copyright © 2023 Intel Corporation +*/ +#include <drm/ttm/ttm_resource.h> +#include <drm/ttm/ttm_device.h> +#include <drm/ttm/ttm_placement.h> + +#include "ttm_mock_manager.h" + +static inline struct ttm_mock_manager * +to_mock_mgr (struct ttm_resource_manager *man) +{ + return container_of(man, struct ttm_mock_manager, man); +} + +static inline struct ttm_mock_resource * +to_mock_mgr_resource (struct ttm_resource *res) +{ + return container_of(res, struct ttm_mock_resource, base); +} + +static int ttm_mock_manager_alloc (struct ttm_resource_manager *man, + struct ttm_buffer_object *bo, + const struct ttm_place *place, + struct ttm_resource **res) +{ +struct ttm_mock_manager *manager =to_mock_mgr (man); +struct ttm_mock_resource *mock_res; +struct drm_buddy *mm = &manager->mm; +u64 lpfn, fpfn, alloc_size; +int err; + + mock_res =kzalloc (sizeof (*mock_res),GFP_KERNEL ); + +if (!mock_res) +return -ENOMEM ; + + fpfn =0 ; + lpfn = man->size; + +ttm_resource_init (bo, place, &mock_res->base); +INIT_LIST_HEAD (&mock_res->blocks); + +if (place->flags &TTM_PL_FLAG_TOPDOWN ) + mock_res->flags |=DRM_BUDDY_TOPDOWN_ALLOCATION ; + +if (place->flags &TTM_PL_FLAG_CONTIGUOUS ) + mock_res->flags |=DRM_BUDDY_CONTIGUOUS_ALLOCATION ; + + alloc_size = (uint64_t )mock_res->base.size; +mutex_lock (&manager->lock); + err =drm_buddy_alloc_blocks (mm, fpfn, lpfn, alloc_size, + manager->default_page_size, + &mock_res->blocks, + mock_res->flags); + +if (err) + goto error_free_blocks; +mutex_unlock (&manager->lock); + + *res = &mock_res->base; +return 0 ; + +error_free_blocks: +drm_buddy_free_list (mm, &mock_res->blocks,0 ); +ttm_resource_fini (man, &mock_res->base); +mutex_unlock (&manager->lock); + +return err; +} + +static void ttm_mock_manager_free (struct ttm_resource_manager *man, + struct ttm_resource *res) +{ +struct ttm_mock_manager *manager =to_mock_mgr (man); + struct ttm_mock_resource *mock_res =
to_mock_mgr_resource(res);drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +11
-0+struct drm_buddy *mm = &manager->mm; + +mutex_lock (&manager->lock); +drm_buddy_free_list (mm, &mock_res->blocks,0 ); +mutex_unlock (&manager->lock); + +ttm_resource_fini (man, res); +kfree (mock_res); +} + +static const struct ttm_resource_manager_func ttm_mock_manager_funcs= {
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +5
-0+ .alloc = ttm_mock_manager_alloc, + .free = ttm_mock_manager_free, +}; + +int ttm_mock_manager_init(struct ttm_device *bdev, u32 mem_type, u32size)
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +68
-0+{ +struct ttm_mock_manager *manager; +struct ttm_resource_manager *base; +int err; + + manager =kzalloc (sizeof (*manager),GFP_KERNEL ); +if (!manager) +return -ENOMEM ; + +mutex_init (&manager->lock); + + err =drm_buddy_init (&manager->mm, size,PAGE_SIZE ); + +if (err) { +kfree (manager); +return err; + } + + manager->default_page_size =PAGE_SIZE ; + base = &manager->man; + base->func = &ttm_mock_manager_funcs; + base->use_tt = true; + +ttm_resource_manager_init (base, bdev, size); +ttm_set_driver_manager (bdev, mem_type, base); +ttm_resource_manager_set_used (base, true); + +return 0 ; +} +EXPORT_SYMBOL_GPL (ttm_mock_manager_init); + +void ttm_mock_manager_fini (struct ttm_device *bdev,u32 mem_type) +{ +struct ttm_resource_manager *man; +struct ttm_mock_manager *mock_man; +int err; + + man =ttm_manager_type (bdev, mem_type); + mock_man =to_mock_mgr (man); + + err =ttm_resource_manager_evict_all (bdev, man); +if (err) +return ; + +ttm_resource_manager_set_used (man, false); + +mutex_lock (&mock_man->lock); +drm_buddy_fini (&mock_man->mm); +mutex_unlock (&mock_man->lock); + +ttm_set_driver_manager (bdev, mem_type,NULL ); +} +EXPORT_SYMBOL_GPL (ttm_mock_manager_fini); + +static int ttm_bad_manager_alloc (struct ttm_resource_manager *man, +struct ttm_buffer_object *bo, +const struct ttm_place *place, +struct ttm_resource **res) +{ +return -ENOSPC ; +} + +static void ttm_bad_manager_free (struct ttm_resource_manager *man, +struct ttm_resource *res) +{ +} + +static bool ttm_bad_manager_compatible(struct ttm_resource_manager*man,
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +2
-0+ struct ttm_resource *res, + const struct ttm_place*place,
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +6
-0+ size_t size) +{ +return true; +} + +static const struct ttm_resource_manager_func ttm_bad_manager_funcs= {
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +6
-0+ .alloc = ttm_bad_manager_alloc, + .free = ttm_bad_manager_free, + .compatible = ttm_bad_manager_compatible +}; + +int ttm_bad_manager_init(struct ttm_device *bdev, u32 mem_type, u32size)
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c new file +31
-0+{ +struct ttm_resource_manager *man; + + man =kzalloc (sizeof (*man),GFP_KERNEL ); +if (!man) +return -ENOMEM ; + + man->func = &ttm_bad_manager_funcs; + +ttm_resource_manager_init (man, bdev, size); +ttm_set_driver_manager (bdev, mem_type, man); +ttm_resource_manager_set_used (man, true); + +return 0 ; +} +EXPORT_SYMBOL_GPL (ttm_bad_manager_init); + +void ttm_bad_manager_fini (struct ttm_device *bdev,u32 mem_type) +{ +struct ttm_resource_manager *man; + + man =ttm_manager_type (bdev, mem_type); + +ttm_resource_manager_set_used (man, false); +ttm_set_driver_manager (bdev, mem_type,NULL ); + +kfree (man); +} +EXPORT_SYMBOL_GPL (ttm_bad_manager_fini); + +MODULE_LICENSE ("GPL and additional rights" );drivers/gpu/drm/ttm/tests/ttm_mock_manager.h new file +24
-0@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 AND MIT */ +/* +* Copyright © 2023 Intel Corporation +*/ +#ifndef TTM_MOCK_MANAGER_H +#define TTM_MOCK_MANAGER_H + +#include <drm/drm_buddy.h> + +struct ttm_mock_manager { +struct ttm_resource_manager man; +struct drm_buddy mm; +u64 default_page_size; +/* protects allocations of mock buffer objects */ +struct mutex lock; +}; + +struct ttm_mock_resource { +struct ttm_resource base; +struct list_head blocks; +unsigned long flags; +}; + +int ttm_mock_manager_init(struct ttm_device *bdev, u32 mem_type, u32size);
+intttm_bad_manager_init(struct ttm_device *bdev, u32 mem_type, u32 size);drivers/gpu/drm/ttm/tests/ttm_mock_manager.h new file +4
-0+void ttm_mock_manager_fini (struct ttm_device *bdev,u32 mem_type); +void ttm_bad_manager_fini (struct ttm_device *bdev,u32 mem_type); + +#endif // TTM_MOCK_MANAGER_H
PATCH v13 7/12 drm/ttm/tests: Add test cases dependent on fence signaling
In reply to Karolina StolarekAdd test cases that check how the state of dma fences in BO's reservation object influence the ttm_bo_validation() flow. Do similar tests for resource manager's move fence.
--- .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 305 ++++++++++++++++++ 1 file changed, 305 insertions(+)
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +305 -0
@@ -2,6 +2,8 @@/* * Copyright © 2023 Intel Corporation */ +#include <linux/delay.h> +#include <linux/kthread.h> #include <drm/ttm/ttm_resource.h> #include <drm/ttm/ttm_placement.h>
@@ -13,11 +15,14 @@#define BO_SIZE SZ_4K#define MANAGER_SIZE SZ_1M +static struct spinlock fence_lock; +struct ttm_bo_validate_test_case {const char *description;enum ttm_bo_type bo_type;u32 mem_type;bool with_ttm; +bool no_gpu_wait; }; static struct ttm_placement *ttm_placement_kunit_init(struct kunit *test,
@@ -35,6 +40,43 @@ static struct ttm_placement *ttm_placement_kunit_init(struct kunit *test,return placement; } +static const char *fence_name (struct dma_fence *f) +{ +return "ttm-bo-validate-fence" ; +} + +static const struct dma_fence_ops fence_ops = { + .get_driver_name = fence_name, + .get_timeline_name = fence_name, +}; + +static struct dma_fence *alloc_mock_fence (struct kunit *test) +{ +struct dma_fence *fence; + + fence =kunit_kzalloc (test,sizeof (*fence),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, fence); + +dma_fence_init (fence, &fence_ops, &fence_lock,0 ,0 ); + +return fence; +} + +static void dma_resv_kunit_active_fence_init (struct kunit *test, +struct dma_resv *resv, +enum dma_resv_usage usage) +{ +struct dma_fence *fence; + + fence =alloc_mock_fence (test); +dma_fence_enable_sw_signaling (fence); + +dma_resv_lock (resv,NULL ); +dma_resv_reserve_fences (resv,1 ); +dma_resv_add_fence (resv, fence, usage); +dma_resv_unlock (resv); +} +static void ttm_bo_validate_case_desc (const struct ttm_bo_validate_test_case *t,char *desc) {
@@ -459,6 +501,262 @@ static void ttm_bo_validate_multihop(struct kunit *test)ttm_mock_manager_fini (priv->ttm_dev, tmp_mem); } +static const struct ttm_bo_validate_test_case ttm_bo_no_placement_cases[] = { + { + .description ="Buffer object in system domain, no page vector" , + }, + { + .description ="Buffer object in system domain with an existing page vector" , + .with_ttm = true, + }, +}; + +KUNIT_ARRAY_PARAM (ttm_bo_no_placement, ttm_bo_no_placement_cases, + ttm_bo_validate_case_desc); + +static void ttm_bo_validate_no_placement_signaled (struct kunit *test) +{ +const struct ttm_bo_validate_test_case *params = test->param_value; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_operation_ctx ctx = { }; +u32 mem_type =TTM_PL_SYSTEM ; +struct ttm_resource_manager *man; +struct ttm_placement *placement; +struct ttm_buffer_object *bo; +struct ttm_place *place; +struct ttm_tt *old_tt; +u32 flags; +int err; + + place =ttm_place_kunit_init (test, mem_type,0 ); + man =ttm_manager_type (priv->ttm_dev, mem_type); + + bo =ttm_bo_kunit_init (test, test->priv, size,NULL ); + bo->type = bo_type; + +if (params->with_ttm) { + old_tt = priv->ttm_dev->funcs->ttm_tt_create (bo,0 ); +ttm_pool_alloc (&priv->ttm_dev->pool, old_tt, &ctx); + bo->ttm = old_tt; + } + + err =ttm_resource_alloc (bo, place, &bo->resource); +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_ASSERT_EQ (test, man->usage, size); + + placement =kunit_kzalloc (test,sizeof (*placement),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, placement); + +ttm_bo_reserve (bo, false, false,NULL ); + err =ttm_bo_validate (bo, placement, &ctx); +ttm_bo_unreserve (bo); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_ASSERT_EQ (test, man->usage,0 ); +KUNIT_ASSERT_NOT_NULL (test, bo->ttm); +KUNIT_EXPECT_EQ (test, ctx.bytes_moved,0 ); + +if (params->with_ttm) { + flags = bo->ttm->page_flags; + +KUNIT_ASSERT_PTR_EQ (test, bo->ttm, old_tt); +KUNIT_ASSERT_FALSE (test, flags &TTM_TT_FLAG_PRIV_POPULATED ); +KUNIT_ASSERT_TRUE (test, flags &TTM_TT_FLAG_ZERO_ALLOC ); + } + +ttm_bo_put (bo); +} + +static int threaded_dma_resv_signal (void *arg) +{ +struct ttm_buffer_object *bo = arg; +struct dma_resv *resv = bo->base.resv; +struct dma_resv_iter cursor; +struct dma_fence *fence; + +dma_resv_iter_begin (&cursor, resv,DMA_RESV_USAGE_BOOKKEEP ); +dma_resv_for_each_fence_unlocked (&cursor, fence) { +dma_fence_signal (fence); + } +dma_resv_iter_end (&cursor); + +return 0 ; +} + +static void ttm_bo_validate_no_placement_not_signaled (struct kunit *test) +{ +const struct ttm_bo_validate_test_case *params = test->param_value; +enum dma_resv_usage usage =DMA_RESV_USAGE_BOOKKEEP ; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_operation_ctx ctx = { }; +u32 mem_type =TTM_PL_SYSTEM ; +struct ttm_placement *placement; +struct ttm_buffer_object *bo; +struct task_struct *task; +struct ttm_place *place; +int err; + + place =ttm_place_kunit_init (test, mem_type,0 ); + + bo =ttm_bo_kunit_init (test, test->priv, size,NULL ); + bo->type = params->bo_type; + + err =ttm_resource_alloc (bo, place, &bo->resource); +KUNIT_EXPECT_EQ (test, err,0 ); + + placement =kunit_kzalloc (test,sizeof (*placement),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, placement); + +/* Create an active fence to simulate a non-idle resv object */ +spin_lock_init (&fence_lock); +dma_resv_kunit_active_fence_init (test, bo->base.resv, usage); + + task =kthread_create (threaded_dma_resv_signal, bo,"dma-resv-signal" ); +if (IS_ERR (task)) +KUNIT_FAIL (test,"Couldn't create dma resv signal task\n" ); + +wake_up_process (task); +ttm_bo_reserve (bo, false, false,NULL ); + err =ttm_bo_validate (bo, placement, &ctx); +ttm_bo_unreserve (bo); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_ASSERT_NOT_NULL (test, bo->ttm); +KUNIT_ASSERT_NULL (test, bo->resource); +KUNIT_ASSERT_NULL (test, bo->bulk_move); +KUNIT_EXPECT_EQ (test, ctx.bytes_moved,0 ); + +if (bo->type != ttm_bo_type_sg) +KUNIT_ASSERT_PTR_EQ (test, bo->base.resv, &bo->base._resv); + +/* Make sure we have an idle object at this point */ +dma_resv_wait_timeout (bo->base.resv, usage, false,MAX_SCHEDULE_TIMEOUT ); + +ttm_bo_put (bo); +} + +static void ttm_bo_validate_move_fence_signaled (struct kunit *test) +{ +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_operation_ctx ctx = { }; +u32 mem_type =TTM_PL_SYSTEM ; +struct ttm_resource_manager *man; +struct ttm_placement *placement; +struct ttm_buffer_object *bo; +struct ttm_place *place; +int err; + + man =ttm_manager_type (priv->ttm_dev, mem_type); + man->move =dma_fence_get_stub (); + + bo =ttm_bo_kunit_init (test, test->priv, size,NULL ); + bo->type = bo_type; + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + +ttm_bo_reserve (bo, false, false,NULL ); + err =ttm_bo_validate (bo, placement, &ctx); +ttm_bo_unreserve (bo); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, mem_type); +KUNIT_EXPECT_EQ (test, ctx.bytes_moved, size); + +ttm_bo_put (bo); +dma_fence_put (man->move); +} + +static const struct ttm_bo_validate_test_case ttm_bo_validate_wait_cases[] = { + { + .description ="Waits for GPU" , + .no_gpu_wait = false, + }, + { + .description ="Tries to lock straight away" , + .no_gpu_wait = true, + }, +}; + +KUNIT_ARRAY_PARAM (ttm_bo_validate_wait, ttm_bo_validate_wait_cases, + ttm_bo_validate_case_desc); + +static int threaded_fence_signal (void *arg) +{ +struct dma_fence *fence = arg; + +msleep (20 ); + +return dma_fence_signal (fence); +} + +static void ttm_bo_validate_move_fence_not_signaled (struct kunit *test) +{ +const struct ttm_bo_validate_test_case *params = test->param_value; +struct ttm_operation_ctx ctx_init = { }, + ctx_val = { .no_wait_gpu = params->no_gpu_wait }; +u32 fst_mem =TTM_PL_VRAM , snd_mem =TTM_PL_VRAM +1 ; +struct ttm_placement *placement_init, *placement_val; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +u32 size =ALIGN (BO_SIZE ,PAGE_SIZE ); +struct ttm_place *init_place, places[2 ]; +struct ttm_resource_manager *man; +struct ttm_buffer_object *bo; +struct task_struct *task; +int err; + + init_place =ttm_place_kunit_init (test,TTM_PL_SYSTEM ,0 ); + placement_init =ttm_placement_kunit_init (test, init_place,1 ); + + bo =kunit_kzalloc (test,sizeof (*bo),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo); + +drm_gem_private_object_init (priv->drm, &bo->base, size); + + err =ttm_bo_init_reserved (priv->ttm_dev, bo, bo_type, placement_init, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); + +ttm_mock_manager_init (priv->ttm_dev, fst_mem,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, snd_mem,MANAGER_SIZE ); + + places[0 ] = (struct ttm_place ){ .mem_type = fst_mem, .flags =TTM_PL_FLAG_DESIRED }; + places[1 ] = (struct ttm_place ){ .mem_type = snd_mem, .flags =TTM_PL_FLAG_FALLBACK }; + placement_val =ttm_placement_kunit_init (test, places,2 ); + +spin_lock_init (&fence_lock); + man =ttm_manager_type (priv->ttm_dev, fst_mem); + man->move =alloc_mock_fence (test); + + task =kthread_create (threaded_fence_signal, man->move,"move-fence-signal" ); +if (IS_ERR (task)) +KUNIT_FAIL (test,"Couldn't create move fence signal task\n" ); + +wake_up_process (task); + err =ttm_bo_validate (bo, placement_val, &ctx_val); +dma_resv_unlock (bo->base.resv); + +dma_fence_wait_timeout (man->move, false,MAX_SCHEDULE_TIMEOUT ); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved, size); + +if (params->no_gpu_wait) +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, snd_mem); +else +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, fst_mem); + +ttm_bo_put (bo); +ttm_mock_manager_fini (priv->ttm_dev, fst_mem); +ttm_mock_manager_fini (priv->ttm_dev, snd_mem); +} +static struct kunit_case ttm_bo_validate_test_cases[] = {KUNIT_CASE_PARAM (ttm_bo_init_reserved_sys_man, ttm_bo_types_gen_params),KUNIT_CASE_PARAM (ttm_bo_init_reserved_mock_man, ttm_bo_types_gen_params),
@@ -471,6 +769,13 @@ static struct kunit_case ttm_bo_validate_test_cases[] = {KUNIT_CASE (ttm_bo_validate_pinned),KUNIT_CASE (ttm_bo_validate_busy_placement),KUNIT_CASE_PARAM (ttm_bo_validate_multihop, ttm_bo_types_gen_params), +KUNIT_CASE_PARAM (ttm_bo_validate_no_placement_signaled, + ttm_bo_no_placement_gen_params), +KUNIT_CASE_PARAM (ttm_bo_validate_no_placement_not_signaled, + ttm_bo_types_gen_params), +KUNIT_CASE (ttm_bo_validate_move_fence_signaled), +KUNIT_CASE_PARAM (ttm_bo_validate_move_fence_not_signaled, + ttm_bo_validate_wait_gen_params), {} };
Signature · 1 line
2.34.1
PATCH v13 8/12 drm/ttm/tests: Add eviction testing
In reply to Karolina StolarekAdd tests for ttm_bo_validate that focus on BO eviction and swapout. Update device funcs definition with eviction-related callbacks. Add alternative funcs where evict_flags() routes eviction to a domain that can't allocate resources (dubbed "busy manager" in the tests). Extract the common path of ttm_device init into a function.
--- .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 433 ++++++++++++++++++ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 106 ++++- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 8 + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 29 +- drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 1 + 5 files changed, 568 insertions(+), 9 deletions(-)
drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +433 -0
@@ -757,6 +757,431 @@ static void ttm_bo_validate_move_fence_not_signaled(struct kunit *test)ttm_mock_manager_fini (priv->ttm_dev, snd_mem); } +static void ttm_bo_validate_swapout (struct kunit *test) +{ +unsigned long size_big, size =ALIGN (BO_SIZE ,PAGE_SIZE ); +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_buffer_object *bo_small, *bo_big; +struct ttm_test_devices *priv = test->priv; +struct ttm_operation_ctx ctx = { }; +struct ttm_placement *placement; +u32 mem_type =TTM_PL_TT ; +struct ttm_place *place; +struct sysinfo si; +int err; + +si_meminfo (&si); + size_big =ALIGN (((u64 )si.totalram * si.mem_unit /2 ),PAGE_SIZE ); + +ttm_mock_manager_init (priv->ttm_dev, mem_type, size_big + size); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bo_small =kunit_kzalloc (test,sizeof (*bo_small),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_small); + +drm_gem_private_object_init (priv->drm, &bo_small->base, size); + + err =ttm_bo_init_reserved (priv->ttm_dev, bo_small, bo_type, placement, +PAGE_SIZE , &ctx,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +dma_resv_unlock (bo_small->base.resv); + + bo_big =ttm_bo_kunit_init (test, priv, size_big,NULL ); + +dma_resv_lock (bo_big->base.resv,NULL ); + err =ttm_bo_validate (bo_big, placement, &ctx); +dma_resv_unlock (bo_big->base.resv); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_NOT_NULL (test, bo_big->resource); +KUNIT_EXPECT_EQ (test, bo_big->resource->mem_type, mem_type); +KUNIT_EXPECT_EQ (test, bo_small->resource->mem_type,TTM_PL_SYSTEM ); +KUNIT_EXPECT_TRUE (test, bo_small->ttm->page_flags &TTM_TT_FLAG_SWAPPED ); + +ttm_bo_put (bo_big); +ttm_bo_put (bo_small); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +} + +static void ttm_bo_validate_happy_evict (struct kunit *test) +{ +u32 mem_type =TTM_PL_VRAM , mem_multihop =TTM_PL_TT , + mem_type_evict =TTM_PL_SYSTEM ; +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +enum ttm_bo_type bo_type = ttm_bo_type_device; +u32 small =SZ_8K , medium =SZ_512K , + big =MANAGER_SIZE - (small + medium); +u32 bo_sizes[] = { small, medium, big }; +struct ttm_test_devices *priv = test->priv; +struct ttm_buffer_object *bos, *bo_val; +struct ttm_placement *placement; +struct ttm_place *place; +u32 bo_no =3 ; +int i, err; + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, mem_multihop,MANAGER_SIZE ); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bos =kunit_kmalloc_array (test, bo_no,sizeof (*bos),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bos); + +memset (bos,0 ,sizeof (*bos) * bo_no); +for (i =0 ; i < bo_no; i++) { +drm_gem_private_object_init (priv->drm, &bos[i].base, bo_sizes[i]); + err =ttm_bo_init_reserved (priv->ttm_dev, &bos[i], bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +dma_resv_unlock (bos[i].base.resv); + } + + bo_val =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo_val->type = bo_type; + +ttm_bo_reserve (bo_val, false, false,NULL ); + err =ttm_bo_validate (bo_val, placement, &ctx_val); +ttm_bo_unreserve (bo_val); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, bos[0 ].resource->mem_type, mem_type_evict); +KUNIT_EXPECT_TRUE (test, bos[0 ].ttm->page_flags &TTM_TT_FLAG_ZERO_ALLOC ); +KUNIT_EXPECT_TRUE (test, bos[0 ].ttm->page_flags &TTM_TT_FLAG_PRIV_POPULATED ); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved, small *2 +BO_SIZE ); +KUNIT_EXPECT_EQ (test, bos[1 ].resource->mem_type, mem_type); + +for (i =0 ; i < bo_no; i++) +ttm_bo_put (&bos[i]); +ttm_bo_put (bo_val); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +ttm_mock_manager_fini (priv->ttm_dev, mem_multihop); +} + +static void ttm_bo_validate_all_pinned_evict (struct kunit *test) +{ +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_buffer_object *bo_big, *bo_small; +struct ttm_test_devices *priv = test->priv; +struct ttm_placement *placement; +u32 mem_type =TTM_PL_VRAM , mem_multihop =TTM_PL_TT ; +struct ttm_place *place; +int err; + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, mem_multihop,MANAGER_SIZE ); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bo_big =kunit_kzalloc (test,sizeof (*bo_big),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_big); + +drm_gem_private_object_init (priv->drm, &bo_big->base,MANAGER_SIZE ); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_big, bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); + +ttm_bo_pin (bo_big); +dma_resv_unlock (bo_big->base.resv); + + bo_small =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo_small->type = bo_type; + +ttm_bo_reserve (bo_small, false, false,NULL ); + err =ttm_bo_validate (bo_small, placement, &ctx_val); +ttm_bo_unreserve (bo_small); + +KUNIT_EXPECT_EQ (test, err, -ENOMEM ); + +ttm_bo_put (bo_small); + +ttm_bo_reserve (bo_big, false, false,NULL ); +ttm_bo_unpin (bo_big); +dma_resv_unlock (bo_big->base.resv); +ttm_bo_put (bo_big); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +ttm_mock_manager_fini (priv->ttm_dev, mem_multihop); +} + +static void ttm_bo_validate_allowed_only_evict (struct kunit *test) +{ +u32 mem_type =TTM_PL_VRAM , mem_multihop =TTM_PL_TT , + mem_type_evict =TTM_PL_SYSTEM ; +struct ttm_buffer_object *bo, *bo_evictable, *bo_pinned; +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +struct ttm_placement *placement; +struct ttm_place *place; +u32 size =SZ_512K ; +int err; + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, mem_multihop,MANAGER_SIZE ); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bo_pinned =kunit_kzalloc (test,sizeof (*bo_pinned),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_pinned); + +drm_gem_private_object_init (priv->drm, &bo_pinned->base, size); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_pinned, bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +ttm_bo_pin (bo_pinned); +dma_resv_unlock (bo_pinned->base.resv); + + bo_evictable =kunit_kzalloc (test,sizeof (*bo_evictable),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_evictable); + +drm_gem_private_object_init (priv->drm, &bo_evictable->base, size); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_evictable, bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +dma_resv_unlock (bo_evictable->base.resv); + + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo->type = bo_type; + +ttm_bo_reserve (bo, false, false,NULL ); + err =ttm_bo_validate (bo, placement, &ctx_val); +ttm_bo_unreserve (bo); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, mem_type); +KUNIT_EXPECT_EQ (test, bo_pinned->resource->mem_type, mem_type); +KUNIT_EXPECT_EQ (test, bo_evictable->resource->mem_type, mem_type_evict); +KUNIT_EXPECT_EQ (test, ctx_val.bytes_moved, size *2 +BO_SIZE ); + +ttm_bo_put (bo); +ttm_bo_put (bo_evictable); + +ttm_bo_reserve (bo_pinned, false, false,NULL ); +ttm_bo_unpin (bo_pinned); +dma_resv_unlock (bo_pinned->base.resv); +ttm_bo_put (bo_pinned); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +ttm_mock_manager_fini (priv->ttm_dev, mem_multihop); +} + +static void ttm_bo_validate_deleted_evict (struct kunit *test) +{ +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +u32 small =SZ_8K , big =MANAGER_SIZE -BO_SIZE ; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_buffer_object *bo_big, *bo_small; +struct ttm_test_devices *priv = test->priv; +struct ttm_resource_manager *man; +u32 mem_type =TTM_PL_VRAM ; +struct ttm_placement *placement; +struct ttm_place *place; +int err; + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); + man =ttm_manager_type (priv->ttm_dev, mem_type); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bo_big =kunit_kzalloc (test,sizeof (*bo_big),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_big); + +drm_gem_private_object_init (priv->drm, &bo_big->base, big); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_big, bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test,ttm_resource_manager_usage (man), big); + +dma_resv_unlock (bo_big->base.resv); + bo_big->deleted = true; + + bo_small =ttm_bo_kunit_init (test, test->priv, small,NULL ); + bo_small->type = bo_type; + +ttm_bo_reserve (bo_small, false, false,NULL ); + err =ttm_bo_validate (bo_small, placement, &ctx_val); +ttm_bo_unreserve (bo_small); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, bo_small->resource->mem_type, mem_type); +KUNIT_EXPECT_EQ (test,ttm_resource_manager_usage (man), small); +KUNIT_EXPECT_NULL (test, bo_big->ttm); +KUNIT_EXPECT_NULL (test, bo_big->resource); + +ttm_bo_put (bo_small); +ttm_bo_put (bo_big); +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +} + +static void ttm_bo_validate_busy_domain_evict (struct kunit *test) +{ +u32 mem_type =TTM_PL_VRAM , mem_type_evict =TTM_PL_MOCK1 ; +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +struct ttm_buffer_object *bo_init, *bo_val; +struct ttm_placement *placement; +struct ttm_place *place; +int err; + +/* +* Drop the default device and setup a new one that points to busy +* thus unsuitable eviction domain +*/ +ttm_device_fini (priv->ttm_dev); + + err =ttm_device_kunit_init_bad_evict (test->priv, priv->ttm_dev, false, false); +KUNIT_ASSERT_EQ (test, err,0 ); + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); +ttm_busy_manager_init (priv->ttm_dev, mem_type_evict,MANAGER_SIZE ); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bo_init =kunit_kzalloc (test,sizeof (*bo_init),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_init); + +drm_gem_private_object_init (priv->drm, &bo_init->base,MANAGER_SIZE ); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_init, bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +dma_resv_unlock (bo_init->base.resv); + + bo_val =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo_val->type = bo_type; + +ttm_bo_reserve (bo_val, false, false,NULL ); + err =ttm_bo_validate (bo_val, placement, &ctx_val); +ttm_bo_unreserve (bo_val); + +KUNIT_EXPECT_EQ (test, err, -ENOMEM ); +KUNIT_EXPECT_EQ (test, bo_init->resource->mem_type, mem_type); +KUNIT_EXPECT_NULL (test, bo_val->resource); + +ttm_bo_put (bo_init); +ttm_bo_put (bo_val); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +ttm_bad_manager_fini (priv->ttm_dev, mem_type_evict); +} + +static void ttm_bo_validate_evict_gutting (struct kunit *test) +{ +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +struct ttm_buffer_object *bo, *bo_evict; +u32 mem_type =TTM_PL_MOCK1 ; +struct ttm_placement *placement; +struct ttm_place *place; +int err; + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); + + place =ttm_place_kunit_init (test, mem_type,0 ); + placement =ttm_placement_kunit_init (test, place,1 ); + + bo_evict =kunit_kzalloc (test,sizeof (*bo_evict),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_evict); + +drm_gem_private_object_init (priv->drm, &bo_evict->base,MANAGER_SIZE ); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_evict, bo_type, placement, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +dma_resv_unlock (bo_evict->base.resv); + + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo->type = bo_type; + +ttm_bo_reserve (bo, false, false,NULL ); + err =ttm_bo_validate (bo, placement, &ctx_val); +ttm_bo_unreserve (bo); + +KUNIT_EXPECT_EQ (test, err,0 ); +KUNIT_EXPECT_EQ (test, bo->resource->mem_type, mem_type); +KUNIT_ASSERT_NULL (test, bo_evict->resource); +KUNIT_ASSERT_TRUE (test, bo_evict->ttm->page_flags &TTM_TT_FLAG_ZERO_ALLOC ); + +ttm_bo_put (bo_evict); +ttm_bo_put (bo); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +} + +static void ttm_bo_validate_recrusive_evict (struct kunit *test) +{ +u32 mem_type =TTM_PL_TT , mem_type_evict =TTM_PL_MOCK2 ; +struct ttm_operation_ctx ctx_init = { }, ctx_val = { }; +struct ttm_placement *placement_tt, *placement_mock; +struct ttm_buffer_object *bo_tt, *bo_mock, *bo_val; +enum ttm_bo_type bo_type = ttm_bo_type_device; +struct ttm_test_devices *priv = test->priv; +struct ttm_place *place_tt, *place_mock; +int err; + +ttm_mock_manager_init (priv->ttm_dev, mem_type,MANAGER_SIZE ); +ttm_mock_manager_init (priv->ttm_dev, mem_type_evict,MANAGER_SIZE ); + + place_tt =ttm_place_kunit_init (test, mem_type,0 ); + place_mock =ttm_place_kunit_init (test, mem_type_evict,0 ); + + placement_tt =ttm_placement_kunit_init (test, place_tt,1 ); + placement_mock =ttm_placement_kunit_init (test, place_mock,1 ); + + bo_tt =kunit_kzalloc (test,sizeof (*bo_tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_tt); + + bo_mock =kunit_kzalloc (test,sizeof (*bo_mock),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, bo_mock); + +drm_gem_private_object_init (priv->drm, &bo_tt->base,MANAGER_SIZE ); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_tt, bo_type, placement_tt, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +dma_resv_unlock (bo_tt->base.resv); + +drm_gem_private_object_init (priv->drm, &bo_mock->base,MANAGER_SIZE ); + err =ttm_bo_init_reserved (priv->ttm_dev, bo_mock, bo_type, placement_mock, +PAGE_SIZE , &ctx_init,NULL ,NULL , + &dummy_ttm_bo_destroy); +KUNIT_EXPECT_EQ (test, err,0 ); +dma_resv_unlock (bo_mock->base.resv); + + bo_val =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + bo_val->type = bo_type; + +ttm_bo_reserve (bo_val, false, false,NULL ); + err =ttm_bo_validate (bo_val, placement_tt, &ctx_val); +ttm_bo_unreserve (bo_val); + +KUNIT_EXPECT_EQ (test, err,0 ); + +ttm_mock_manager_fini (priv->ttm_dev, mem_type); +ttm_mock_manager_fini (priv->ttm_dev, mem_type_evict); + +ttm_bo_put (bo_val); +ttm_bo_put (bo_tt); +ttm_bo_put (bo_mock); +} +static struct kunit_case ttm_bo_validate_test_cases[] = {KUNIT_CASE_PARAM (ttm_bo_init_reserved_sys_man, ttm_bo_types_gen_params),KUNIT_CASE_PARAM (ttm_bo_init_reserved_mock_man, ttm_bo_types_gen_params),
@@ -776,6 +1201,14 @@ static struct kunit_case ttm_bo_validate_test_cases[] = {KUNIT_CASE (ttm_bo_validate_move_fence_signaled),KUNIT_CASE_PARAM (ttm_bo_validate_move_fence_not_signaled, ttm_bo_validate_wait_gen_params), +KUNIT_CASE (ttm_bo_validate_swapout), +KUNIT_CASE (ttm_bo_validate_happy_evict), +KUNIT_CASE (ttm_bo_validate_all_pinned_evict), +KUNIT_CASE (ttm_bo_validate_allowed_only_evict), +KUNIT_CASE (ttm_bo_validate_deleted_evict), +KUNIT_CASE (ttm_bo_validate_busy_domain_evict), +KUNIT_CASE (ttm_bo_validate_evict_gutting), + KUNIT_CASE(ttm_bo_validate_recrusive_evict), {} };
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +98 -8
131 lines not on this page · raw message
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +8 -0
@@ -13,7 +13,11 @@#include <drm/drm_kunit_helpers.h> #include <kunit/test.h> +#define TTM_PL_MOCK1 (TTM_PL_PRIV + 1) +#define TTM_PL_MOCK2 (TTM_PL_PRIV + 2) +extern struct ttm_device_funcs ttm_dev_funcs; +extern struct ttm_device_funcs ttm_dev_funcs_bad_evict;struct ttm_test_devices {struct drm_device *drm;
@@ -26,6 +30,10 @@ int ttm_device_kunit_init(struct ttm_test_devices *priv,struct ttm_device *ttm, bool use_dma_alloc, bool use_dma32); +int ttm_device_kunit_init_bad_evict (struct ttm_test_devices *priv, +struct ttm_device *ttm, +bool use_dma_alloc, +bool use_dma32); struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test, struct ttm_test_devices *devs, size_t size,
drivers/gpu/drm/ttm/tests/ttm_mock_manager.c +28 -1
@@ -153,6 +153,14 @@ static int ttm_bad_manager_alloc(struct ttm_resource_manager *man,return -ENOSPC ; } +static int ttm_busy_manager_alloc (struct ttm_resource_manager *man, +struct ttm_buffer_object *bo, +const struct ttm_place *place, +struct ttm_resource **res) +{ +return -EBUSY ; +} +static void ttm_bad_manager_free (struct ttm_resource_manager *man,struct ttm_resource *res) {
@@ -172,6 +180,12 @@ static const struct ttm_resource_manager_func ttm_bad_manager_funcs = { .compatible = ttm_bad_manager_compatible }; +static const struct ttm_resource_manager_func ttm_bad_busy_manager_funcs = { + .alloc = ttm_busy_manager_alloc, + .free = ttm_bad_manager_free, + .compatible = ttm_bad_manager_compatible +}; +int ttm_bad_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size) {struct ttm_resource_manager *man;
@@ -190,7 +204,20 @@ int ttm_bad_manager_init(struct ttm_device *bdev, u32 mem_type, u32 size) }EXPORT_SYMBOL_GPL (ttm_bad_manager_init); -void ttm_bad_manager_fini (struct ttm_device *bdev,u32 mem_type) +int ttm_busy_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size) +{ +struct ttm_resource_manager *man; + +ttm_bad_manager_init (bdev, mem_type, size); + man =ttm_manager_type (bdev, mem_type); + + man->func = &ttm_bad_busy_manager_funcs; + +return 0 ; +} +EXPORT_SYMBOL_GPL (ttm_busy_manager_init); + +void ttm_bad_manager_fini (struct ttm_device *bdev,uint32_t mem_type) {struct ttm_resource_manager *man;
drivers/gpu/drm/ttm/tests/ttm_mock_manager.h +1 -0
@@ -23,6 +23,7 @@ struct ttm_mock_resource {int ttm_mock_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size);int ttm_bad_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size); +int ttm_busy_manager_init (struct ttm_device *bdev,u32 mem_type,u32 size);void ttm_mock_manager_fini (struct ttm_device *bdev,u32 mem_type);void ttm_bad_manager_fini (struct ttm_device *bdev,u32 mem_type);
Signature · 1 line
2.34.1
PATCH v13 9/12 drm/ttm/tests: Add tests for ttm_tt_populate
In reply to Karolina StolarekAdd tests for functions that add and release pages to TTs. Test the swapin operation. Export ttm_tt_unpopulate, ttm_tt_swapin and ttm_tt_swapout symbols for testing purposes.
--- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 119 ++++++++++++++++++++++++ drivers/gpu/drm/ttm/ttm_tt.c | 3 + 2 files changed, 122 insertions(+)
drivers/gpu/drm/ttm/tests/ttm_tt_test.c +119 -0
@@ -256,6 +256,120 @@ static void ttm_tt_destroy_basic(struct kunit *test)ttm_tt_destroy (devs->ttm_dev, bo->ttm); } +static void ttm_tt_populate_null_ttm (struct kunit *test) +{ +const struct ttm_test_devices *devs = test->priv; +struct ttm_operation_ctx ctx = { }; +int err; + + err =ttm_tt_populate (devs->ttm_dev,NULL , &ctx); +KUNIT_ASSERT_EQ (test, err, -EINVAL ); +} + +static void ttm_tt_populate_populated_ttm (struct kunit *test) +{ +const struct ttm_test_devices *devs = test->priv; +struct ttm_operation_ctx ctx = { }; +struct ttm_buffer_object *bo; +struct ttm_tt *tt; +struct page *populated_page; +int err; + + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + + tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, tt); + + err =ttm_tt_init (tt, bo,0 , ttm_cached,0 ); +KUNIT_ASSERT_EQ (test, err,0 ); + + err =ttm_tt_populate (devs->ttm_dev, tt, &ctx); +KUNIT_ASSERT_EQ (test, err,0 ); + populated_page = *tt->pages; + + err =ttm_tt_populate (devs->ttm_dev, tt, &ctx); +KUNIT_ASSERT_PTR_EQ (test, populated_page, *tt->pages); +} + +static void ttm_tt_unpopulate_basic (struct kunit *test) +{ +const struct ttm_test_devices *devs = test->priv; +struct ttm_operation_ctx ctx = { }; +struct ttm_buffer_object *bo; +struct ttm_tt *tt; +int err; + + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + + tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, tt); + + err =ttm_tt_init (tt, bo,0 , ttm_cached,0 ); +KUNIT_ASSERT_EQ (test, err,0 ); + + err =ttm_tt_populate (devs->ttm_dev, tt, &ctx); +KUNIT_ASSERT_EQ (test, err,0 ); +KUNIT_ASSERT_TRUE (test,ttm_tt_is_populated (tt)); + +ttm_tt_unpopulate (devs->ttm_dev, tt); +KUNIT_ASSERT_FALSE (test,ttm_tt_is_populated (tt)); +} + +static void ttm_tt_unpopulate_empty_ttm (struct kunit *test) +{ +const struct ttm_test_devices *devs = test->priv; +struct ttm_buffer_object *bo; +struct ttm_tt *tt; +int err; + + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + + tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, tt); + + err =ttm_tt_init (tt, bo,0 , ttm_cached,0 ); +KUNIT_ASSERT_EQ (test, err,0 ); + +ttm_tt_unpopulate (devs->ttm_dev, tt); +/* Expect graceful handling of unpopulated TTs */ +} + +static void ttm_tt_swapin_basic (struct kunit *test) +{ +const struct ttm_test_devices *devs = test->priv; +int expected_num_pages =BO_SIZE >>PAGE_SHIFT ; +struct ttm_operation_ctx ctx = { }; +struct ttm_buffer_object *bo; +struct ttm_tt *tt; +int err, num_pages; + + bo =ttm_bo_kunit_init (test, test->priv,BO_SIZE ,NULL ); + + tt =kunit_kzalloc (test,sizeof (*tt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_NULL (test, tt); + + err =ttm_tt_init (tt, bo,0 , ttm_cached,0 ); +KUNIT_ASSERT_EQ (test, err,0 ); + + err =ttm_tt_populate (devs->ttm_dev, tt, &ctx); +KUNIT_ASSERT_EQ (test, err,0 ); +KUNIT_ASSERT_TRUE (test,ttm_tt_is_populated (tt)); + + num_pages =ttm_tt_swapout (devs->ttm_dev, tt,GFP_KERNEL ); +KUNIT_ASSERT_EQ (test, num_pages, expected_num_pages); +KUNIT_ASSERT_NOT_NULL (test, tt->swap_storage); +KUNIT_ASSERT_TRUE (test, tt->page_flags &TTM_TT_FLAG_SWAPPED ); + +/* Swapout depopulates TT, allocate pages and then swap them in */ + err =ttm_pool_alloc (&devs->ttm_dev->pool, tt, &ctx); +KUNIT_ASSERT_EQ (test, err,0 ); + + err =ttm_tt_swapin (tt); +KUNIT_ASSERT_EQ (test, err,0 ); +KUNIT_ASSERT_NULL (test, tt->swap_storage); +KUNIT_ASSERT_FALSE (test, tt->page_flags &TTM_TT_FLAG_SWAPPED ); +} +static struct kunit_case ttm_tt_test_cases[] = {KUNIT_CASE_PARAM (ttm_tt_init_basic, ttm_tt_init_basic_gen_params),KUNIT_CASE (ttm_tt_init_misaligned),
@@ -267,6 +381,11 @@ static struct kunit_case ttm_tt_test_cases[] = {KUNIT_CASE (ttm_tt_create_ttm_exists),KUNIT_CASE (ttm_tt_create_failed),KUNIT_CASE (ttm_tt_destroy_basic), +KUNIT_CASE (ttm_tt_populate_null_ttm), +KUNIT_CASE (ttm_tt_populate_populated_ttm), +KUNIT_CASE (ttm_tt_unpopulate_basic), +KUNIT_CASE (ttm_tt_unpopulate_empty_ttm), + KUNIT_CASE(ttm_tt_swapin_basic), {} };
drivers/gpu/drm/ttm/ttm_tt.c +3 -0
@@ -251,6 +251,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm) out_err:return ret; } +EXPORT_SYMBOL_FOR_TESTS_ONLY (ttm_tt_swapin);/** * ttm_tt_swapout - swap out tt object
@@ -308,6 +309,7 @@ int ttm_tt_swapout(struct ttm_device *bdev, struct ttm_tt *ttm,return ret; } +EXPORT_SYMBOL_FOR_TESTS_ONLY (ttm_tt_swapout);int ttm_tt_populate (struct ttm_device *bdev,struct ttm_tt *ttm,struct ttm_operation_ctx *ctx)
@@ -386,6 +388,7 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm) ttm->page_flags &= ~TTM_TT_FLAG_PRIV_POPULATED ; } +EXPORT_SYMBOL_FOR_TESTS_ONLY (ttm_tt_unpopulate);#ifdef CONFIG_DEBUG_FS
Signature · 1 line
2.34.1
PATCH v13 10/12 drm/ttm/tests: Add TODO file
In reply to Karolina StolarekList improvements for the test suite with some notes.
--- drivers/gpu/drm/ttm/tests/TODO | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 drivers/gpu/drm/ttm/tests/TODO
drivers/gpu/drm/ttm/tests/TODO new file +27 -0
@@ -0,0 +1,27 @@ +TODO +===== + +- Add a test case where the only evictable BO is busy +- Update eviction tests so they use parametrized "from" memory type +- Improve mock manager's implementation, e.g. allocate a block of + dummy memory that can be used when testing page mapping functions +- Suggestion: Add test cases with external BOs +- Suggestion: randomize the number and size of tested buffers in + ttm_bo_validate() +- Agree on the naming convention +- Rewrite the mock manager: drop use_tt and manage mock memory using + drm_mm manager + +Notes and gotchas +================= + +- These tests are built and run with a UML kernel, because + 1) We are interested in hardware-independent testing + 2) We don't want to have actual DRM devices interacting with TTM + at the same time as the test one. Getting these to work in + parallel would require some time (...and that's a "todo" in itself!) +- Triggering ttm_bo_vm_ops callbacks from KUnit (i.e. kernel) might be + a challenge, but is worth trying. Look at selftests like + i915/gem/selftests/i915_gem_mman.c for inspiration +- The test suite uses UML where ioremap() call returns NULL, meaning that + ttm_bo_ioremap() can't be tested, unless we find a way to stub it
Signature · 1 line
2.34.1
PATCH v13 11/12 drm/ttm/tests: Correct modules' licenses
In reply to Karolina StolarekThe test files are GPL and MIT, so update the definitions accordingly.
--- drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_device_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1 -1
@@ -627,4 +627,4 @@ static struct kunit_suite ttm_bo_test_suite = {kunit_test_suites (&ttm_bo_test_suite); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
drivers/gpu/drm/ttm/tests/ttm_device_test.c +1 -1
@@ -209,4 +209,4 @@ static struct kunit_suite ttm_device_test_suite = {kunit_test_suites (&ttm_device_test_suite); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +1 -1
@@ -308,4 +308,4 @@ void ttm_test_devices_fini(struct kunit *test) }EXPORT_SYMBOL_GPL (ttm_test_devices_fini); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
drivers/gpu/drm/ttm/tests/ttm_pool_test.c +1 -1
@@ -433,4 +433,4 @@ static struct kunit_suite ttm_pool_test_suite = {kunit_test_suites (&ttm_pool_test_suite); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1 -1
@@ -332,4 +332,4 @@ static struct kunit_suite ttm_resource_test_suite = {kunit_test_suites (&ttm_resource_test_suite); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
drivers/gpu/drm/ttm/tests/ttm_tt_test.c +1 -1
@@ -398,4 +398,4 @@ static struct kunit_suite ttm_tt_test_suite = {kunit_test_suites (&ttm_tt_test_suite); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
Signature · 1 line
2.34.1
Re: [PATCH v13 11/12] drm/ttm/tests: Correct modules' licenses
Quoted 4 lines · Karolina Stolarek
The test files are GPL and MIT, so update the definitions accordingly.
Signed-off-by Karolina Stolarek <[email protected]>
Quoted 77 lines
---
drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_device_test.c | 2 +-drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c| 2 +- drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 2 +-drivers/gpu/drm/ttm/tests/ttm_resource_test.c| 2 +- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 2 +-6 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/ttm/tests/ttm_bo_test.c +0
-0@@ -627,4 +627,4 @@ static struct kunit_suite ttm_bo_test_suite = {
kunit_test_suites(&ttm_bo_test_suite);drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1-MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );drivers/gpu/drm/ttm/tests/ttm_device_test.c +0
-0@@ -209,4 +209,4 @@ static struct kunit_suite ttm_device_test_suite = {
kunit_test_suites(&ttm_device_test_suite);drivers/gpu/drm/ttm/tests/ttm_device_test.c +1
-1-MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +0
-0@@ -308,4 +308,4 @@ void ttm_test_devices_fini(struct kunit *test) } EXPORT_SYMBOL_GPL(ttm_test_devices_fini);drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +1
-1-MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );drivers/gpu/drm/ttm/tests/ttm_pool_test.c +0
-0@@ -433,4 +433,4 @@ static struct kunit_suite ttm_pool_test_suite = {
kunit_test_suites(&ttm_pool_test_suite);drivers/gpu/drm/ttm/tests/ttm_pool_test.c +1
-1-MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );drivers/gpu/drm/ttm/tests/ttm_resource_test.c +0
-0@@ -332,4 +332,4 @@ static struct kunit_suite ttm_resource_test_suite = {
kunit_test_suites(&ttm_resource_test_suite);drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1-MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );drivers/gpu/drm/ttm/tests/ttm_tt_test.c +0
-0@@ -398,4 +398,4 @@ static struct kunit_suite ttm_tt_test_suite = {
kunit_test_suites(&ttm_tt_test_suite);drivers/gpu/drm/ttm/tests/ttm_tt_test.c +1
-1-MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL and additional rights" );
PATCH v13 12/12 drm/ttm/tests: Use u32 and u64 over uint*_t types
In reply to Karolina StolarekUpdate the tests and helpers to use unsigned kernel types.
--- drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 12 ++++++------ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 6 ++---- drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 4 ++-- drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 16 ++++++++-------- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 12 ++++++------ 6 files changed, 25 insertions(+), 27 deletions(-)
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +6 -6
@@ -237,7 +237,7 @@ static void ttm_bo_unreserve_basic(struct kunit *test)struct ttm_place *place;struct ttm_resource_manager *man;unsigned int bo_prio =TTM_MAX_BO_PRIORITY -1 ; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;int err; place =ttm_place_kunit_init (test, mem_type,0 );
@@ -278,7 +278,7 @@ static void ttm_bo_unreserve_pinned(struct kunit *test)struct ttm_device *ttm_dev;struct ttm_resource *res1, *res2;struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;int err; ttm_dev =kunit_kzalloc (test,sizeof (*ttm_dev),GFP_KERNEL );
@@ -322,7 +322,7 @@ static void ttm_bo_unreserve_bulk(struct kunit *test)struct ttm_device *ttm_dev;struct ttm_place *place;struct dma_resv *resv; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;unsigned int bo_priority =0 ;int err;
@@ -380,7 +380,7 @@ static void ttm_bo_put_basic(struct kunit *test)struct ttm_resource *res;struct ttm_device *ttm_dev;struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;int err; place =ttm_place_kunit_init (test, mem_type,0 );
@@ -495,7 +495,7 @@ static void ttm_bo_pin_unpin_resource(struct kunit *test)struct ttm_resource *res;struct ttm_device *ttm_dev;struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;unsigned int bo_priority =0 ;int err;
@@ -546,7 +546,7 @@ static void ttm_bo_multiple_pin_one_unpin(struct kunit *test)struct ttm_resource *res;struct ttm_device *ttm_dev;struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;unsigned int bo_priority =0 ;int err;
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +2 -4
@@ -42,8 +42,7 @@ static struct ttm_placement mock_placement = { .placement = &mock2_place, }; -static struct ttm_tt *ttm_tt_simple_create (struct ttm_buffer_object *bo, -uint32_t page_flags) +static struct ttm_tt *ttm_tt_simple_create (struct ttm_buffer_object *bo,u32 page_flags) {struct ttm_tt *tt;
@@ -202,8 +201,7 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test, }EXPORT_SYMBOL_GPL (ttm_bo_kunit_init); -struct ttm_place *ttm_place_kunit_init (struct kunit *test, -uint32_t mem_type,uint32_t flags) +struct ttm_place *ttm_place_kunit_init (struct kunit *test,u32 mem_type,u32 flags) {struct ttm_place *place;
drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +2 -2
@@ -38,8 +38,8 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test,struct ttm_test_devices *devs, size_t size, struct dma_resv *obj); -struct ttm_place *ttm_place_kunit_init (struct kunit *test, -uint32_t mem_type,uint32_t flags); +struct ttm_place *ttm_place_kunit_init (struct kunit *test,u32 mem_type, +u32 flags);void dummy_ttm_bo_destroy (struct ttm_buffer_object *bo);struct ttm_test_devices *ttm_test_devices_basic (struct kunit *test);
drivers/gpu/drm/ttm/tests/ttm_pool_test.c +1 -1
@@ -48,7 +48,7 @@ static void ttm_pool_test_fini(struct kunit *test) }static struct ttm_tt *ttm_tt_kunit_init (struct kunit *test, -uint32_t page_flags, +u32 page_flags,enum ttm_caching caching,size_t size) {
drivers/gpu/drm/ttm/tests/ttm_resource_test.c +8 -8
@@ -11,8 +11,8 @@struct ttm_resource_test_case {const char *description; -uint32_t mem_type; -uint32_t flags; +u32 mem_type; +u32 flags; };struct ttm_resource_test_priv {
@@ -47,7 +47,7 @@ static void ttm_resource_test_fini(struct kunit *test)static void ttm_init_test_mocks (struct kunit *test,struct ttm_resource_test_priv *priv, -uint32_t mem_type,uint32_t flags) +u32 mem_type,u32 flags) {size_t size =RES_SIZE ;
@@ -60,7 +60,7 @@ static void ttm_init_test_mocks(struct kunit *test,static void ttm_init_test_manager (struct kunit *test,struct ttm_resource_test_priv *priv, -uint32_t mem_type) +u32 mem_type) {struct ttm_device *ttm_dev = priv->devs->ttm_dev;struct ttm_resource_manager *man;
@@ -112,7 +112,7 @@ static void ttm_resource_init_basic(struct kunit *test)struct ttm_buffer_object *bo;struct ttm_place *place;struct ttm_resource_manager *man; -uint64_t expected_usage; +u64 expected_usage;ttm_init_test_mocks (test, priv, params->mem_type, params->flags); bo = priv->bo;
@@ -230,7 +230,7 @@ static void ttm_resource_manager_usage_basic(struct kunit *test)struct ttm_buffer_object *bo;struct ttm_place *place;struct ttm_resource_manager *man; -uint64_t actual_usage; +u64 actual_usage;ttm_init_test_mocks (test, priv,TTM_PL_SYSTEM ,TTM_PL_FLAG_TOPDOWN ); bo = priv->bo;
@@ -268,7 +268,7 @@ static void ttm_sys_man_alloc_basic(struct kunit *test)struct ttm_buffer_object *bo;struct ttm_place *place;struct ttm_resource *res; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;int ret;ttm_init_test_mocks (test, priv, mem_type,0 );
@@ -293,7 +293,7 @@ static void ttm_sys_man_free_basic(struct kunit *test)struct ttm_buffer_object *bo;struct ttm_place *place;struct ttm_resource *res; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;ttm_init_test_mocks (test, priv, mem_type,0 ); bo = priv->bo;
drivers/gpu/drm/ttm/tests/ttm_tt_test.c +6 -6
@@ -11,8 +11,8 @@struct ttm_tt_test_case {const char *description; -uint32_t size; -uint32_t extra_pages_num; +u32 size; +u32 extra_pages_num; };static const struct ttm_tt_test_case ttm_tt_init_basic_cases[] = {
@@ -41,9 +41,9 @@ static void ttm_tt_init_basic(struct kunit *test)const struct ttm_tt_test_case *params = test->param_value;struct ttm_buffer_object *bo;struct ttm_tt *tt; -uint32_t page_flags =TTM_TT_FLAG_ZERO_ALLOC ; +u32 page_flags =TTM_TT_FLAG_ZERO_ALLOC ;enum ttm_caching caching = ttm_cached; -uint32_t extra_pages = params->extra_pages_num; +u32 extra_pages = params->extra_pages_num;int num_pages = params->size >>PAGE_SHIFT ;int err;
@@ -69,7 +69,7 @@ static void ttm_tt_init_misaligned(struct kunit *test)struct ttm_buffer_object *bo;struct ttm_tt *tt;enum ttm_caching caching = ttm_cached; -uint32_t size =SZ_8K ; +u32 size =SZ_8K ;int num_pages = (size +SZ_4K ) >>PAGE_SHIFT ;int err;
@@ -211,7 +211,7 @@ static void ttm_tt_create_ttm_exists(struct kunit *test) }static struct ttm_tt *ttm_tt_null_create (struct ttm_buffer_object *bo, -uint32_t page_flags) +u32 page_flags) {return NULL ; }
Signature · 1 line
2.34.1
Re: [PATCH v13 12/12] drm/ttm/tests: Use u32 and u64 over uint*_t types
Quoted 4 lines · Karolina Stolarek
Update the tests and helpers to use unsigned kernel types.
Signed-off-by Karolina Stolarek <[email protected]>Suggested-by Thomas Hellström <[email protected]>
Quoted 264 lines
---
drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 12 ++++++------drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c| 6 ++----drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h| 4 ++-- drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 2 +-drivers/gpu/drm/ttm/tests/ttm_resource_test.c| 16 ++++++++-------- drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 12 ++++++------6 files changed, 25 insertions(+), 27 deletions(-)drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1@@ -237,7 +237,7 @@ static void ttm_bo_unreserve_basic(struct kunit *test) struct ttm_place *place; struct ttm_resource_manager *man; unsigned int bo_prio = TTM_MAX_BO_PRIORITY - 1; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; int err;
place =ttm_place_kunit_init(test, mem_type, 0);drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1@@ -278,7 +278,7 @@ static void ttm_bo_unreserve_pinned(struct kunit *test) struct ttm_device *ttm_dev; struct ttm_resource *res1, *res2; struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; int err;
ttm_dev=kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1@@ -322,7 +322,7 @@ static void ttm_bo_unreserve_bulk(struct kunit *test) struct ttm_device *ttm_dev; struct ttm_place *place; struct dma_resv *resv; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; unsigned int bo_priority = 0; int err;drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1@@ -380,7 +380,7 @@ static void ttm_bo_put_basic(struct kunit *test) struct ttm_resource *res; struct ttm_device *ttm_dev; struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; int err;
place =ttm_place_kunit_init(test, mem_type, 0);drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1@@ -495,7 +495,7 @@ static void ttm_bo_pin_unpin_resource(struct kunit *test) struct ttm_resource *res; struct ttm_device *ttm_dev; struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; unsigned int bo_priority = 0; int err;drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1
-1@@ -546,7 +546,7 @@ static void ttm_bo_multiple_pin_one_unpin(struct kunit *test) struct ttm_resource *res; struct ttm_device *ttm_dev; struct ttm_place *place; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; unsigned int bo_priority = 0; int err;drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +0
-0@@ -42,8 +42,7 @@ static struct ttm_placement mock_placement = { .placement = &mock2_place, };
-static structttm_tt*ttm_tt_simple_create(structttm_buffer_object*bo,drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +1
-1- uint32_t page_flags) +static struct ttm_tt *ttm_tt_simple_create(struct ttm_buffer_object*bo, u32
page_flags)
{
structttm_tt*tt;drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +0
-0@@ -202,8 +201,7 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test, } EXPORT_SYMBOL_GPL(ttm_bo_kunit_init);drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c +0
-2-struct ttm_place *ttm_place_kunit_init (struct kunit *test, - uint32_t mem_type, uint32_tflags)
+structttm_place*ttm_place_kunit_init(struct kunit *test, u32mem_type, u32 flags)
{
structttm_place*place;drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +0
-0@@ -38,8 +38,8 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test,struct
ttm_test_devices*devs,
size_tsize, structdma_resv*obj);drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +0
-2-struct ttm_place *ttm_place_kunit_init (struct kunit *test, - uint32_t mem_type, uint32_tflags);
+structttm_place*ttm_place_kunit_init(struct kunit *test, u32mem_type,drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h +1
-0+ u32 flags);void
dummy_ttm_bo_destroy(struct ttm_buffer_object *bo);
structttm_test_devices*ttm_test_devices_basic(struct kunit *test);drivers/gpu/drm/ttm/tests/ttm_pool_test.c +0
-0@@ -48,7 +48,7 @@ static void ttm_pool_test_fini(struct kunit *test) }
static structttm_tt*ttm_tt_kunit_init(struct kunit *test,drivers/gpu/drm/ttm/tests/ttm_pool_test.c +1
-1- uint32_t page_flags, + u32 page_flags,enum
ttm_cachingcaching,size_tsize)
{drivers/gpu/drm/ttm/tests/ttm_resource_test.c +0
-0@@ -11,8 +11,8 @@
structttm_resource_test_case{
const char *description;drivers/gpu/drm/ttm/tests/ttm_resource_test.c +2
-2-uint32_t mem_type; -uint32_t flags; +u32 mem_type; +u32 flags;};
structttm_resource_test_priv{drivers/gpu/drm/ttm/tests/ttm_resource_test.c +0
-0@@ -47,7 +47,7 @@ static void ttm_resource_test_fini(struct kunit *test)
static void ttm_init_test_mocks(struct kunit *test, structttm_resource_test_priv*priv,drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1- uint32_t mem_type, uint32_t flags) + u32 mem_type, u32 flags){
size_tsize =RES_SIZE;drivers/gpu/drm/ttm/tests/ttm_resource_test.c +0
-0@@ -60,7 +60,7 @@ static void ttm_init_test_mocks(struct kunit *test,
static void ttm_init_test_manager(struct kunit *test, structttm_resource_test_priv*priv,drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1- uint32_t mem_type) + u32 mem_type){
structttm_device*ttm_dev=priv->devs->ttm_dev; structttm_resource_manager*man;drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1@@ -112,7 +112,7 @@ static void ttm_resource_init_basic(struct kunit *test) struct ttm_buffer_object *bo; struct ttm_place *place; struct ttm_resource_manager *man; -uint64_t expected_usage; +u64 expected_usage;
ttm_init_test_mocks(test, priv,params->mem_type, params-Quoted 1 line
flags);
bo =
priv->bo;drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1@@ -230,7 +230,7 @@ static void ttm_resource_manager_usage_basic(struct kunit *test) struct ttm_buffer_object *bo; struct ttm_place *place; struct ttm_resource_manager *man; -uint64_t actual_usage; +u64 actual_usage;
ttm_init_test_mocks(test, priv, TTM_PL_SYSTEM, TTM_PL_FLAG_TOPDOWN);
bo =priv->bo;drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1@@ -268,7 +268,7 @@ static void ttm_sys_man_alloc_basic(struct kunit *test) struct ttm_buffer_object *bo; struct ttm_place *place; struct ttm_resource *res; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ; int ret;
ttm_init_test_mocks(test, priv, mem_type, 0);drivers/gpu/drm/ttm/tests/ttm_resource_test.c +1
-1@@ -293,7 +293,7 @@ static void ttm_sys_man_free_basic(struct kunit *test) struct ttm_buffer_object *bo; struct ttm_place *place; struct ttm_resource *res; -uint32_t mem_type =TTM_PL_SYSTEM ; +u32 mem_type =TTM_PL_SYSTEM ;
ttm_init_test_mocks(test, priv, mem_type, 0); bo =priv->bo;drivers/gpu/drm/ttm/tests/ttm_tt_test.c +0
-0@@ -11,8 +11,8 @@
structttm_tt_test_case{
const char *description;drivers/gpu/drm/ttm/tests/ttm_tt_test.c +2
-2-uint32_t size; -uint32_t extra_pages_num; +u32 size; +u32 extra_pages_num;};
static const structttm_tt_test_casettm_tt_init_basic_cases[] = {drivers/gpu/drm/ttm/tests/ttm_tt_test.c +2
-2@@ -41,9 +41,9 @@ static void ttm_tt_init_basic(struct kunit *test) const struct ttm_tt_test_case *params = test->param_value; struct ttm_buffer_object *bo; struct ttm_tt *tt; -uint32_t page_flags =TTM_TT_FLAG_ZERO_ALLOC ; +u32 page_flags =TTM_TT_FLAG_ZERO_ALLOC ; enum ttm_caching caching = ttm_cached; -uint32_t extra_pages = params->extra_pages_num; +u32 extra_pages = params->extra_pages_num; int num_pages = params->size >> PAGE_SHIFT; int err;drivers/gpu/drm/ttm/tests/ttm_tt_test.c +1
-1@@ -69,7 +69,7 @@ static void ttm_tt_init_misaligned(struct kunit *test) struct ttm_buffer_object *bo; struct ttm_tt *tt; enum ttm_caching caching = ttm_cached; -uint32_t size =SZ_8K ; +u32 size =SZ_8K ; int num_pages = (size + SZ_4K) >> PAGE_SHIFT; int err;drivers/gpu/drm/ttm/tests/ttm_tt_test.c +0
-0@@ -211,7 +211,7 @@ static void ttm_tt_create_ttm_exists(struct kunit *test) }
static structttm_tt*ttm_tt_null_create(structttm_buffer_object*bo,drivers/gpu/drm/ttm/tests/ttm_tt_test.c +1
-1- uint32_t page_flags) + u32 page_flags){
return NULL;
}