| Message ID | 20230621133700.7588-2-christian.koenig@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm: execution context for GEM buffers v5 | expand |
Hi Christian, kernel test robot noticed the following build warnings: [auto build test WARNING on drm-misc/drm-misc-next] [also build test WARNING on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.4-rc7 next-20230621] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Christian-K-nig/drm-add-drm_exec-selftests-v4/20230621-213827 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20230621133700.7588-2-christian.koenig%40amd.com patch subject: [PATCH 2/2] drm: add drm_exec selftests v4 config: hexagon-randconfig-r015-20230621 (https://download.01.org/0day-ci/archive/20230622/202306220013.JRZDDrkO-lkp@intel.com/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230622/202306220013.JRZDDrkO-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306220013.JRZDDrkO-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/gpu/drm/tests/drm_exec_test.c:134:2: warning: variable '__drm_exec_retry_ptr' set but not used [-Wunused-but-set-variable] 134 | drm_exec_until_all_locked(&exec) | ^ include/drm/drm_exec.h:78:13: note: expanded from macro 'drm_exec_until_all_locked' 78 | for (void *__drm_exec_retry_ptr; ({ \ | ^ 1 warning generated. vim +/__drm_exec_retry_ptr +134 drivers/gpu/drm/tests/drm_exec_test.c 121 122 static void test_prepare_array(struct kunit *test) 123 { 124 struct drm_gem_object gobj1 = { }; 125 struct drm_gem_object gobj2 = { }; 126 struct drm_gem_object *array[] = { &gobj1, &gobj2 }; 127 struct drm_exec exec; 128 int ret; 129 130 drm_gem_private_object_init(&dev, &gobj1, PAGE_SIZE); 131 drm_gem_private_object_init(&dev, &gobj2, PAGE_SIZE); 132 133 drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); > 134 drm_exec_until_all_locked(&exec) 135 ret = drm_exec_prepare_array(&exec, array, ARRAY_SIZE(array), 136 1); 137 KUNIT_EXPECT_EQ(test, ret, 0); 138 drm_exec_fini(&exec); 139 } 140
Hi Christian,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm-misc/drm-misc-next]
[also build test WARNING on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.4-rc7 next-20230621]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-K-nig/drm-add-drm_exec-selftests-v4/20230621-213827
base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
patch link: https://lore.kernel.org/r/20230621133700.7588-2-christian.koenig%40amd.com
patch subject: [PATCH 2/2] drm: add drm_exec selftests v4
config: arm-randconfig-r014-20230621 (https://download.01.org/0day-ci/archive/20230622/202306220036.YcdJJD0a-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230622/202306220036.YcdJJD0a-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306220036.YcdJJD0a-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/tests/drm_exec_test.c:13:
drivers/gpu/drm/tests/drm_exec_test.c: In function 'test_prepare_array':
>> include/drm/drm_exec.h:78:20: warning: variable '__drm_exec_retry_ptr' set but not used [-Wunused-but-set-variable]
78 | for (void *__drm_exec_retry_ptr; ({ \
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/tests/drm_exec_test.c:134:9: note: in expansion of macro 'drm_exec_until_all_locked'
134 | drm_exec_until_all_locked(&exec)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/__drm_exec_retry_ptr +78 include/drm/drm_exec.h
5d87375e05b5f7 Christian König 2023-06-21 52
5d87375e05b5f7 Christian König 2023-06-21 53 /**
5d87375e05b5f7 Christian König 2023-06-21 54 * drm_exec_for_each_locked_object - iterate over all the locked objects
5d87375e05b5f7 Christian König 2023-06-21 55 * @exec: drm_exec object
5d87375e05b5f7 Christian König 2023-06-21 56 * @index: unsigned long index for the iteration
5d87375e05b5f7 Christian König 2023-06-21 57 * @obj: the current GEM object
5d87375e05b5f7 Christian König 2023-06-21 58 *
5d87375e05b5f7 Christian König 2023-06-21 59 * Iterate over all the locked GEM objects inside the drm_exec object.
5d87375e05b5f7 Christian König 2023-06-21 60 */
5d87375e05b5f7 Christian König 2023-06-21 61 #define drm_exec_for_each_locked_object(exec, index, obj) \
5d87375e05b5f7 Christian König 2023-06-21 62 for (index = 0, obj = (exec)->objects[0]; \
5d87375e05b5f7 Christian König 2023-06-21 63 index < (exec)->num_objects; \
5d87375e05b5f7 Christian König 2023-06-21 64 ++index, obj = (exec)->objects[index])
5d87375e05b5f7 Christian König 2023-06-21 65
5d87375e05b5f7 Christian König 2023-06-21 66 /**
5d87375e05b5f7 Christian König 2023-06-21 67 * drm_exec_until_all_locked - loop until all GEM objects are locked
5d87375e05b5f7 Christian König 2023-06-21 68 * @exec: drm_exec object
5d87375e05b5f7 Christian König 2023-06-21 69 *
5d87375e05b5f7 Christian König 2023-06-21 70 * Core functionality of the drm_exec object. Loops until all GEM objects are
5d87375e05b5f7 Christian König 2023-06-21 71 * locked and no more contention exists. At the beginning of the loop it is
5d87375e05b5f7 Christian König 2023-06-21 72 * guaranteed that no GEM object is locked.
5d87375e05b5f7 Christian König 2023-06-21 73 *
5d87375e05b5f7 Christian König 2023-06-21 74 * Since labels can't be defined local to the loops body we use a jump pointer
5d87375e05b5f7 Christian König 2023-06-21 75 * to make sure that the retry is only used from within the loops body.
5d87375e05b5f7 Christian König 2023-06-21 76 */
5d87375e05b5f7 Christian König 2023-06-21 77 #define drm_exec_until_all_locked(exec) \
5d87375e05b5f7 Christian König 2023-06-21 @78 for (void *__drm_exec_retry_ptr; ({ \
5d87375e05b5f7 Christian König 2023-06-21 79 __label__ __drm_exec_retry; \
5d87375e05b5f7 Christian König 2023-06-21 80 __drm_exec_retry: \
5d87375e05b5f7 Christian König 2023-06-21 81 __drm_exec_retry_ptr = &&__drm_exec_retry; \
5d87375e05b5f7 Christian König 2023-06-21 82 drm_exec_cleanup(exec); \
5d87375e05b5f7 Christian König 2023-06-21 83 });)
5d87375e05b5f7 Christian König 2023-06-21 84
Hi Christian,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm-misc/drm-misc-next]
[also build test WARNING on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.4-rc7 next-20230621]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-K-nig/drm-add-drm_exec-selftests-v4/20230621-213827
base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
patch link: https://lore.kernel.org/r/20230621133700.7588-2-christian.koenig%40amd.com
patch subject: [PATCH 2/2] drm: add drm_exec selftests v4
config: x86_64-buildonly-randconfig-r003-20230621 (https://download.01.org/0day-ci/archive/20230622/202306220029.L9DTnHh6-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20230622/202306220029.L9DTnHh6-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306220029.L9DTnHh6-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/tests/drm_exec_test.c:13:
drivers/gpu/drm/tests/drm_exec_test.c: In function 'test_prepare_array':
>> include/drm/drm_exec.h:78:20: warning: variable '__drm_exec_retry_ptr' set but not used [-Wunused-but-set-variable]
78 | for (void *__drm_exec_retry_ptr; ({ \
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/tests/drm_exec_test.c:134:9: note: in expansion of macro 'drm_exec_until_all_locked'
134 | drm_exec_until_all_locked(&exec)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/__drm_exec_retry_ptr +78 include/drm/drm_exec.h
5d87375e05b5f7 Christian König 2023-06-21 52
5d87375e05b5f7 Christian König 2023-06-21 53 /**
5d87375e05b5f7 Christian König 2023-06-21 54 * drm_exec_for_each_locked_object - iterate over all the locked objects
5d87375e05b5f7 Christian König 2023-06-21 55 * @exec: drm_exec object
5d87375e05b5f7 Christian König 2023-06-21 56 * @index: unsigned long index for the iteration
5d87375e05b5f7 Christian König 2023-06-21 57 * @obj: the current GEM object
5d87375e05b5f7 Christian König 2023-06-21 58 *
5d87375e05b5f7 Christian König 2023-06-21 59 * Iterate over all the locked GEM objects inside the drm_exec object.
5d87375e05b5f7 Christian König 2023-06-21 60 */
5d87375e05b5f7 Christian König 2023-06-21 61 #define drm_exec_for_each_locked_object(exec, index, obj) \
5d87375e05b5f7 Christian König 2023-06-21 62 for (index = 0, obj = (exec)->objects[0]; \
5d87375e05b5f7 Christian König 2023-06-21 63 index < (exec)->num_objects; \
5d87375e05b5f7 Christian König 2023-06-21 64 ++index, obj = (exec)->objects[index])
5d87375e05b5f7 Christian König 2023-06-21 65
5d87375e05b5f7 Christian König 2023-06-21 66 /**
5d87375e05b5f7 Christian König 2023-06-21 67 * drm_exec_until_all_locked - loop until all GEM objects are locked
5d87375e05b5f7 Christian König 2023-06-21 68 * @exec: drm_exec object
5d87375e05b5f7 Christian König 2023-06-21 69 *
5d87375e05b5f7 Christian König 2023-06-21 70 * Core functionality of the drm_exec object. Loops until all GEM objects are
5d87375e05b5f7 Christian König 2023-06-21 71 * locked and no more contention exists. At the beginning of the loop it is
5d87375e05b5f7 Christian König 2023-06-21 72 * guaranteed that no GEM object is locked.
5d87375e05b5f7 Christian König 2023-06-21 73 *
5d87375e05b5f7 Christian König 2023-06-21 74 * Since labels can't be defined local to the loops body we use a jump pointer
5d87375e05b5f7 Christian König 2023-06-21 75 * to make sure that the retry is only used from within the loops body.
5d87375e05b5f7 Christian König 2023-06-21 76 */
5d87375e05b5f7 Christian König 2023-06-21 77 #define drm_exec_until_all_locked(exec) \
5d87375e05b5f7 Christian König 2023-06-21 @78 for (void *__drm_exec_retry_ptr; ({ \
5d87375e05b5f7 Christian König 2023-06-21 79 __label__ __drm_exec_retry; \
5d87375e05b5f7 Christian König 2023-06-21 80 __drm_exec_retry: \
5d87375e05b5f7 Christian König 2023-06-21 81 __drm_exec_retry_ptr = &&__drm_exec_retry; \
5d87375e05b5f7 Christian König 2023-06-21 82 drm_exec_cleanup(exec); \
5d87375e05b5f7 Christian König 2023-06-21 83 });)
5d87375e05b5f7 Christian König 2023-06-21 84
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index c2f3d234c89e..47e0bfe19757 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -80,6 +80,7 @@ config DRM_KUNIT_TEST select DRM_BUDDY select DRM_EXPORT_FOR_TESTS if m select DRM_KUNIT_TEST_HELPERS + select DRM_EXEC default KUNIT_ALL_TESTS help This builds unit tests for DRM. This option is not useful for diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index bca726a8f483..ba7baa622675 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ drm_modes_test.o \ drm_plane_helper_test.o \ drm_probe_helper_test.o \ - drm_rect_test.o + drm_rect_test.o \ + drm_exec_test.o CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN) diff --git a/drivers/gpu/drm/tests/drm_exec_test.c b/drivers/gpu/drm/tests/drm_exec_test.c new file mode 100644 index 000000000000..727ac267682e --- /dev/null +++ b/drivers/gpu/drm/tests/drm_exec_test.c @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022 Advanced Micro Devices, Inc. + */ + +#define pr_fmt(fmt) "drm_exec: " fmt + +#include <kunit/test.h> + +#include <linux/module.h> +#include <linux/prime_numbers.h> + +#include <drm/drm_exec.h> +#include <drm/drm_device.h> +#include <drm/drm_gem.h> + +#include "../lib/drm_random.h" + +static struct drm_device dev; + +static void sanitycheck(struct kunit *test) +{ + struct drm_exec exec; + + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_fini(&exec); + KUNIT_SUCCEED(test); +} + +static void test_lock(struct kunit *test) +{ + struct drm_gem_object gobj = { }; + struct drm_exec exec; + int ret; + + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE); + + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_until_all_locked(&exec) { + ret = drm_exec_lock_obj(&exec, &gobj); + drm_exec_retry_on_contention(&exec); + KUNIT_EXPECT_EQ(test, ret, 0); + if (ret) + break; + } + drm_exec_fini(&exec); +} + +static void test_lock_unlock(struct kunit *test) +{ + struct drm_gem_object gobj = { }; + struct drm_exec exec; + int ret; + + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE); + + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_until_all_locked(&exec) { + ret = drm_exec_lock_obj(&exec, &gobj); + drm_exec_retry_on_contention(&exec); + KUNIT_EXPECT_EQ(test, ret, 0); + if (ret) + break; + + drm_exec_unlock_obj(&exec, &gobj); + ret = drm_exec_lock_obj(&exec, &gobj); + drm_exec_retry_on_contention(&exec); + KUNIT_EXPECT_EQ(test, ret, 0); + if (ret) + break; + } + drm_exec_fini(&exec); +} + +static void test_duplicates(struct kunit *test) +{ + struct drm_gem_object gobj = { }; + struct drm_exec exec; + int ret; + + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE); + + drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES); + drm_exec_until_all_locked(&exec) { + ret = drm_exec_lock_obj(&exec, &gobj); + drm_exec_retry_on_contention(&exec); + KUNIT_EXPECT_EQ(test, ret, 0); + if (ret) + break; + + ret = drm_exec_lock_obj(&exec, &gobj); + drm_exec_retry_on_contention(&exec); + KUNIT_EXPECT_EQ(test, ret, 0); + if (ret) + break; + } + drm_exec_unlock_obj(&exec, &gobj); + drm_exec_fini(&exec); +} + + + +static void test_prepare(struct kunit *test) +{ + struct drm_gem_object gobj = { }; + struct drm_exec exec; + int ret; + + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE); + + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_until_all_locked(&exec) { + ret = drm_exec_prepare_obj(&exec, &gobj, 1); + drm_exec_retry_on_contention(&exec); + KUNIT_EXPECT_EQ(test, ret, 0); + if (ret) + break; + } + drm_exec_fini(&exec); +} + +static void test_prepare_array(struct kunit *test) +{ + struct drm_gem_object gobj1 = { }; + struct drm_gem_object gobj2 = { }; + struct drm_gem_object *array[] = { &gobj1, &gobj2 }; + struct drm_exec exec; + int ret; + + drm_gem_private_object_init(&dev, &gobj1, PAGE_SIZE); + drm_gem_private_object_init(&dev, &gobj2, PAGE_SIZE); + + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_until_all_locked(&exec) + ret = drm_exec_prepare_array(&exec, array, ARRAY_SIZE(array), + 1); + KUNIT_EXPECT_EQ(test, ret, 0); + drm_exec_fini(&exec); +} + +static struct kunit_case drm_exec_tests[] = { + KUNIT_CASE(sanitycheck), + KUNIT_CASE(test_lock), + KUNIT_CASE(test_lock_unlock), + KUNIT_CASE(test_duplicates), + KUNIT_CASE(test_prepare), + KUNIT_CASE(test_prepare_array), + {} +}; + +static struct kunit_suite drm_exec_test_suite = { + .name = "drm_exec", + .test_cases = drm_exec_tests, +}; + +kunit_test_suite(drm_exec_test_suite); + +MODULE_AUTHOR("AMD"); +MODULE_LICENSE("GPL and additional rights");
Exercise at least all driver facing functions of this new component. v2: add array test as well v3: some kunit cleanups v4: more tests and cleanups Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/tests/Makefile | 3 +- drivers/gpu/drm/tests/drm_exec_test.c | 159 ++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/tests/drm_exec_test.c