From patchwork Fri Jan 5 10:13:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 13511913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA30FC3DA6E for ; Fri, 5 Jan 2024 10:13:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2114510E5CA; Fri, 5 Jan 2024 10:13:53 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7049D10E5CA; Fri, 5 Jan 2024 10:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704449631; x=1735985631; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=+g82cLTvUsGz2O7XsukpBKdt2b9RHeeaq9tCoTcWAok=; b=dyz2OkiQfZIb6Ywmf+Lps/+3fGbtzqLMOzUaipzPRLoIff6kOQwJB+Xb yomdcXYZkdaJZgK2Ej0fiU3b7AGORZNmx2Lo8vioajPOh+LiI8dfTZQS/ 6+8XJg4w/IYiAyizeaNdKyNmEcPpY9+Bt+WQz5XyvQ34YeFXcClSV676d jCOsD4JnscZR+J87UArXTU+mvO8GGgB1mZHI2FJDOoahLTwlHRi62z2Tp q2+5h8dgnzngayesyXrNf67esl1OshLiOitfFRHAL6MsrNjdllODFD+W6 t0kv540rrY7GHOGuYkxU3ujqaAOdtnRmppRGz83X/LqyUMv1FZyHRqLHO Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10943"; a="483651616" X-IronPort-AV: E=Sophos;i="6.04,333,1695711600"; d="scan'208";a="483651616" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2024 02:13:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10943"; a="730435432" X-IronPort-AV: E=Sophos;i="6.04,333,1695711600"; d="scan'208";a="730435432" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga003.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 05 Jan 2024 02:13:50 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 5 Jan 2024 02:13:50 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Fri, 5 Jan 2024 02:13:50 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Fri, 5 Jan 2024 02:13:49 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NJDRpd1t7VCg17o5kARFJJzchI9C6DW5dtApBh7kmBjSGolWD926qXDm03SIk0HgBjieIJeZ/TLpAUCYRDsAayA5owJmYTFz9s/2wrDf1aM3L6bc1NMjmU89HG/jB4PPA4ktcP/lt1ZLdw3NtAMldRuDPsHWAQ0bJ15oZCB+fTLxZRnfR7PMZGTSHbI4cfdT0ODO/u/JQDAh6YQc64DvoHtFXZ+MCQbUlqLy/sghfu3Mubk2e9fepVDZNURR1qxzzloFVw7gn+gGuwRxqE2DKesi6KPGs00NKtoznbMoUpD404RfgftjJRKDeDbJ+GegK2zbCpIjWKr7gCGG5GUlBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M6GlbfUjH/bsmaWYDJhAQjSWjM3UvIDXd4Dwp770O5A=; b=RXBeqvCUkY0/kJ11y2/f2uS8GamM/Sh4xMMADFBjQxIC9SeBn1hGFdLd5DDDdNYIK4eSdQgbVbjk4qVbB6VlEcLJCZ1toChggIAF0cg2AvIxT4v1BHFWbM7pZzK4ZISOqpVxKgOViigKO+PhBhEMMeAGCvEqnF77qox6JohdLMVSVFMRuo2kYZp7pJN+DfNedBZEAjimHYRFE2MIl1Kw2j7dSelVi4M7CAtlozRS5i0KAc87VnRFFUQsP41tFjJZYXpoILDGQckl8YSQtdoL/KEJEkFiZcYNTUNfSNz84k9aEb1C77ScGc6AtljIYEsL432m2rlTJAwujOwQz9Dq+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by LV3PR11MB8483.namprd11.prod.outlook.com (2603:10b6:408:1b0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.14; Fri, 5 Jan 2024 10:13:43 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::f105:47dd:6794:6821]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::f105:47dd:6794:6821%4]) with mapi id 15.20.7159.015; Fri, 5 Jan 2024 10:13:43 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , Subject: [PATCH v4 3/6] drm/tests: managed: Remove the waitqueue usage Date: Fri, 5 Jan 2024 11:13:21 +0100 Message-ID: <20240105101324.26811-4-michal.winiarski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240105101324.26811-1-michal.winiarski@intel.com> References: <20240105101324.26811-1-michal.winiarski@intel.com> X-ClientProxiedBy: FR0P281CA0103.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::16) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|LV3PR11MB8483:EE_ X-MS-Office365-Filtering-Correlation-Id: 0896ec80-533b-401d-b573-08dc0dd6fecb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: orZQMHt4uMgHSG8qg1u35snUFrWwkAd+T97A3XDZrpOi0z+wavD/4LRAbs0EjaF9gZu4KqzOPT3VeKNxyJPm8GcoPD8+yt2ygFxUPkA0qEqQpFY3d478aXE12ugs9okIzxUHmq+edCYqGPLlgzL8Kskhtq7h3OxIya4kY1S5LY9hnPQCeqr0e1YmJCLIhsF0BBwC0MBgXSnNpaEwZhkCAVMV4ueKJmnFF34ogCJsjgI6vkmukoT5xwPq13HnVNwT/Nk3gomiCEQC0mcjaP6Gz01oxIFG/l4kIAZwCLBlMETAZFH68ezHA5ugqZod6BlbgvxfC47uC5nlmvBxmJTntquQF9lcx5Cj0Pg29HV1a39Ss2wjk6AtBAJhZqh4/W53xqtrWI5vVnoJXGRXoH+f3gnUFiUrgf9nBkELyvSgI0Ha+pp0bCXaNrL+7r5cvBXVqnQaj2JVC0gSfnORdOEgvm2DA0k1B8J5EjRiJEfdEfkL4FE2plpKHYxjvjB8YpbDdrkKtrTs8whZBnk1Ffu5PWAvyZpnXspjKU1MhmNJGnKUUzHf641oUNS1S0VVj+1A X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376002)(136003)(396003)(366004)(346002)(39860400002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(6506007)(6512007)(6666004)(66476007)(478600001)(66556008)(66946007)(8676002)(8936002)(316002)(54906003)(2906002)(6486002)(26005)(1076003)(83380400001)(2616005)(41300700001)(5660300002)(7416002)(4326008)(36756003)(38100700002)(82960400001)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?hgJzrUjAtHFq6LORZp/MvIFiz3Lt?= =?utf-8?q?6eOknGFI40MPxkymWwmBDd8jHDNk9i2Z0fpozNoxVIAFze2i4A6EXOXmni8kxqQUW?= =?utf-8?q?220s1zSbmnLRzUy1A417gO/3L0ev3Xn3Ol6tTHVZDiqnaxyVnOVE8LMUuFm0hW2t6?= =?utf-8?q?8hRkcL7TNqDZKJdz06/oYO5hpoisKApXEP3bpyb1XCSP3u7Lm7OdY2RYEBl8qHoj5?= =?utf-8?q?RrX54qrFfiNfd2Zz8/o/Ok6BH3uX3ETUFPLIvov/idyr5DY60jEzQJOxHkeF/pFEf?= =?utf-8?q?Ic92IvTZEr6oQKQTA6s76IeLZbA/YxRxLxoGnHdEjMtCzEAQtV0uLtb3iTCjUDrcM?= =?utf-8?q?RP8CDqFXf/M4s91rDsGZUQfIIr7XQDnFobUD9HsKTHNxaes9/Qhepx99OOY0d7Yd4?= =?utf-8?q?gzYamKnRZWfKmJgeE4rAaq/eiTIbLZ7bCmT4hSI1D4wvgfjp33jmOb3e4pJ/abQ9c?= =?utf-8?q?X46Gr9LGGupV0bvF8eouOCwvd6smkWTuMXWY/4N1t9onkvWkB1cIWd0+PDcSwoaac?= =?utf-8?q?0MtmJhuJu5nhfk0hcrUFDwFHKWSueQ53b3xfR4Wnlbs5+vUWmT1Y2u4W5FUWYabXt?= =?utf-8?q?jd0ftcE+SR6NZ89vhFfZwMQKhn4azt95878oflbgjHv1n6fDiPA65QktKcFCSI16l?= =?utf-8?q?YTmodlLP2LXQMCWvNNE8xnCs/1KNM8I7Yoark1F/rmMsK03DqKoEMm4p7JjWH8/Wj?= =?utf-8?q?RutM576roxnFbW4kLMhBd/liqRr349OYfCDwYLrXUBrDtXy+h+N7THI14D7KSJ6aD?= =?utf-8?q?98O+/IRLfUOF+eqKcfpuVgK3UpcJxZUMbbUOh5aAMLpgcU+RMkOVkSsD2KosUVRyM?= =?utf-8?q?e03XsXJmL/RUHqNB/dJaJ+CCNGJwfUSd/mjBwwsV5hqOBiVb8W0TVnLIwhQxzJG4B?= =?utf-8?q?u1s8r2LkEInWa+dELikxtlrAnaN93+rEZmlqBBFGT4XCU9ss4s7jjghTHzB2GchQB?= =?utf-8?q?ZOF+nu0jXB2tKzNKBLMvclsXQeYn0pthL6K+cDoPlAJHJNb0M7y8ermTNawl8F7jC?= =?utf-8?q?gyBqmWkOj1kxnHlyh4575SENE9rr4OW8Exb2iPJXfdts8V9022Vwv3RZqR1zAcBWn?= =?utf-8?q?5xmIZDQEuXaZ6Xm2f6Yh9dglHB+LJGDgTiCOwoDpm48QK1B3Zyb630T9kUjMlW+r1?= =?utf-8?q?Wi9NtJa1aJFxodxwauPgGEW0fShNZwCKGaGVD2pi8ZtrQjsnwCVHOosus7NPXgJq5?= =?utf-8?q?qAcI2CaIvAuDXMQinyjE4lzGNKFRPxnzPb5jAvyMqrEfUmHX8FnkXZ4G/ihy647pi?= =?utf-8?q?HdDOL5F0XWNG52zHRtNRtiAZZRolM2mdUsGefBVNr832OOrv40aYftN8lrUPiQ4aq?= =?utf-8?q?C+z1pk5B+OraLmtVU4msN7Uf1fmoUG3V2MvpvM7cQmEGZc0HoRBChKbiFR9YF3pP6?= =?utf-8?q?9HW84xLIME0Hj5V7wSsm5J33vGoOYgDMeXVOpugc2OUbJspdfMkWNxYYyAQF8AEaG?= =?utf-8?q?qVzoM1G2fXSLpQ8FXDl5yaRSBm+3hgKlZkIL1CPFUPtheBSAbJ5D+akDir7Z4lT1d?= =?utf-8?q?5w6qKfgyFM1VOPzuL63AiY5taYsBvtjaLw=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 0896ec80-533b-401d-b573-08dc0dd6fecb X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 10:13:43.0143 (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: ayNhrgxH4BaZUeaSsFXfdJ04DiCoQDiwYbMFuarJXzR3PAvPOCZpCBaT7XDfL20Um9Kaq5uOjS7sKki4ZvWutlKFcBPbAmolujzXiL5/+EM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR11MB8483 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Micha=C5=82_Winiarski?= , =?utf-8?q?Ma=C3=ADra_Canal?= , Javier Martinez Canillas , Maxime Ripard , Thomas Zimmermann , Rodrigo Vivi , Michal Wajdeczko Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" DRM managed release (drm_managed_release) is called as part of devres release (devres_release_all), which is not async. The release action should have already been executed once drm_kunit_helper_free_device exits, meaning that there's no need to use a waitqueue - we can just inspect the "action_done" state directly. Signed-off-by: Michał Winiarski --- drivers/gpu/drm/tests/drm_managed_test.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c index 659af5abb8014..e4790ae838ba7 100644 --- a/drivers/gpu/drm/tests/drm_managed_test.c +++ b/drivers/gpu/drm/tests/drm_managed_test.c @@ -8,12 +8,8 @@ #include -/* Ought to be enough for anybody */ -#define TEST_TIMEOUT_MS 100 - struct managed_test_priv { bool action_done; - wait_queue_head_t action_wq; }; static void drm_action(struct drm_device *drm, void *ptr) @@ -21,7 +17,6 @@ static void drm_action(struct drm_device *drm, void *ptr) struct managed_test_priv *priv = ptr; priv->action_done = true; - wake_up_interruptible(&priv->action_wq); } static void drm_test_managed_run_action(struct kunit *test) @@ -33,7 +28,6 @@ static void drm_test_managed_run_action(struct kunit *test) priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); - init_waitqueue_head(&priv->action_wq); dev = drm_kunit_helper_alloc_device(test); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); @@ -50,9 +44,7 @@ static void drm_test_managed_run_action(struct kunit *test) drm_dev_unregister(drm); drm_kunit_helper_free_device(test, 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_TRUE(test, priv->action_done); } static struct kunit_case drm_managed_tests[] = {