From: "Piotr Piórkowski" <piotr.piorkowski@intel.com>
To: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: <intel-xe@lists.freedesktop.org>
Subject: Re: [PATCH 5/5] drm/xe/kunit: Add PF service tests
Date: Mon, 22 Apr 2024 14:01:50 +0200 [thread overview]
Message-ID: <20240422120150.xt3iaiuok6nf622e@intel.com> (raw)
In-Reply-To: <20240418152802.182-6-michal.wajdeczko@intel.com>
Michal Wajdeczko <michal.wajdeczko@intel.com> wrote on czw [2024-kwi-18 17:28:02 +0200]:
> Start with basic tests for VF/PF ABI version negotiation. As we
> treat all platforms in the same way, we can run the tests on one
> platform. More tests will likely come later.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> ---
> .../xe/tests/xe_gt_sriov_pf_service_test.c | 232 ++++++++++++++++++
> drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 4 +
> 2 files changed, 236 insertions(+)
> create mode 100644 drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c
>
> diff --git a/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c b/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c
> new file mode 100644
> index 000000000000..b683585db852
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c
> @@ -0,0 +1,232 @@
> +// SPDX-License-Identifier: GPL-2.0 AND MIT
> +/*
> + * Copyright © 2024 Intel Corporation
> + */
> +
> +#include <kunit/test.h>
> +
> +#include "xe_device.h"
> +#include "xe_kunit_helpers.h"
> +#include "xe_pci_test.h"
> +
> +static int pf_service_test_init(struct kunit *test)
> +{
> + struct xe_pci_fake_data fake = {
> + .sriov_mode = XE_SRIOV_MODE_PF,
> + .platform = XE_TIGERLAKE, /* some random platform */
> + .subplatform = XE_SUBPLATFORM_NONE,
> + };
> + struct xe_device *xe;
> + struct xe_gt *gt;
> +
> + test->priv = &fake;
> + xe_kunit_helper_xe_device_test_init(test);
> +
> + xe = test->priv;
> + KUNIT_ASSERT_EQ(test, xe_sriov_init(xe), 0);
> +
> + gt = xe_device_get_gt(xe, 0);
> + pf_init_versions(gt);
> +
> + /*
> + * sanity check:
> + * - all supported platforms VF/PF ABI versions must be defined
> + * - base version can't be newer than latest
> + */
> + KUNIT_ASSERT_NE(test, 0, gt->sriov.pf.service.version.base.major);
> + KUNIT_ASSERT_NE(test, 0, gt->sriov.pf.service.version.latest.major);
> + KUNIT_ASSERT_LE(test, gt->sriov.pf.service.version.base.major,
> + gt->sriov.pf.service.version.latest.major);
> + if (gt->sriov.pf.service.version.base.major == gt->sriov.pf.service.version.latest.major)
> + KUNIT_ASSERT_LE(test, gt->sriov.pf.service.version.base.minor,
> + gt->sriov.pf.service.version.latest.minor);
> +
> + test->priv = gt;
> + return 0;
> +}
> +
> +static void pf_negotiate_any(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt, VF2PF_HANDSHAKE_MAJOR_ANY,
> + VF2PF_HANDSHAKE_MINOR_ANY,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.latest.major);
> + KUNIT_ASSERT_EQ(test, minor, gt->sriov.pf.service.version.latest.minor);
> +}
> +
> +static void pf_negotiate_base_match(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.base.major,
> + gt->sriov.pf.service.version.base.minor,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.base.major);
> + KUNIT_ASSERT_EQ(test, minor, gt->sriov.pf.service.version.base.minor);
> +}
> +
> +static void pf_negotiate_base_newer(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.base.major,
> + gt->sriov.pf.service.version.base.minor + 1,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.base.major);
> + KUNIT_ASSERT_GE(test, minor, gt->sriov.pf.service.version.base.minor);
> + if (gt->sriov.pf.service.version.base.major == gt->sriov.pf.service.version.latest.major)
> + KUNIT_ASSERT_LE(test, minor, gt->sriov.pf.service.version.latest.minor);
> + else
> + KUNIT_FAIL(test, "FIXME: don't know how to test multi-version yet!\n");
> +}
> +
> +static void pf_negotiate_base_next(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.base.major + 1, 0,
> + &major, &minor));
> + KUNIT_ASSERT_GE(test, major, gt->sriov.pf.service.version.base.major);
> + KUNIT_ASSERT_LE(test, major, gt->sriov.pf.service.version.latest.major);
> + if (major == gt->sriov.pf.service.version.latest.major)
> + KUNIT_ASSERT_LE(test, minor, gt->sriov.pf.service.version.latest.minor);
> + else
> + KUNIT_FAIL(test, "FIXME: don't know how to test multi-version yet!\n");
> +}
> +
> +static void pf_negotiate_base_older(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + if (!gt->sriov.pf.service.version.base.minor)
> + kunit_skip(test, "no older minor\n");
> +
> + KUNIT_ASSERT_NE(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.base.major,
> + gt->sriov.pf.service.version.base.minor - 1,
> + &major, &minor));
> +}
> +
> +static void pf_negotiate_base_prev(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_NE(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.base.major - 1, 1,
> + &major, &minor));
> +}
> +
> +static void pf_negotiate_latest_match(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.latest.major,
> + gt->sriov.pf.service.version.latest.minor,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.latest.major);
> + KUNIT_ASSERT_EQ(test, minor, gt->sriov.pf.service.version.latest.minor);
> +}
> +
> +static void pf_negotiate_latest_newer(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.latest.major,
> + gt->sriov.pf.service.version.latest.minor + 1,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.latest.major);
> + KUNIT_ASSERT_EQ(test, minor, gt->sriov.pf.service.version.latest.minor);
> +}
> +
> +static void pf_negotiate_latest_next(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.latest.major + 1, 0,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.latest.major);
> + KUNIT_ASSERT_EQ(test, minor, gt->sriov.pf.service.version.latest.minor);
> +}
> +
> +static void pf_negotiate_latest_older(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + if (!gt->sriov.pf.service.version.latest.minor)
> + kunit_skip(test, "no older minor\n");
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.latest.major,
> + gt->sriov.pf.service.version.latest.minor - 1,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.latest.major);
> + KUNIT_ASSERT_EQ(test, minor, gt->sriov.pf.service.version.latest.minor - 1);
> +}
> +
> +static void pf_negotiate_latest_prev(struct kunit *test)
> +{
> + struct xe_gt *gt = test->priv;
> + u32 major, minor;
> +
> + if (gt->sriov.pf.service.version.base.major == gt->sriov.pf.service.version.latest.major)
> + kunit_skip(test, "no prev major");
> +
> + KUNIT_ASSERT_EQ(test, 0,
> + pf_negotiate_version(gt,
> + gt->sriov.pf.service.version.latest.major - 1,
> + gt->sriov.pf.service.version.base.minor + 1,
> + &major, &minor));
> + KUNIT_ASSERT_EQ(test, major, gt->sriov.pf.service.version.latest.major - 1);
> + KUNIT_ASSERT_GE(test, major, gt->sriov.pf.service.version.base.major);
> +}
> +
> +static struct kunit_case pf_service_test_cases[] = {
> + KUNIT_CASE(pf_negotiate_any),
> + KUNIT_CASE(pf_negotiate_base_match),
> + KUNIT_CASE(pf_negotiate_base_newer),
> + KUNIT_CASE(pf_negotiate_base_next),
> + KUNIT_CASE(pf_negotiate_base_older),
> + KUNIT_CASE(pf_negotiate_base_prev),
> + KUNIT_CASE(pf_negotiate_latest_match),
> + KUNIT_CASE(pf_negotiate_latest_newer),
> + KUNIT_CASE(pf_negotiate_latest_next),
> + KUNIT_CASE(pf_negotiate_latest_older),
> + KUNIT_CASE(pf_negotiate_latest_prev),
> + {}
> +};
> +
> +static struct kunit_suite pf_service_suite = {
> + .name = "pf_service",
> + .test_cases = pf_service_test_cases,
> + .init = pf_service_test_init,
> +};
> +
> +kunit_test_suite(pf_service_suite);
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c
> index 4b9850cc3615..80899fa1ad2a 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c
> @@ -547,3 +547,7 @@ int xe_gt_sriov_pf_service_print_version(struct xe_gt *gt, struct drm_printer *p
>
> return 0;
> }
> +
> +#if IS_BUILTIN(CONFIG_DRM_XE_KUNIT_TEST)
> +#include "tests/xe_gt_sriov_pf_service_test.c"
> +#endif
LGTM:
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
> --
> 2.43.0
>
--
next prev parent reply other threads:[~2024-04-22 12:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 15:27 [PATCH 0/5] Add SR-IOV GuC Relay PF services Michal Wajdeczko
2024-04-18 15:27 ` [PATCH 1/5] drm/xe/guc: Add GuC Relay ABI version 1.0 definitions Michal Wajdeczko
2024-04-22 9:25 ` Piotr Piórkowski
2024-04-22 10:26 ` Piotr Piórkowski
2024-04-18 15:27 ` [PATCH 2/5] drm/xe: Add helper to calculate adjusted register offset Michal Wajdeczko
2024-04-22 10:29 ` Piotr Piórkowski
2024-04-18 15:28 ` [PATCH 3/5] drm/xe: Add few more GT register definitions Michal Wajdeczko
2024-04-22 9:38 ` Piotr Piórkowski
2024-04-18 15:28 ` [PATCH 4/5] drm/xe/pf: Add SR-IOV GuC Relay PF services Michal Wajdeczko
2024-04-22 10:48 ` Piotr Piórkowski
2024-04-18 15:28 ` [PATCH 5/5] drm/xe/kunit: Add PF service tests Michal Wajdeczko
2024-04-22 12:01 ` Piotr Piórkowski [this message]
2024-04-18 19:48 ` ✓ CI.Patch_applied: success for Add SR-IOV GuC Relay PF services Patchwork
2024-04-18 19:48 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-18 19:49 ` ✓ CI.KUnit: success " Patchwork
2024-04-18 20:01 ` ✓ CI.Build: " Patchwork
2024-04-18 20:03 ` ✗ CI.Hooks: failure " Patchwork
2024-04-18 20:14 ` ✓ CI.checksparse: success " Patchwork
2024-04-18 20:38 ` ✗ CI.BAT: failure " Patchwork
2024-04-20 2:04 ` ✓ CI.Patch_applied: success for Add SR-IOV GuC Relay PF services (rev2) Patchwork
2024-04-20 2:04 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-20 2:05 ` ✓ CI.KUnit: success " Patchwork
2024-04-20 2:23 ` ✓ CI.Build: " Patchwork
2024-04-20 2:27 ` ✗ CI.Hooks: failure " Patchwork
2024-04-20 2:28 ` ✓ CI.checksparse: success " Patchwork
2024-04-20 11:30 ` ✗ CI.FULL: failure for Add SR-IOV GuC Relay PF services 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=20240422120150.xt3iaiuok6nf622e@intel.com \
--to=piotr.piorkowski@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=michal.wajdeczko@intel.com \
/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