From patchwork Fri Oct 19 10:26:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10648957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F45E109C for ; Fri, 19 Oct 2018 10:26:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DA50289B8 for ; Fri, 19 Oct 2018 10:26:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FDAE289BE; Fri, 19 Oct 2018 10:26:53 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 C71DD289B8 for ; Fri, 19 Oct 2018 10:26:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD4F46E01B; Fri, 19 Oct 2018 10:26:51 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720059.outbound.protection.outlook.com [40.107.72.59]) by gabe.freedesktop.org (Postfix) with ESMTPS id 406516E01B for ; Fri, 19 Oct 2018 10:26:50 +0000 (UTC) Received: from DM3PR12CA0068.namprd12.prod.outlook.com (2603:10b6:0:57::12) by BN4PR12MB0740.namprd12.prod.outlook.com (2a01:111:e400:59bc::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.29; Fri, 19 Oct 2018 10:26:48 +0000 Received: from CO1NAM03FT042.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::206) by DM3PR12CA0068.outlook.office365.com (2603:10b6:0:57::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.25 via Frontend Transport; Fri, 19 Oct 2018 10:26:48 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT042.mail.protection.outlook.com (10.152.81.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1250.12 via Frontend Transport; Fri, 19 Oct 2018 10:26:47 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Fri, 19 Oct 2018 05:26:46 -0500 From: Chunming Zhou To: Subject: [PATCH] drm: fix deadlock of syncobj Date: Fri, 19 Oct 2018 18:26:41 +0800 Message-ID: <20181019102641.3574-1-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 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)(376002)(346002)(39850400004)(396003)(136003)(2980300002)(428003)(199004)(189003)(1857600001)(8936002)(316002)(104016004)(5820100001)(1076002)(186003)(81156014)(81166006)(26005)(50226002)(23676004)(77096007)(7696005)(8676002)(4326008)(68736007)(478600001)(6916009)(53936002)(36756003)(5660300001)(50466002)(2870700001)(305945005)(2351001)(105586002)(47776003)(106466001)(54906003)(72206003)(53416004)(426003)(66574009)(6666004)(476003)(126002)(486006)(14444005)(86362001)(2616005)(97736004)(2906002)(336012)(356004); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR12MB0740; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT042; 1:r/DId1YX/4+IjHvuVmQt4MYMip+ZPMpa6BYhkWZEhSPiKaI0V2alyDVTzPCrRC+uJKbhxnp+ogAZlNTJ2HyuN31oyeKL3h8kmvbFEfm6MkNn+Xo4mpy31Mjt3eA+4gRO X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 98919831-f9df-4783-d859-08d635ad6022 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:BN4PR12MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0740; 3:1eDpyHlQJ0Ef4UQZFQFXpmhqVq7dMPyy+JpJc/EU5FWOU6Oe3cWzCPkTyxF6uOyyS2KHxT98+0kJIvqgrET6iiTUki9ByAyaHUfUCswcklNVY5sBMUrp9Z46zE7Q8pV/wnF0qadjS89UoaUtaZNUlv4GA22jIJG/jDOkHzbtqt+A9+RHY7wljSiUAdnFgBlSMIOTh0g+3VIJMqoJncsUukPICTWaHp0mTDVseYYVbQ6oE+kW5iszmD6pbGbhDY18yeLvTvb4iiilZMJ7urus3LJcYENhaswXt+J5YlIAx+7N4PYjKMQk9dMh7339PxzU2283esK2+qE2CUYkPHpYxcswgWQPmSHGNZWjb4LZe5o=; 25:GcXASTl16RG7KEIyjs2xYTDo695iutBxseebiVbN1mCpplxHyE7PaFoSmUW2BPz6Su3voFiCmveUvYjZQUXfuSty35N9cGJpim7o0h6hcADIKHiN4KWS0+dZvwcgdkkOwgbCgLKIBT25mIzE8N53BpvHROeaNdO+tD+uz6/T7573z68T3hbSIAeoQJbwUmiPJwm1VOE5ACMwKM7xdyoTYTVwaLFB5IN+LfFiHPqzTcwG98hnDA52MOnHTM1o7n/mMAa+p/4jS99YUe5X+rjW0KuYJKkAxvBbU5PexOYC/POzHJ4gOYaH0gB1ZQy90vS9TgrL/y7B/9/fVePIxpc7AuCBtmAH/t2C6YKi5ForMZY= X-MS-TrafficTypeDiagnostic: BN4PR12MB0740: X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0740; 31:oahMnBcnTyQHt5vRKsdBF1kXP46gVKSVWdS1WDMl5fpXmlLjCem6CO2v7vup2+AcEgkhGoIeF7T2Z5Sip1hzVc4EA1edZAWMk72nR5oMv3c8DnN05EY3Jj5Ft+kDn5jXLlP5eodfFI5Gg5nQ0PxC4GmxaPlDh/CWq3loBQVyttsKlVTP+NfP5iCwscS0ze1/1Q6HG7iGq03SaNXR/F1F8KSDKo31p6mtD7TROg9J+yA=; 20:JNm5vfZCXfIiaddRBiDi9UFi15y4B84+NKuUZ/Z8yGAIW0K/qgmbXjOdlaFKzH9xsxqdouVXUbfajoHANBKm6EzKAu6bYEJi/aYwN7ZtrSbN1cINuFtfQGirZ+3RMnlgMB4ajtm7bNh08PIKygDmxz+Y9lb5wSeIsOL9FN+ZLyOXeL4ybHzEEOwvEgNzMERpCNeVqqPWKOwI4n6ON/V5FKL6x9NDp28rdefcDMyWkya8Dx4glfdmP6AshZ87R1L3apCyefmNKE+J3P1zMlaSLCJUgN6NDfg27F/SaWRD9qR3WrWYA/oftHZHT0FYW8zsOdHL8sqqyvNVD0TpjIszJhfNGKXi4W20scYRGIIu/aRnQle9TLxLOCx7ykIyKGSNxT2paihzDQK9EG1Q0jQM1kkbJvd9Cm6KvsbAMwZwR0OzWv14yN+hNn54ecQJk1NfGfhD5YUyrt+hK2hPtSjDc237cZETfCTPoxnM8GbTaqO/PkBAFTuDitfdRB3VhoD3 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(93006095)(93003095)(3002001)(10201501046)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:BN4PR12MB0740; BCL:0; PCL:0; RULEID:; SRVR:BN4PR12MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0740; 4:MqNtXQBsH/mv6sMNCbL0aJh9JaLnh/qALW2Rd3Ijte1WC5aIyMARv7byayU71LhE6PF0elTRTnmFkcCHzzzuKMs7sEI815QcxcIdmtEVxuZg3Jzlv+RhD/nc2PuGNwQfIuD8nfFexzKcOm532e5vbxr1q1fSrV4/zk9F7dmnLfejfetJU+BXqE6pvAqjmKD4z3Y4/ZMrGuDnPO608sEz6LznZa9ktIPIoZU/gRW+FCLhbnJBJ7LJ07L0uCixRPqNY4X+jE1in30r915dh3lNgyGwTSKWDO7mnZKY1qAcE2iFP9j+/TgS//ZCX/Lhg+iB X-Forefront-PRVS: 0830866D19 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN4PR12MB0740=3B23=3A8batgNp?= =?utf-8?q?aZeG6kxaQwxXk/SA63Hy0deHRWcs/NhosIfIrp/YLTRthSdVEJTd8QkMFRT0u9uHx?= =?utf-8?q?jNpByknStzAaczZWp0nK6cWY1yh9Rai2PT4OtTo1p/NH4KyEIcad5nCpPt2xZq2LP?= =?utf-8?q?2c8Ykyto0IfTu5igVg3FoRtGfhWueBCgcodW/ct3UXcbZwaWWOMJqv8dwuYdm8k4w?= =?utf-8?q?/7XBvdOXc+yotYy8sq7XarT9lLEoIzhz3S+QmUsFuPF9XghDhAKxUyLTvrodoa4JR?= =?utf-8?q?Z9yaZUHRDcGwaZPb41FJT14tx3S2Jq15qnXre9ZXtK2VDYiE/E/X70QSt87MUBbyh?= =?utf-8?q?1W9f7qJcohrwR08IWuLdqYFycbqh9c8WMmFsMTiIFMU2ak4nZAOpPr5JZ1gDCLcMK?= =?utf-8?q?vhPgx3gNQj9hxWaoHL/a24iNroa6gmS1XsELXVpTsUN/7/xZocwFLTn5UGtO3jBE/?= =?utf-8?q?FIO2TKZ8cxjnnBQq2DQ44TY+YFKrqxKpldnAYULEHF6xAO7WcbU+Yl9P/RHhOtwYt?= =?utf-8?q?DIkvhegYqcGTT9V9wEtmcq/yfktuIUSHuucOyU5CcMgJ1jFf4Kv6h8oSYyLCMYqIg?= =?utf-8?q?UsYooc05qkRoJnhL2sRPyc0oBRxUYxA5peH58uC0udn7pGtqZGBEHinS2GQre88cu?= =?utf-8?q?8qpzp5XxI06Ac/9npLy2H6WPyef1LEB7R4/BamRB7uxfjT6c1RaT3Dqp9JIdOnt5p?= =?utf-8?q?oiUSwZU09g84dIflzBOxY5tRTAJyg5riUbDUq1fQhDvVqjivlY+jISjnI8rm+3qRt?= =?utf-8?q?tAveZvsnLnFzxA1icNzF4t0eDJDkxOxpbAkCyaF7xWAw4UcBoZxRolxo56GTJJYFu?= =?utf-8?q?NcWVP8vrPUaZy3Zwg90L4GOLKkDGNyEWnGy66h/YwZxu34ntnqb+/efEbKcUjzfwr?= =?utf-8?q?+8mcCmyhb4Mshh44Q6mAnjyZ254Fucdq2mV4rf9lPEzikzGGQ8BGpAy9qJhgyoeFH?= =?utf-8?q?1ZucdMAqPF8yIX6za68URXh2XuO9Q+u5ZOhEHCV8pk8IQK4esG8tbXwjgHAskPALf?= =?utf-8?q?cRdDu2s1Ci/8ndtGWbd1BUcL+DeDwbGVKjrOwH+yRx8rtMPocYHSmFcKTu51Obc/5?= =?utf-8?q?yGq3ErkhcpYyBFA4OpeSYVaanP0z6LGAhE/JkdbaExMsuJ3gmM4jgQ5ai+etjii3v?= =?utf-8?q?AsvVQpSNUlAtQgplI7KNF1P39MXKcTysu5rLLpp?= X-Microsoft-Antispam-Message-Info: U08Wft7J7LE/MCL/4ix+I7wq66H4PqkzjiXTAmtBNIg3dA0zcvE2jq2z6gx0rwsby3iheuXgw6y84vioyUDk5lKhHd9BoTCt+Hctts2Iv3jvixJrRDiz2O2lDMuVsCJ5gzbQ/TIH5V9eopRGd8tMDXvs4KFLQNelJjMDdrJALQVbveDJec6A2LDHbIkWMSF/LGlsZ8cCmaGicNKQFPgAjnj7gpgKbATt5A1enl/258kNPcFZarLEg5toG8vzbTGedGk4xy7Z0wkrgGrwrJ8Hw2f4UQJEhxBulx+Fp8YZDWU6b3H77LvZBcu7ifU5rSqDtZFZKAkIAL+i33j5eXOfDxBMpaEbyP0NUP85qJxWuWo= X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0740; 6:mRSgNfOQ+4EE5CcVIPcUkA6tXl96HJxc9Z/UewQs2RRtBQwOxymUrRZkFvxTq1bDTj+aneG+eQJfcq91Ob0Z9CGa7vqfK3I3oIQcnLsbtMDn9SbgjMyH1aG8i+eEa2xK6dnkYG6kcHzEtWdGEVFiE3JyflqTTX0bVte33Gl76FqYzxrtIkuTdnKFoOuNdX5l+QzlJN0CYYNv5XpigWojsexeUmB4TnjfyMQHJi6KXIB9YfgH7HAAX1bEk4IKC+fpeXwXq5UsN5/8Afl28IMFha0IQ/cpPGM1zZmcX36Gz4HzFfchR0t6Jx/sJacI52+BOTh9rEnYKGb7Z/C5XNT2BP/ju3c4bJ31qH4fApIoKdf/LHdehvV9JGk4MjdjZHgxw4MS2pFiQdB8wQ6BIp5IeKCSf6k+M3p+5YfSKe+23S3S808HaWBBp31JKxPCzqavGm20Z+ZJhRqH80NbHvlw9Q==; 5:6ULP36Swpg37VEKUPEi4hRGxYbVFEJauMUHphpcZPE0fBJWAo4RlMjbkqg+EEgRrf1RE9/n0qjVKg9Jry2RkEEppqrSNN8p3sVgUvQWX1T5lmPct2GoT6Ekld6Xdv4S1Ktlvu2cm2+/sariD0atRlUWOTEk/+ciS5wgT4DASitc=; 7:HyENPnweKop+YWe6oA/EoeRzV/Lrl7Cxe41D8jdhaH8DZuVDPg4YzJ+zgleORKTN+lfulpx0CdreRjJhGshRG0U+vekGBkhAqjc+sMSiK7AY8cED2qqjWmuaBf488ZYSD6WBCn+PVF2ELpazRz2t8KCX6VCLOeJEJzU1FAA/UrTPgkPq1s+ehgDvWVUr7sRDZVdsLoz8G7illrJM0GfOwjwzI7FY5Mh5USctFITu4yZ4Rp0qEe+J5jlTvLEWGx/x SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0740; 20:d/3ajaknSI7IXiUot1iIbvgitVR9Kh4b33E0E4jqyiDjiVzLGdQUMvN/b6Gc9WMOQvL0JzLx8FVML+BGXEx9qbhxHXlsF2bjVXWRou7Fy9fLhQEyHStUgQuO3P/C7wJ1IZURtnvTcjji5r9uMJYwd256Sqaaij/DgrApyzuNZ+Jl42rIWfKSaJaZZFv/fy/jAHV/0fRBL3BBKpeJwonRP5iVTMNcSB7N8HmKLaiFwYyDE8k1j++Ua+WiPi5TCs6b X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2018 10:26:47.5826 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98919831-f9df-4783-d859-08d635ad6022 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: BN4PR12MB0740 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: =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chunming Zhou Cc: Daniel Vetter Cc: Chris Wilson Cc: Christian König --- drivers/gpu/drm/drm_syncobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 57bf6006394d..2f3c14cb5156 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -344,13 +344,16 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, drm_syncobj_create_signal_pt(syncobj, fence, pt_value); if (fence) { struct drm_syncobj_cb *cur, *tmp; + struct list_head cb_list; + INIT_LIST_HEAD(&cb_list); spin_lock(&syncobj->lock); - list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) { + list_splice_init(&syncobj->cb_list, &cb_list); + spin_unlock(&syncobj->lock); + list_for_each_entry_safe(cur, tmp, &cb_list, node) { list_del_init(&cur->node); cur->func(syncobj, cur); } - spin_unlock(&syncobj->lock); } } EXPORT_SYMBOL(drm_syncobj_replace_fence);