From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v3 10/13] drm/xe/tests: Add object encoding helper test
Date: Fri, 10 Jul 2026 21:59:45 +0200 [thread overview]
Message-ID: <20260710195945.7316-1-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20260707220816.677-11-michal.wajdeczko@intel.com>
We will soon be encoding complex objects as KLVs using our helper
function. Add few simple tests to make sure this helper function
works as expected.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
---
v2: add more negative tests (me)
v3: drop faulty encoder for now (drm-xe-next)
---
.../drm/xe/tests/xe_guc_klv_helpers_kunit.c | 205 ++++++++++++++++++
1 file changed, 205 insertions(+)
diff --git a/drivers/gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c b/drivers/gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c
index cb4b182d88d0..33d7a52f6bf8 100644
--- a/drivers/gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c
+++ b/drivers/gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c
@@ -7,6 +7,7 @@
#include <kunit/test-bug.h>
#define TEST_KEY (GUC_KLV_RESERVED_RANGE_START + 0x3de)
+#define TEST_GROUP_KEY (GUC_KLV_RESERVED_RANGE_START + 0x3f0)
#define TEST_PAD 0xdeadbeef
static void test_count(struct kunit *test)
@@ -167,11 +168,215 @@ static void test_encode_string(struct kunit *test)
xe_guc_klv_encode_string(klvs, avail, key, buf));
}
+struct some_object {
+ u32 value1;
+ u64 value2;
+} __packed;
+
+static u32 *obj_raw_encoder(u32 *klvs, u32 avail, const void *arg)
+{
+ const struct some_object *obj = arg;
+ size_t sz = sizeof(*obj);
+ u32 dwords = to_num_dwords(sz);
+
+ if (IS_ERR(klvs))
+ return klvs;
+ if (dwords > avail)
+ return ERR_PTR(-ENOSPC);
+ memcpy(klvs, obj, sz);
+ return klvs + dwords;
+}
+
+static u32 *obj_klv_encoder(u32 *klvs, u32 avail, const void *arg)
+{
+ const struct some_object *obj = arg;
+ u32 *end = klvs + avail;
+
+ klvs = xe_guc_klv_encode_u32(klvs, end - klvs, TEST_KEY + 1, obj->value1);
+ klvs = xe_guc_klv_encode_u64(klvs, end - klvs, TEST_KEY + 2, obj->value2);
+ return klvs;
+}
+
+static u32 *obj_nested_encoder(u32 *klvs, u32 avail, const void *arg)
+{
+ u32 *end = klvs + avail;
+
+ klvs = xe_guc_klv_encode_object(klvs, end - klvs, TEST_GROUP_KEY + 1,
+ arg, obj_klv_encoder);
+ klvs = xe_guc_klv_encode_object(klvs, end - klvs, TEST_GROUP_KEY + 2,
+ arg, obj_klv_encoder);
+ return klvs;
+}
+
+static void test_encode_object_raw(struct kunit *test)
+{
+ const struct some_object obj = {
+ .value1 = 0xdead1234,
+ .value2 = 0xdead87654321dead,
+ };
+ u32 payload = to_num_dwords(sizeof(obj));
+ u32 *err = ERR_PTR(-ENOSPC);
+ u16 key = TEST_KEY;
+ u32 klvs[16];
+ u32 n;
+
+ /* too small, must fail */
+ for (n = 0; n < GUC_KLV_LEN_MIN + payload; n++) {
+ memset32(klvs, TEST_PAD, ARRAY_SIZE(klvs));
+ KUNIT_EXPECT_PTR_EQ_MSG(test, ERR_PTR(-ENOSPC),
+ xe_guc_klv_encode_object(klvs, n, key, &obj,
+ obj_raw_encoder),
+ "buf size=%u dwords", n);
+ }
+
+ /* must pass */
+ memset32(klvs, TEST_PAD, ARRAY_SIZE(klvs));
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test,
+ xe_guc_klv_encode_object(klvs, GUC_KLV_LEN_MIN + payload,
+ key, &obj, obj_raw_encoder));
+ KUNIT_EXPECT_EQ(test, klvs[0], PREP_GUC_KLV(key, payload));
+ KUNIT_EXPECT_MEMEQ(test, &klvs[1], &obj, sizeof(obj));
+
+ /* already failed, must fail */
+ KUNIT_ASSERT_PTR_EQ(test, err,
+ xe_guc_klv_encode_object(err, ARRAY_SIZE(klvs), key,
+ &obj, obj_raw_encoder));
+}
+
+static void test_encode_object_klv(struct kunit *test)
+{
+ const struct some_object obj = {
+ .value1 = 0xdead1234,
+ .value2 = 0xdead87654321dead,
+ };
+ u16 key = TEST_GROUP_KEY;
+ u32 payload = 0;
+ u32 klvs[16];
+ u32 n;
+
+ payload += GUC_KLV_LEN_MIN + to_num_dwords(sizeof(obj.value1));
+ payload += GUC_KLV_LEN_MIN + to_num_dwords(sizeof(obj.value2));
+
+ /* too small, must fail */
+ for (n = 0; n < GUC_KLV_LEN_MIN + payload; n++) {
+ memset32(klvs, TEST_PAD, ARRAY_SIZE(klvs));
+ KUNIT_EXPECT_PTR_EQ_MSG(test, ERR_PTR(-ENOSPC),
+ xe_guc_klv_encode_object(klvs, n, key, &obj,
+ obj_klv_encoder),
+ "buf size=%u dwords", n);
+ }
+
+ /* must pass */
+ memset32(klvs, TEST_PAD, ARRAY_SIZE(klvs));
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test,
+ xe_guc_klv_encode_object(klvs, GUC_KLV_LEN_MIN + payload,
+ key, &obj, obj_klv_encoder));
+ KUNIT_EXPECT_EQ(test, klvs[0], PREP_GUC_KLV(key, payload));
+ KUNIT_EXPECT_EQ(test, klvs[1], PREP_GUC_KLV(TEST_KEY + 1, 1));
+ KUNIT_EXPECT_EQ(test, klvs[2], obj.value1);
+ KUNIT_EXPECT_EQ(test, klvs[3], PREP_GUC_KLV(TEST_KEY + 2, 2));
+ KUNIT_EXPECT_EQ(test, klvs[4], lower_32_bits(obj.value2));
+ KUNIT_EXPECT_EQ(test, klvs[5], upper_32_bits(obj.value2));
+ KUNIT_EXPECT_EQ(test, klvs[6], TEST_PAD);
+}
+
+static void test_encode_object_nested(struct kunit *test)
+{
+ const struct some_object obj = {
+ .value1 = 0xdead1234,
+ .value2 = 0xdead87654321dead,
+ };
+ u16 key = TEST_GROUP_KEY;
+ u32 payload = 0;
+ u32 klvs[16];
+ u32 n;
+
+ payload += GUC_KLV_LEN_MIN;
+ payload += GUC_KLV_LEN_MIN + to_num_dwords(sizeof(obj.value1));
+ payload += GUC_KLV_LEN_MIN + to_num_dwords(sizeof(obj.value2));
+ payload *= 2;
+
+ /* too small, must fail */
+ for (n = 0; n < GUC_KLV_LEN_MIN + payload; n++) {
+ memset32(klvs, TEST_PAD, ARRAY_SIZE(klvs));
+ KUNIT_EXPECT_PTR_EQ_MSG(test, ERR_PTR(-ENOSPC),
+ xe_guc_klv_encode_object(klvs, n, key, &obj,
+ obj_nested_encoder),
+ "buf size=%u dwords", n);
+ }
+
+ /* must pass */
+ memset32(klvs, TEST_PAD, ARRAY_SIZE(klvs));
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test,
+ xe_guc_klv_encode_object(klvs, GUC_KLV_LEN_MIN + payload,
+ key, &obj, obj_nested_encoder));
+ KUNIT_EXPECT_EQ(test, klvs[0], PREP_GUC_KLV(key, payload));
+ KUNIT_EXPECT_EQ(test, klvs[1], PREP_GUC_KLV(TEST_GROUP_KEY + 1, 5));
+ KUNIT_EXPECT_EQ(test, klvs[2], PREP_GUC_KLV(TEST_KEY + 1, 1));
+ KUNIT_EXPECT_EQ(test, klvs[3], obj.value1);
+ KUNIT_EXPECT_EQ(test, klvs[4], PREP_GUC_KLV(TEST_KEY + 2, 2));
+ KUNIT_EXPECT_EQ(test, klvs[5], lower_32_bits(obj.value2));
+ KUNIT_EXPECT_EQ(test, klvs[6], upper_32_bits(obj.value2));
+ KUNIT_EXPECT_EQ(test, klvs[7], PREP_GUC_KLV(TEST_GROUP_KEY + 2, 5));
+ KUNIT_EXPECT_EQ(test, klvs[8], PREP_GUC_KLV(TEST_KEY + 1, 1));
+ KUNIT_EXPECT_EQ(test, klvs[9], obj.value1);
+ KUNIT_EXPECT_EQ(test, klvs[10], PREP_GUC_KLV(TEST_KEY + 2, 2));
+ KUNIT_EXPECT_EQ(test, klvs[11], lower_32_bits(obj.value2));
+ KUNIT_EXPECT_EQ(test, klvs[12], upper_32_bits(obj.value2));
+ KUNIT_EXPECT_EQ(test, klvs[13], TEST_PAD);
+}
+
+static u32 *obj_echo_encoder(u32 *klvs, u32 avail, const void *arg)
+{
+ return ERR_CAST(arg);
+}
+
+static void test_encode_object_basic(struct kunit *test)
+{
+ u32 longest = GUC_KLV_LEN_MIN + FIELD_MAX(GUC_KLV_0_LEN);
+ u32 avail = GUC_KLV_LEN_MIN + longest;
+ u16 key = TEST_GROUP_KEY;
+ u32 *klvs;
+
+ klvs = kunit_kcalloc(test, avail, sizeof(u32), GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, klvs);
+
+ /* smallest */
+ KUNIT_EXPECT_PTR_EQ(test, klvs + GUC_KLV_LEN_MIN,
+ xe_guc_klv_encode_object(klvs, avail, key,
+ klvs + GUC_KLV_LEN_MIN,
+ obj_echo_encoder));
+ /* largest */
+ KUNIT_EXPECT_PTR_EQ(test, klvs + longest,
+ xe_guc_klv_encode_object(klvs, avail, key,
+ klvs + longest,
+ obj_echo_encoder));
+ /* already failed */
+ KUNIT_EXPECT_PTR_EQ(test, ERR_PTR(-EROFS),
+ xe_guc_klv_encode_object(ERR_PTR(-EROFS), avail, key,
+ klvs + GUC_KLV_LEN_MIN,
+ obj_echo_encoder));
+ /* encoding error */
+ KUNIT_EXPECT_PTR_EQ(test, ERR_PTR(-EUCLEAN),
+ xe_guc_klv_encode_object(klvs, avail, key,
+ ERR_PTR(-EUCLEAN),
+ obj_echo_encoder));
+ /* no space */
+ KUNIT_EXPECT_PTR_EQ(test, ERR_PTR(-ENOSPC),
+ xe_guc_klv_encode_object(klvs, 0, key,
+ klvs + GUC_KLV_LEN_MIN,
+ obj_echo_encoder));
+}
+
static struct kunit_case guc_klv_helpers_test_cases[] = {
KUNIT_CASE(test_count),
KUNIT_CASE(test_encode_u32),
KUNIT_CASE(test_encode_u64),
KUNIT_CASE(test_encode_string),
+ KUNIT_CASE(test_encode_object_raw),
+ KUNIT_CASE(test_encode_object_klv),
+ KUNIT_CASE(test_encode_object_nested),
+ KUNIT_CASE(test_encode_object_basic),
{}
};
--
2.47.1
next prev parent reply other threads:[~2026-07-10 19:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-07 22:08 [PATCH v2 00/13] drm/xe: Add and use more KLV helpers Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 01/13] drm/xe/guc: Allow to print single KLV Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 02/13] drm/xe/guc: Prepare to print group KLVs Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 03/13] drm/xe/guc: Add basic KLV encoding helpers Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 04/13] drm/xe/guc: Add string KLV encoding helper Michal Wajdeczko
2026-07-09 12:51 ` Michał Winiarski
2026-07-07 22:08 ` [PATCH v2 05/13] drm/xe/guc: Add object " Michal Wajdeczko
2026-07-09 12:53 ` Michał Winiarski
2026-07-07 22:08 ` [PATCH v2 06/13] drm/xe/guc: Add KLV parsing helper Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 07/13] drm/xe/guc: Formalize Reserved KLVs Michal Wajdeczko
2026-07-10 17:25 ` [PATCH v3 " Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 08/13] drm/xe/tests: Add GuC KLV helpers basic tests Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 09/13] drm/xe/tests: Add string encoding helper test Michal Wajdeczko
2026-07-08 18:07 ` [PATCH v3 " Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 10/13] drm/xe/tests: Add object " Michal Wajdeczko
2026-07-10 19:59 ` Michal Wajdeczko [this message]
2026-07-07 22:08 ` [PATCH v2 11/13] drm/xe/tests: Add GuC KLV printer test Michal Wajdeczko
2026-07-11 7:36 ` [PATCH v3 " Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 12/13] drm/xe/tests: Add migration packet test Michal Wajdeczko
2026-07-08 18:09 ` [PATCH v3 " Michal Wajdeczko
2026-07-07 22:08 ` [PATCH v2 13/13] drm/xe/pf: Handle migration descriptor using KLV helpers Michal Wajdeczko
2026-07-07 22:16 ` ✗ CI.checkpatch: warning for drm/xe: Add and use more KLV helpers (rev2) Patchwork
2026-07-07 22:18 ` ✓ CI.KUnit: success " Patchwork
2026-07-07 23:04 ` ✓ Xe.CI.BAT: " Patchwork
2026-07-08 0:20 ` ✓ Xe.CI.FULL: " Patchwork
2026-07-08 19:04 ` ✗ CI.checkpatch: warning for drm/xe: Add and use more KLV helpers (rev4) Patchwork
2026-07-08 19:05 ` ✓ CI.KUnit: success " Patchwork
2026-07-08 19:55 ` ✓ Xe.CI.BAT: " Patchwork
2026-07-08 23:56 ` ✓ Xe.CI.FULL: " Patchwork
2026-07-10 17:31 ` ✗ CI.checkpatch: warning for drm/xe: Add and use more KLV helpers (rev5) Patchwork
2026-07-10 17:32 ` ✓ CI.KUnit: success " Patchwork
2026-07-10 18:22 ` ✓ Xe.CI.BAT: " Patchwork
2026-07-11 4:04 ` ✓ Xe.CI.FULL: " Patchwork
2026-07-11 7:42 ` ✗ CI.checkpatch: warning for drm/xe: Add and use more KLV helpers (rev7) Patchwork
2026-07-11 7:43 ` ✓ CI.KUnit: success " Patchwork
2026-07-11 8:18 ` ✓ Xe.CI.BAT: " Patchwork
2026-07-11 11:12 ` ✓ Xe.CI.FULL: " 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=20260710195945.7316-1-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