Re: [PATCH v2 4/8] drm/xe/kunit: Add xe_kunit_helper_is_live_test()

[Gustavo Sousa <gustavo.sousa@intel.com>]

Michal Wajdeczko <michal.wajdeczko@intel.com> writes:

> On 5/8/2026 11:42 PM, Gustavo Sousa wrote:
>> In upcoming changes we will need to differentiate between regular and
>> live KUnit tests.  Add the function xe_kunit_helper_is_live_test() for
>> that purpose.
>> 
>> Note that this is implemented in a rather hackish way, by leveraging
>> KUnit's static stubbing functionality.  A better approach would be to
>> store a boolean somewhere in test->priv that would tell if a test is a
>> live one, however that's not quite feasible today given the inconsistent
>> usage of test->priv (there is not a single uniform type of data assigned
>> to it across existing test).
>> 
>> v2:
>>   - s/xe_kunit_helper_is_live_test/xe_kunit_helper_is_live_test/
>>     (Michal)
>> 
>> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
>> ---
>>  drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 26 ++++++++++++++++++++++++++
>>  drivers/gpu/drm/xe/tests/xe_kunit_helpers.h |  4 ++++
>>  2 files changed, 30 insertions(+)
>> 
>> diff --git a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
>> index bc5156966ce9..d2f654f53cc7 100644
>> --- a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
>> +++ b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
>> @@ -16,6 +16,18 @@
>>  #include "xe_device_types.h"
>>  #include "xe_pm.h"
>>  
>> +/**
>> + * xe_kunit_helper_is_live_test - Return true if @test is a live test.
>> + * @test: the &kunit test
>> + *
>> + * Return: True for a live test and false otherwise.
>> + */
>> +bool xe_kunit_helper_is_live_test(struct kunit *test)
>> +{
>> +	KUNIT_STATIC_STUB_REDIRECT(xe_kunit_helper_is_live_test, test);
>> +	return false;
>> +}
>
> or maybe we only need something like this in xe_device.h:
>
> +static inline bool xe_device_is_real(const struct xe_device *xe)
> +{
> +       return xe->drm.dev->bus == &pci_bus_type;
> +}
>
> as all fake kunit xe devices will have kunit_bus_type instead

Yep.  This is much cleaner.  Thanks!

Even though I realized after the fact that this
xe_kunit_helper_is_live_test() is not necessary anymore in this series,
the asserts you included in [1] seem useful, so I provided my r-b there.

[1] https://lore.kernel.org/intel-xe/20260512194514.3414-1-michal.wajdeczko@intel.com/

--
Gustavo Sousa

>
> already tested ;)
>
>> +
>>  /**
>>   * xe_kunit_helper_alloc_xe_device - Allocate a &xe_device for a KUnit test.
>>   * @test: the &kunit where this &xe_device will be used
>> @@ -93,6 +105,11 @@ EXPORT_SYMBOL_IF_KUNIT(xe_kunit_helper_xe_device_test_init);
>>  
>>  KUNIT_DEFINE_ACTION_WRAPPER(put_xe_pm_runtime, xe_pm_runtime_put, struct xe_device *);
>>  
>> +static bool xe_kunit_is_live_test_indeed(struct kunit *test)
>> +{
>> +	return true;
>> +}
>> +
>>  /**
>>   * xe_kunit_helper_xe_device_live_test_init - Prepare a &xe_device for
>>   *                                            use in a live KUnit test.
>> @@ -116,6 +133,15 @@ int xe_kunit_helper_xe_device_live_test_init(struct kunit *test)
>>  {
>>  	struct xe_device *xe = xe_device_const_cast(test->param_value);
>>  
>> +	/*
>> +	 * FIXME: This is a hack and a better solution is to have the "priv"
>> +	 * member of tests have a boolean to tell if a test is a live one.
>> +	 * Unfortunately that can't be done today because "priv" does not point
>> +	 * to a single unified type across existing tests.
>> +	 */
>> +	kunit_activate_static_stub(test, xe_kunit_helper_is_live_test,
>> +				   xe_kunit_is_live_test_indeed);
>> +
>>  	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xe);
>>  	kunit_info(test, "running on %s device\n", xe->info.platform_name);
>>  
>> diff --git a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.h b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.h
>> index 83665f7b1254..71cfeb2d4efb 100644
>> --- a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.h
>> +++ b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.h
>> @@ -6,10 +6,14 @@
>>  #ifndef _XE_KUNIT_HELPERS_H_
>>  #define _XE_KUNIT_HELPERS_H_
>>  
>> +#include <linux/types.h>
>> +
>>  struct device;
>>  struct kunit;
>>  struct xe_device;
>>  
>> +bool xe_kunit_helper_is_live_test(struct kunit *test);
>> +
>>  struct xe_device *xe_kunit_helper_alloc_xe_device(struct kunit *test,
>>  						  struct device *dev);
>>  int xe_kunit_helper_xe_device_test_init(struct kunit *test);
>>