Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2365802iof; Wed, 8 Jun 2022 03:30:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0JAtSBlDuFlWlIz7k95YA13iznGKx8o8gCVvRzDqDtdAhJx1B/03uH3a4DsYcpi+mEzU2 X-Received: by 2002:a17:90a:780d:b0:1df:959:235a with SMTP id w13-20020a17090a780d00b001df0959235amr37091145pjk.92.1654684221407; Wed, 08 Jun 2022 03:30:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654684221; cv=none; d=google.com; s=arc-20160816; b=QEMGR6GiK3SPtwaGkElZqTu+wmO6s6uC0PnZavFt9XgQryMCMzj9X+IgKraJUKpI1o LfeS8plc6ukdH2eOeVMRQNz92kxBfPcHTL7BctFN4nqiHA0NTudMkrTcylZ2YRR9TRO4 FnvC6IxVfhLkVRNzSAvxYlA/F8lMG/qsnRCFtCv0ZWJtlThAYpiBv/TDJ3WBhWxu7SJR og8gmUnbpmxEkXQN9GS5AQujdF5CstNxqay9RR0KCXMCHBMRJdg0uxDVr4IhTDpvuDXS RdpDrwUZpQ94+3JENIOfdmDZ0ezgBD2FK/oo0uiHPb3UPjtQDgpt3Eb8tTVZ9RwN231B TIOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=C+ms6grS96Ol4OP1kqdvfoE0RV1weQFUxWl4du/LBLA=; b=fgTCpsDPpU7OU96otGdef3FtIy7SgUApLS66yalEdQJcEjBL06W9/Wn6rGcHkNlMgC xz8lGlZHL8U67+qSlJIN3Ll9JavSgXsQ1B85nI09TKqggQpjNcI2bAp+b5xCsEQePzLY 5ocP3IzlScnQh7nW+RclsXH8Iki8LPqrR763JxQ8qVsfHwvmsezIq2+zOp7U3Cg/IKC6 CCFgGnPWHt4R4eFtQbsnz0qH+Xvf+V3EY7kLlaVlLNhd8FBrDYf0T7aaB4kJe3IsfMBl j7XWf5iShyIoH7Hf9ZB4T7KY8c7i2QzLdGVLTQ0l6PfKmc2xLfVUjSE53aJK8czP7APn Vedg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id mu2-20020a17090b388200b001e860feaeb5si17281894pjb.181.2022.06.08.03.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 03:30:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AB7BE212DA6; Wed, 8 Jun 2022 02:59:10 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235665AbiFHJ7A (ORCPT + 99 others); Wed, 8 Jun 2022 05:59:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235754AbiFHJ6P (ORCPT ); Wed, 8 Jun 2022 05:58:15 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B60911FA5F for ; Wed, 8 Jun 2022 02:30:46 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LJ2444JPgzjY8J; Wed, 8 Jun 2022 17:29:24 +0800 (CST) Received: from localhost.localdomain (10.175.127.227) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 8 Jun 2022 17:30:44 +0800 From: Zhang Wensheng To: , CC: , , Subject: [PATCH -next] driver core: fix deadlock in __driver_attach Date: Wed, 8 Jun 2022 17:43:55 +0800 Message-ID: <20220608094355.3298420-1-zhangwensheng5@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500016.china.huawei.com (7.221.188.220) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In __driver_attach function, There are also potential AA deadlock problem, like the commit b232b02bf3c2 ("driver core: fix deadlock in __device_attach"). Fixes: ef0ff68351be ("driver core: Probe devices asynchronously instead of the driver") Signed-off-by: Zhang Wensheng --- drivers/base/dd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 11b0fb6414d3..b766968a873c 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -1115,6 +1115,7 @@ static void __driver_attach_async_helper(void *_dev, async_cookie_t cookie) static int __driver_attach(struct device *dev, void *data) { struct device_driver *drv = data; + bool async = false; int ret; /* @@ -1153,9 +1154,11 @@ static int __driver_attach(struct device *dev, void *data) if (!dev->driver && !dev->p->async_driver) { get_device(dev); dev->p->async_driver = drv; - async_schedule_dev(__driver_attach_async_helper, dev); + async = true; } device_unlock(dev); + if (async) + async_schedule_dev(__driver_attach_async_helper, dev); return 0; } -- 2.31.1