Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
From:   =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To:     <intel-xe@lists.freedesktop.org>,
        <dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
CC:     Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Michal Wajdeczko <michal.wajdeczko@intel.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Javier Martinez Canillas <javierm@redhat.com>,
        =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>,
        =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH 2/2] drm/tests: managed: Add a simple test for drmm_managed_release
Date:   Wed, 29 Nov 2023 23:14:12 +0100
Message-ID: <20231129221412.1180549-3-michal.winiarski@intel.com>
In-Reply-To: <20231129221412.1180549-1-michal.winiarski@intel.com>
References: <20231129221412.1180549-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Wm13UVR0cE94bDhaZU9SdTNHZEI1WnRYblZkWU9nQXdBUnd6YlhMWWtkYzNH?=
 =?utf-8?B?RTF2UWVMb2o2b0JPZ2xFK01xbTJVZ1ZuK0ZLdjBFSWdMNmdJekY3Uy84bFRU?=
 =?utf-8?B?aFNOVGMxNTg4YTNuN3NSbXloYkVkRFlxbkFLWEpjU2prNUlsZ3ZTY3k3TzU1?=
 =?utf-8?B?endYUEdwZDc4bnMyTFpLdzFjUFU4MklTVmt6MW05R1NralpGYXBGRiszbEFF?=
 =?utf-8?B?RjM4SHdFUmFqcTFHdUF6V3Z4ZlFRVkEvMVFTME5peCtLL3ZnNWp1V2xoTHJv?=
 =?utf-8?B?TjBJeXJXNHVzMWFEcnIxdGRNWVVwams1Q1Jvazl3OE5TRnF6Y3p5SnJ5WDEr?=
 =?utf-8?B?eU9SS011N1BrU0ZtcnNucHlZeHNJazhwVU9TUHFFWHZWWmF3YkVCQkNKK2VC?=
 =?utf-8?B?aTRyU2tJUUJHTFljK1AzZklvYkovU2xVUGlZT21jdGpPZlpoMEtEc2Q2Slhh?=
 =?utf-8?B?bGREaTdibXg4NzFxTEFtTGFoWWZkWnRucEFHeitQQUxBMjdGOUJGRE4xRE0y?=
 =?utf-8?B?QWdIYjh1bmRaaFJLYStzcElpVHRRQlhyeEJOMHlibnk5MktDMm1uRnlHUE1L?=
 =?utf-8?B?OFJ6Z0FRL3F6UFRBbTBncXE5WlRqalc0RDVyd21WQXRlM0xsRFF0R084THFu?=
 =?utf-8?B?MTNXeUdLWGZwZm5RcEJ5NXlQUXp1bGVCcmJZQU82bllkN0ROWDFEM0NOK1dN?=
 =?utf-8?B?VThpeldGdXdIcS9zTW5qN1RGNVRaUi81bE1GQXpUVDlEN1c2MTcwdnp0Ynor?=
 =?utf-8?B?MVdnQkR1QW1tbUZxUTZTRldVR0ZPRmF0S0N6ZFhoQzNsQXZ5Z0s1NFh6d2NQ?=
 =?utf-8?B?aG1nVVZ6TkhRTDRwQWl6bTJ3ODFhREVML1dpbmNsOFQ5OXgxL1ZIZytkRHRt?=
 =?utf-8?B?eC9GNlhIcnNwa1FqOTh6U29CTVlCdDdYdDJwOW1kRkZSM0U2WDNkNG0yb21Y?=
 =?utf-8?B?MTBlL1p0QWpPMmFMSW9UM0FQYW1Jd2tJSm1oUWVvUGQxZmIzVnZ5d2ZqN3hj?=
 =?utf-8?B?YkFMdjB3aFJxa05PaG03YWUvUGczTDhVd2JtbGtVcXkrVFJSd0dncXFyUmRj?=
 =?utf-8?B?bGhNL0lKOE1wMFZMRVp3bk9ZekhMaHdtb2E5N212OUh1SFcxSlh6blFzYTN1?=
 =?utf-8?B?OHJkS3oxZXBhMVI2R3daZ0U5eGFUdXJLbk9DRHFNd1F3cHRvUHhEM0kxQTFO?=
 =?utf-8?B?Z3VPWHJQWUZ3M3VhcWRwRm5mSVl4aVFIM29tTnFPN1NnYWREWWE4VEJZQm9Y?=
 =?utf-8?B?VEs0N0p6RjZiWVd1eTVuYUVUQ1BNY3gxMnRQZ3N3R1c2YlhzYSs4L3gvdklm?=
 =?utf-8?B?dnJlUkk2M3ltakdNVGVZRTJleU90N2VBWXlnQUozTVVCQWNNVlh2YlBURERR?=
 =?utf-8?B?WFNybTZMSXZVb212NHo5R2lCRzJQQ2dteVo5SnlWVExvUHNXdG5yc2N1S1FR?=
 =?utf-8?B?Q2h6UE1wa0dxZlFRT2JKSmhaVWs5YzMvMXBFQUs4Uk5VOHMzR3FtS3JGUy83?=
 =?utf-8?B?a2tGUVF4T1p6RUVpYWR0VHJNNmVENHY3S1JHMlJnUmNQYXNDQkV2eFBnekRB?=
 =?utf-8?B?SWYrMkJKdzZQdTRGbTI3bHZXTGVuYjI5VEthdVVuL0M1TDYxa0h2WjhBei9L?=
 =?utf-8?B?aHQ1STVVMFB1WmV2OGVXeC9OQWNIajFFMFllMlZjaUFIMTF3Z2Jod2lWQXVN?=
 =?utf-8?B?REM4Z3p6Mm9QMHVMQnQrdnVackZ4NDhySUlseEpPWk9xN3NrS05oRFdNQ05V?=
 =?utf-8?B?Z3NINDU5TnVKcmcvc1BhYTF5M3hJeng4VTFlTVdtNDRvcHk1a3IzVUpUbzJN?=
 =?utf-8?B?OGxNT01raUtCaUFCMjhEL282empLTjE3Y2NVem1UVU9ZcWZyQmxZQUtJYXJv?=
 =?utf-8?B?Wm5YeVg1dDdxNHRxbERwN1l1dytJQWJHWG9mSUx0ZVEzRDhBMmZZQkw4TkVX?=
 =?utf-8?B?Y2tIYzZtMFhyMTgxSXdwK256Q3JFaVFhQnVOckQ0Rk1yQ1d3SURNbC9lY2dv?=
 =?utf-8?B?b3JsdE81cFBhRzdSQzRBaW9DTHQxRVM5dGt3VHlVWk90Z3hBM0luNmpRSWdm?=
 =?utf-8?B?b3JWTm4zblFFcER2UkFkb2phb3cyOXRwN0tPQ3VtblFVaERHRzZMVmgzQlRr?=
 =?utf-8?B?cXc5czFxQ2lpK0tYNVBiV3RRTUJVQklTWmdPNEdBQ2RBY241NDZJSGt6MnBl?=
 =?utf-8?B?clE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 06f13fdd-b885-4ac7-681a-08dbf1289a95
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 22:14:49.8485
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /6q64r6uKTL14MLPGqpNqC857I0Um+6t20RrWNlYS6y67LKNMUGvHHFWNcO837XpSResQPriBodRr+ybWmGt0sKaRCo5TFJj6eusUoPdePA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR11MB8733
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:15:58 -0800 (PST)

Add a simple test that checks whether the action is indeed called right
away and that it is not called on the final drm_dev_put().

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 drivers/gpu/drm/tests/drm_managed_test.c | 65 ++++++++++++++++++------
 1 file changed, 50 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
index 1652dca11d30c..a645ea42aee56 100644
--- a/drivers/gpu/drm/tests/drm_managed_test.c
+++ b/drivers/gpu/drm/tests/drm_managed_test.c
@@ -12,6 +12,8 @@
 #define TEST_TIMEOUT_MS	100
 
 struct managed_test_priv {
+	struct drm_device *drm;
+	struct device *dev;
 	bool action_done;
 	wait_queue_head_t action_wq;
 };
@@ -26,42 +28,75 @@ static void drm_action(struct drm_device *drm, void *ptr)
 
 static void drm_test_managed_run_action(struct kunit *test)
 {
-	struct managed_test_priv *priv;
-	struct drm_device *drm;
-	struct device *dev;
+	struct managed_test_priv *priv = test->priv;
 	int ret;
 
-	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);
-	init_waitqueue_head(&priv->action_wq);
+	ret = drmm_add_action_or_reset(priv->drm, drm_action, priv);
+	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	dev = drm_kunit_helper_alloc_device(test);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
+	ret = drm_dev_register(priv->drm, 0);
+	KUNIT_ASSERT_EQ(test, ret, 0);
+
+	drm_dev_unregister(priv->drm);
+	drm_kunit_helper_free_device(test, priv->dev);
 
-	drm = __drm_kunit_helper_alloc_drm_device(test, dev, sizeof(*drm), 0, DRIVER_MODESET);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, drm);
+	ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done,
+					       msecs_to_jiffies(TEST_TIMEOUT_MS));
+	KUNIT_EXPECT_GT(test, ret, 0);
+}
 
-	ret = drmm_add_action_or_reset(drm, drm_action, priv);
+static void drm_test_managed_release_action(struct kunit *test)
+{
+	struct managed_test_priv *priv = test->priv;
+	int ret;
+
+	ret = drmm_add_action_or_reset(priv->drm, drm_action, priv);
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	ret = drm_dev_register(drm, 0);
+	ret = drm_dev_register(priv->drm, 0);
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
-	drm_dev_unregister(drm);
-	drm_kunit_helper_free_device(test, dev);
+	drmm_release_action(priv->drm, drm_action, priv);
+	KUNIT_EXPECT_TRUE(test, priv->action_done);
+	priv->action_done = false;
+
+	drm_dev_unregister(priv->drm);
+	drm_kunit_helper_free_device(test, priv->dev);
 
 	ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done,
 					       msecs_to_jiffies(TEST_TIMEOUT_MS));
-	KUNIT_EXPECT_GT(test, ret, 0);
+	KUNIT_EXPECT_EQ(test, ret, 0);
+}
+
+static int drm_managed_test_init(struct kunit *test)
+{
+	struct managed_test_priv *priv;
+
+	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);
+	init_waitqueue_head(&priv->action_wq);
+
+	priv->dev = drm_kunit_helper_alloc_device(test);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->dev);
+
+	priv->drm = __drm_kunit_helper_alloc_drm_device(test, priv->dev, sizeof(*priv->drm),
+							0, DRIVER_MODESET);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);
+
+	test->priv = priv;
+
+	return 0;
 }
 
 static struct kunit_case drm_managed_tests[] = {
 	KUNIT_CASE(drm_test_managed_run_action),
+	KUNIT_CASE(drm_test_managed_release_action),
 	{}
 };
 
 static struct kunit_suite drm_managed_test_suite = {
 	.name = "drm-test-managed",
+	.init = drm_managed_test_init,
 	.test_cases = drm_managed_tests
 };
 
-- 
2.43.0