From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v4 06/10] drm/xe/kunit: Restore test->priv when done with fake xe device
Date: Fri, 15 Dec 2023 17:24:58 +0100 [thread overview]
Message-ID: <20231215162502.1879-7-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20231215162502.1879-1-michal.wajdeczko@intel.com>
Current KUnit implementation does not reset test->priv in case of
parametrized tests and that may lead to wrongly treat our output
pointer to fake xe_device from first call as input pointer with
xe_pci_fake_data on subsequent calls. Restore test->priv to
original value to avoid invalid access.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
index 6d72dbf06139..fefe79b3b75a 100644
--- a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
+++ b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
@@ -41,6 +41,13 @@ struct xe_device *xe_kunit_helper_alloc_xe_device(struct kunit *test,
}
EXPORT_SYMBOL_IF_KUNIT(xe_kunit_helper_alloc_xe_device);
+static void kunit_action_restore_priv(void *priv)
+{
+ struct kunit *test = kunit_get_current_test();
+
+ test->priv = priv;
+}
+
/**
* xe_kunit_helper_xe_device_test_init - Prepare a &xe_device for a KUnit test.
* @test: the &kunit where this fake &xe_device will be used
@@ -74,6 +81,9 @@ int xe_kunit_helper_xe_device_test_init(struct kunit *test)
err = xe_pci_fake_device_init(xe);
KUNIT_ASSERT_EQ(test, err, 0);
+ err = kunit_add_action_or_reset(test, kunit_action_restore_priv, test->priv);
+ KUNIT_ASSERT_EQ(test, err, 0);
+
test->priv = xe;
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2023-12-15 16:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-15 16:24 [PATCH v4 00/10] Introduce GuC Doorbells Manager Michal Wajdeczko
2023-12-15 16:24 ` [PATCH v4 01/10] drm/xe: Add GT oriented drm_printers Michal Wajdeczko
2023-12-15 21:48 ` Lucas De Marchi
2023-12-15 16:24 ` [PATCH v4 02/10] drm/xe: Report TLB timeout using GT oriented functions Michal Wajdeczko
2023-12-15 21:50 ` Lucas De Marchi
2023-12-15 16:24 ` [PATCH v4 03/10] drm/xe: Introduce GuC Doorbells Manager Michal Wajdeczko
2023-12-15 16:24 ` [PATCH v4 04/10] drm/xe/kunit: Set SR-IOV mode of the fake device Michal Wajdeczko
2023-12-15 16:24 ` [PATCH v4 05/10] drm/xe/kunit: Define helper functions to allocate fake xe device Michal Wajdeczko
2023-12-15 22:01 ` Lucas De Marchi
2023-12-15 16:24 ` Michal Wajdeczko [this message]
2023-12-15 22:11 ` [PATCH v4 06/10] drm/xe/kunit: Restore test->priv when done with " Lucas De Marchi
2023-12-16 12:11 ` Michal Wajdeczko
2023-12-15 16:24 ` [PATCH v4 07/10] drm/xe/kunit: Use xe kunit helper in RTP test Michal Wajdeczko
2023-12-15 22:05 ` Lucas De Marchi
2023-12-15 16:25 ` [PATCH v4 08/10] drm/xe/kunit: Use xe kunit helper in WA test Michal Wajdeczko
2023-12-15 22:06 ` Lucas De Marchi
2023-12-15 16:25 ` [PATCH v4 09/10] drm/xe/kunit: Enable CONFIG_LOCKDEP in tests Michal Wajdeczko
2023-12-15 22:06 ` Lucas De Marchi
2023-12-15 16:25 ` [PATCH v4 10/10] drm/xe/kunit: Add GuC Doorbells Manager tests Michal Wajdeczko
2023-12-15 17:53 ` ✓ CI.Patch_applied: success for Introduce GuC Doorbells Manager (rev4) Patchwork
2023-12-15 17:53 ` ✗ CI.checkpatch: warning " Patchwork
2023-12-15 17:55 ` ✓ CI.KUnit: success " Patchwork
2023-12-15 18:02 ` ✓ CI.Build: " Patchwork
2023-12-15 18:02 ` ✓ CI.Hooks: " Patchwork
2023-12-15 18:04 ` ✓ CI.checksparse: " Patchwork
2023-12-15 18:36 ` ✓ CI.BAT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231215162502.1879-7-michal.wajdeczko@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox