From patchwork Thu Jan 25 18:10:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10184595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1F6A360383 for ; Thu, 25 Jan 2018 18:11:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F4DB28AF7 for ; Thu, 25 Jan 2018 18:11:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 039A428B09; Thu, 25 Jan 2018 18:11:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 579D028AF7 for ; Thu, 25 Jan 2018 18:11:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 32E9E6E547; Thu, 25 Jan 2018 18:11:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0052.outbound.protection.outlook.com [104.47.34.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F0346E547; Thu, 25 Jan 2018 18:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=96B5xBedi81L6DpTXQViRdNkwPm5w3wEfImG5gsE2wg=; b=1MMoam0DBY/PYt7xqyTmoem2QCdrDr/qKIp8QM7SHRarkXnrZf1f1dYnd+1dA5iyl9nz5TVK8iJY6H/tCvCfjt+CTBoXbYX+bYwQolj+bEocKaa0Ad3MPn1FTIXHhXXQxMWCMpBfxqaVJFKY/YtH8kNVmK8bN201oIv4xjswXPA= Received: from CY1PR12CA0073.namprd12.prod.outlook.com (10.163.230.41) by CY4PR12MB1272.namprd12.prod.outlook.com (10.168.167.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Thu, 25 Jan 2018 18:11:14 +0000 Received: from CO1NAM03FT043.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::208) by CY1PR12CA0073.outlook.office365.com (2a01:111:e400:c42b::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.444.14 via Frontend Transport; Thu, 25 Jan 2018 18:11:14 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT043.mail.protection.outlook.com (10.152.81.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.444.13 via Frontend Transport; Thu, 25 Jan 2018 18:11:13 +0000 Received: from ubuntu-1604-test.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.361.1; Thu, 25 Jan 2018 12:11:10 -0600 From: Andrey Grodzovsky To: , Subject: [PATCH libdrm 1/2] amdgpu: Update deadlock test to not assert on -ECANCELED Date: Thu, 25 Jan 2018 13:10:58 -0500 Message-ID: <1516903859-3679-1-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(396003)(39380400002)(376002)(39860400002)(2980300002)(428003)(189003)(199004)(68736007)(356003)(50226002)(305945005)(2906002)(5660300001)(81156014)(81166006)(47776003)(6666003)(8676002)(8936002)(59450400001)(36756003)(104016004)(86362001)(7696005)(51416003)(105586002)(106466001)(53416004)(97736004)(478600001)(72206003)(26005)(4326008)(77096007)(450100002)(316002)(336011)(16586007)(110136005)(54906003)(186003)(48376002)(53936002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1272; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT043; 1:yIyQ2kvk1SO6jPc0EVTmvMQrJztQ/ssOSr/dLTn5GQn2kHKVtJuMfvDj3fqOpmxuIAufoVfAKVtBBqbJA3kxG3qWbBaAQHayihHP+dI96cw6KnBlU5ymkzWb1c99Unkk X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 046aadaa-e421-49af-1056-08d5641f04fb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:CY4PR12MB1272; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1272; 3:S7gtKOqUun9tp82XcTAbqburZcH4stk0TV+a/E8pEZjvsBqEFIxk5wjONJ70mSjR86HYonbCPoVjj8Ud3NzD2KyuKwIN21MWyuvLXq7i+v/fuRNvT5+prRZE4vNEbsBK56EiRAJtNJl3jDqJFSqeoDnW5LAmrHthY9B9sxjaPyxULslLs2gIWAhisZIt3D74RqiT9gcwAixQjBprbddo5SuME/OYBKoQOEJmjne8/3CKk9Z7Ia1CVgR8ovPcx+7xK2rgyVE4z/OlPi8AIfn8s5TNLCso8VQHNTE7JfXawJRoXSTN3Wsq974TVvfTbyvcbvVHJVsk+n59sPlvF4NfjcR5BjmS2ekdCoflFKMaczc=; 25:YOM+CXf/U51PDthqFZ3o0SBHLfovEXKsBeZ0SZBbHx0HJFhgKJHBTKgRN2qHl6XX4SYHt84Tl9lmXpaaSkLJGsnM8bt1dNVgLxOgUrnI84uNSszDgwssWtyFNrJvK6oMZ3UQRrCmPSYo5peB6HA5rdO3ON17Jk5uv6Etf5vbI3USbXl82L7YOAHyi5zuTxbiz6HaDgBjOSbH+J5u4GZLheRmYI4iK0sPtRbCRSkIDqLGpRgBGn+MuqcTWGIyfWXhtiaX0iksmwSdoYCin8fZzE5R27dd0yUTjuL4iAKN0dOyXffVpfOO/Iu24cl5PkIT9ELbL3b2BciRy6rDfS/l3w== X-MS-TrafficTypeDiagnostic: CY4PR12MB1272: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1272; 31:1EhJ31g2MRd2CU+Xqa7rPhLPgvTUH7f3r1wtGdyPCzYyVLmVgPPXXv3SeSfes0UICCIAgeM7VAgBarb5K2lJxpR4+771eN0SZk4Z7uNWTPAab/NxqoMfIa9wuHbmhrv8iXN2UCbvUI/d3m4u7ln8Un0+4E8yeACUl9byUzD4PonzcfYDxZ8BGaXxACMhWLR6w2zo13ERFmjALVuW5HNm26JMuYbYL4F3v8s69EbmA1E=; 20:4REP+D9zrCTs/9+uAbP475eJzIcfYPp1CEShEta+upWfC+XTuH537UxHT7M7X2EfNdhh0mX1x/L5yp/yJwX8/Ql1qF5L2B86trgYn6WcHCQtEIKqVvkDSvUvUKnYPeT41SguwS+j60HLtO3fPwirTh9SswrP+t/EKNfA3BId2Id8CGS3TwvHUo+RRZ4h+dhlwFLHJvxaVy8sB5NAMIiPyknk4/OmJH/BYvGrTeSXjBb6MGgYzKkB9kzbVnsb06b5T+4IVlTU1s1g8vO+5qM2RFTFopJ+0rNsirrSS6BYOuavggXMeW1Mw7JB8LI0zL3VL6imNPb3017+MbxsvUVV1bf89xqBEg/4Ha6RnBy9COlCeqwWdDoVAWkC9cPSFyPY4C85W+e6Kj7qW+XsXaS4IbjWQR1JRB6ft6lEPUSf5EzvhVMDkJWanAuyY4yhI9aY2VEpBTml+yiZe9CotT3i5sv76xOkK5nb9z9v2nD3VwRWGM1LZeE1Oci+1XHJ56Rs X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3231023)(2400081)(944501161)(3002001)(93006095)(93003095)(10201501046)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:CY4PR12MB1272; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1272; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1272; 4:+ZMTTHPDY9bsI13sYHpJrDFXrj6zNxW7Mn4vvbPUumIcms1BMsc1DPff6maOVDiFFZZNZADcbL8aK1t92GpbMzDWNSex6v1KPpEfrY+HNiixIg2iF24SQijnfmMVz5eXqYnQbWKjVo+qg3iD6xpbN+6D2pnU0lFcfjsQyoxx8kr/KurqZ7GN8yjyMx9Gq9quIjhtTTYEaiytDQa1QR3P4t5EiWj8P26FjuTtcCcJfBI5sZ9AM5Hq6pP7532/HdyJudIyDM4gTufdm8h9jOFViDiebLxAwhcV5DDU+15puT3F/GwkiPvI0vDG0Tr4a5Gy X-Forefront-PRVS: 0563F2E8B7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1272; 23:rbTD87XB1IYz4Ra9TEAezNYezxhcFwsNF9kRgTUNZ?= =?us-ascii?Q?EhhgIhpPNZrKZAabAnv6pKymMPljDfvlh6RvctgIf9Ercl2o9x25Qw2PzP4U?= =?us-ascii?Q?/0FzQLCPC7s6UOg9CrxioffZbs1jCS0Y0teT/eM0VfkvxRKINq5TzAFGzJVn?= =?us-ascii?Q?gyoVLjFjI66S60kwM64scfMHKpfFUphli0x5nNhVmqOBs3kn+jYsKFHKbSqA?= =?us-ascii?Q?7EnK6a9qa27ObecOqPECh3S3ckeSD0tmZzUbTxmppJ1Y2/4qm7m8/vzRFtI0?= =?us-ascii?Q?B/nSxdn9ffHdeGQCW+tJvW0C7zVR9zxRSafU+nJK12A06rWgOrMLhF47xpKL?= =?us-ascii?Q?l14fO4N2pbUeDs9HEXXXi/NS8wA2381gAhrkM4N9b0ebU8iLc9rbapCCUC1C?= =?us-ascii?Q?p2dQFtXMFqMnJqiac2o3tHALGkjVjzXEzM+DKmB9G9y3h2jGi/+F3XuFiByg?= =?us-ascii?Q?PwqLLmEJdmAhgowpkfJRqubBejGNlHhzipoPs2gLuaB9acIgKWMspoZHO8nq?= =?us-ascii?Q?o+t4kgmAoGVvOqQ2Cai+Wgmm7+hFzHFeprNmsqK4A1I9dfbSvQKP4gqQY7Y7?= =?us-ascii?Q?iJKd/HaHV8s89fQ3kgp/XZczKv9ZO/dU9uk2M/YY7HEaGkGUQy9TlqiojLn9?= =?us-ascii?Q?x29xYOx4vscT5Q/sWQIPZyBRoEl4enazAPOX8iH+IZSUb3RL6SwJ3Yi7YGep?= =?us-ascii?Q?heBuB4XiawKwsOB+qfAFKcM+prNikWD0rSDMxINja8GDYANuGfobLhwAVbpe?= =?us-ascii?Q?IJ+a1hJSnZclat5NGO9MoOyN70rfXFfwaFmXNeIuJM1jfX8Eu79tjqEV53o7?= =?us-ascii?Q?kKvtsF6qdtJa47gvrVtGIccXewfsC8YTvsHiUtsGsXn7Gy2NChLsBkkQK49E?= =?us-ascii?Q?SVObKkizKHaPwZ4Sm13AFNGQogn0DpQPGBI7X2CAk+yGNSyMr37pw5zYPK0x?= =?us-ascii?Q?zFDZ6wAsAV3ICU92vOKYx7rlAW7xmAyAcXPBWBELE2m4w86lnObUi456f57q?= =?us-ascii?Q?rxz62ieKgwrO3esbgCl2RioNiFJPW1jNlQOPp55+PyiJMSkh/5MlCE5DBheU?= =?us-ascii?Q?AcoZ5qWDENPrGBgz4mJR3FGmgAE?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1272; 6:hEoMfRKJooRooMFvV4FfzgjUbHR2luO96P7jW415HgiLVMoncWPfJkrOiSvpfo3ee7rkwmJeJW1zIjBBXlR/IhPn6nGH0OXToEqkC4Q6Re2ktaQ0NMMGkcrL4eVDmXTCmX54dulHqNXO/vGg8jFQDOYhjT7AawevfkJImBS5ehCezkeEJ4a7BoHzsIY/YAj7L5C/GLRi5uVh8w6j+Tf9w3qx4GsdcBCRzMEdW/mGJ/M6QdNwS9kP3H8guwgeIrEoRvwCS96io1XDRMht8Yu2XeYSo93Ac0EiH1zo5MMcQ4Av3A6ts+7fNYnI2F353MgckLB6japIxcx823v3PlqYeWlb6pu3uNHZkkxazk5JtPQ=; 5:mcieZmi35ddE/9Kzxq5R67Wq2DIgZR6yoxW9BLncoKfWLxfTrx9U3fyzsZiixoazHKwCb2NOjEkiYz+49Ncz0an8JbMGS2o77pfwGeSn1UvYmxpiQI2H3v9eJtD6zDm6fPMshXxRPtVZUZk/+qjYUKUQtt4KuqRNQELEp9OkPAk=; 24:/moeKZ1ud584YaJ6QAtARFbandn6wU/aASFget644GzgSRmGgBn4X4ezqRiEX7nMvMbPrbDqHxE35PzIjjCD1A/b0ewFKvd0Hzq/mNpFTh4=; 7:qSKQRgGegrZPbqANpoi8/I/41pbwK43+nLCHQIuyINVb6Z05aJy2ctntGURLZrXAIidGgBpZfAfrAnK0hjMyEWHS4g8AJvzPLH2LmsZc94KB6XaSGqnjsuqZh0Rb3kJgPc8wAeJ9t2YxgpwGqmGpyiQKzmS38bJ6p93gPH2xk7ycKjQjfea9kYuO292+uMz3GOye8450lES18tjd+eG2guIRjcwEz7a8iOxYPHDk5of7Ol5iDph1ggv4+skbmARv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1272; 20:l9fOYPLoK/f4+U+8fEM5e1PwD0J5yndeswwUJ/zgNDZSkIOiGTko/3+EkLEX5DTxGZUdAPmxlkkwiso8SfQPRo1ix5xfCJoBMd44GmJBvqkamjb71GUvKFcWuThmzSDON79xHlNvj28eqAyfZ0J9RYzSCmo+zZvQ9A9BEuM8w2/ri9LcjQdXDpARTxNgL4KKUwyTFYUSLhfGUq9r9pV4F1kYoAhphUlw/7PQpO85yuIv9evjKK53pfoEg8pSi+LR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2018 18:11:13.1244 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 046aadaa-e421-49af-1056-08d5641f04fb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1272 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Kernel will abort jobs for guilty (causing GPU hang) context with -ECANCELED don't assert if that the case. Signed-off-by: Andrey Grodzovsky Acked-by: Christian König --- tests/amdgpu/deadlock_tests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c index cd34cdf..9a42885 100644 --- a/tests/amdgpu/deadlock_tests.c +++ b/tests/amdgpu/deadlock_tests.c @@ -230,7 +230,7 @@ static void amdgpu_deadlock_helper(unsigned ip_type) for (i = 0; i < 200; i++) { r = amdgpu_cs_submit(context_handle, 0,&ibs_request, 1); - CU_ASSERT_EQUAL(r, 0); + CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1); } @@ -243,7 +243,7 @@ static void amdgpu_deadlock_helper(unsigned ip_type) r = amdgpu_cs_query_fence_status(&fence_status, AMDGPU_TIMEOUT_INFINITE,0, &expired); - CU_ASSERT_EQUAL(r, 0); + CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1); r = amdgpu_bo_list_destroy(bo_list); CU_ASSERT_EQUAL(r, 0);