From nobody Sun May 4 22:20:10 2025
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org
[10.30.226.201])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA248253333
for <linux-kernel@vger.kernel.org>; Thu, 3 Apr 2025 13:33:54 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=10.30.226.201
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743687234; cv=none;
b=ouZObGvoN5jk7K9d358yO4uvA3lZ7DB00BbSopXwPlo/WpSMY6t8Vb1o5P/NrSHmazZlVLhMSoBMFW+k+OaBSHE1CoA6pVNvpBs0jgDshG/NQYtSudVCyjxvRUS2CfWQp/Tb6IUtsoqxm8c/zUTEQNaRD2Mub7NFKo0jTcqu0yA=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743687234; c=relaxed/simple;
bh=hMXyl/o28HCBQcio/Vf3sP3GQUcIbXdFe9WHjTM8Fjg=;
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
In-Reply-To:To:Cc;
b=RV9I3XUopwz9by2ldCcUnm8/kvlvPfp3xrcxAcFkwDxkJhHJJJMj4no6UmTwrqoYFMWQXa6A+TDXbokfxWomcOQVSPeCZb6QtN+FOnbIcwk3qYzsQ1DtY+KUc278LL2H/U7BcKCQGveOj4jukwdG0PAAtwbFGqOCNwTHmafmxmw=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b=fFYDb8c+; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b="fFYDb8c+"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1064C4CEE5;
Thu, 3 Apr 2025 13:33:53 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1743687234;
bh=hMXyl/o28HCBQcio/Vf3sP3GQUcIbXdFe9WHjTM8Fjg=;
h=From:Date:Subject:References:In-Reply-To:To:Cc:From;
b=fFYDb8c+ymb+FThbz5S66LzuzIlEmTagnsBzHN+4WB/dn+oaKsnCtqOl/FKxUUAnj
R3egR4ORvs/j+6eVL1V3vpLZM86m9aH+5lYQMVZzcmpUpq7N2qxBbeaywu/AKII1Wv
xv7u/Q+Zva9F9hpoN259KRX1UubvPoL9sW81wSQEPFO1Xk9Q4AUK5g0v6wTtyQMI86
26DF7vXWSSCFh+/r7Urrg+oBaghk32w6BJSvf1A4G/s29RGryB7aidJe5mBi+Lkke+
4KsVzunC14pehqmyMtnPhi+aA3fZvndoiCDBm71q6+am357vEVUYjb0/JJcOlSiYQa
U+bSPR9ix0uKA==
From: Maxime Ripard <mripard@kernel.org>
Date: Thu, 03 Apr 2025 15:33:33 +0200
Subject: [PATCH v2 4/4] drm/vc4: tests: Retry pv-muxing tests when EDEADLK
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-Id: <20250403-drm-vc4-kunit-failures-v2-4-e09195cc8840@kernel.org>
References: <20250403-drm-vc4-kunit-failures-v2-0-e09195cc8840@kernel.org>
In-Reply-To: <20250403-drm-vc4-kunit-failures-v2-0-e09195cc8840@kernel.org>
To: Dave Stevenson <dave.stevenson@raspberrypi.com>,
=?utf-8?q?Ma=C3=ADra_Canal?= <mcanal@igalia.com>,
Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Maxime Ripard <mripard@kernel.org>
X-Mailer: b4 0.14.2
X-Developer-Signature: v=1; a=openpgp-sha256; l=8413; i=mripard@kernel.org;
h=from:subject:message-id; bh=hMXyl/o28HCBQcio/Vf3sP3GQUcIbXdFe9WHjTM8Fjg=;
b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnv+oxazp7jtlO+vjvaklNjRUIw55wc6XLLI9GWv9erz
3tTIG3fUcrCIMbFICumyBIjbL4k7tSs151sfPNg5rAygQxh4OIUgIkEzWf4K7pIt+vamZv7Eq4z
7RQXu/0i/7pXi9muPzIh+zUfhoRu+cjw32tfJafSG5nvnI8bQ1TeLyy88Mo2J+YPh/f1N5PS5sy
+wgIA
X-Developer-Key: i=mripard@kernel.org; a=openpgp;
fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D
Some functions used by the HVS->PV muxing tests can return with EDEADLK,
meaning the entire sequence should be restarted. It's not a fatal error
and we should treat it as a recoverable error, and recover, instead of
failing the test like we currently do.
Fixes: 76ec18dc5afa ("drm/vc4: tests: Add unit test suite for the PV muxing=
")
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Ma=C3=ADra Canal <mcanal@igalia.com>
---
drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 113 +++++++++++++++++++++=
+++-
1 file changed, 112 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c b/drivers/gpu/d=
rm/vc4/tests/vc4_test_pv_muxing.c
index 52c04ef33206bf4f9e21e3c8b7cea932824a67fa..d1f694029169adf6a907a72614b=
c66afd745017e 100644
--- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
@@ -685,20 +685,34 @@ static void drm_vc4_test_pv_muxing(struct kunit *test)
=20
drm_modeset_acquire_init(&ctx, 0);
=20
vc4 =3D priv->vc4;
drm =3D &vc4->base;
+
+retry:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
for (i =3D 0; i < params->nencoders; i++) {
enum vc4_encoder_type enc_type =3D params->encoders[i];
=20
ret =3D vc4_mock_atomic_add_output(test, state, enc_type);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
}
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
KUNIT_EXPECT_EQ(test, ret, 0);
=20
KUNIT_EXPECT_TRUE(test,
check_fifo_conflict(test, state));
=20
@@ -726,21 +740,35 @@ static void drm_vc4_test_pv_muxing_invalid(struct kun=
it *test)
=20
drm_modeset_acquire_init(&ctx, 0);
=20
vc4 =3D priv->vc4;
drm =3D &vc4->base;
+
+retry:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
for (i =3D 0; i < params->nencoders; i++) {
enum vc4_encoder_type enc_type =3D params->encoders[i];
=20
ret =3D vc4_mock_atomic_add_output(test, state, enc_type);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
}
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
KUNIT_EXPECT_LT(test, ret, 0);
=20
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
@@ -811,17 +839,30 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_cr=
tc_enable(struct kunit *tes
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
=20
drm_modeset_acquire_init(&ctx, 0);
=20
drm =3D &vc4->base;
+retry_first:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
ret =3D vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
new_hvs_state =3D vc4_hvs_get_new_global_state(state);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
=20
@@ -834,17 +875,30 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_cr=
tc_enable(struct kunit *tes
KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi0_channel].in_use);
=20
ret =3D drm_atomic_helper_swap_state(state, false);
KUNIT_ASSERT_EQ(test, ret, 0);
=20
+retry_second:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
ret =3D vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_second;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_second;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
new_hvs_state =3D vc4_hvs_get_new_global_state(state);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
=20
@@ -885,20 +939,39 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(s=
truct kunit *test)
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
=20
drm_modeset_acquire_init(&ctx, 0);
=20
drm =3D &vc4->base;
+retry_first:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
ret =3D vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
new_hvs_state =3D vc4_hvs_get_new_global_state(state);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
=20
@@ -919,17 +992,30 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(s=
truct kunit *test)
KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[old_hdmi1_channel].in_u=
se);
=20
ret =3D drm_atomic_helper_swap_state(state, false);
KUNIT_ASSERT_EQ(test, ret, 0);
=20
+retry_second:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
ret =3D vc4_mock_atomic_del_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_second;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_second;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
new_hvs_state =3D vc4_hvs_get_new_global_state(state);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
=20
@@ -979,29 +1065,54 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_t=
oo_many_crtc_state(struct ku
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
=20
drm_modeset_acquire_init(&ctx, 0);
=20
drm =3D &vc4->base;
+retry_first:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
ret =3D vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_first;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
-
ret =3D drm_atomic_helper_swap_state(state, false);
KUNIT_ASSERT_EQ(test, ret, 0);
=20
+retry_second:
state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
=20
ret =3D vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_second;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
ret =3D drm_atomic_check_only(state);
+ if (ret =3D=3D -EDEADLK) {
+ drm_atomic_state_clear(state);
+ ret =3D drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_second;
+ }
KUNIT_ASSERT_EQ(test, ret, 0);
=20
new_vc4_crtc_state =3D get_vc4_crtc_state_for_encoder(test, state,
VC4_ENCODER_TYPE_HDMI0);
KUNIT_EXPECT_NULL(test, new_vc4_crtc_state);
--=20
2.49.0