lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 078/339] driver core: fix deadlock in __device_attach
    Date
    From: Zhang Wensheng <zhangwensheng5@huawei.com>

    [ Upstream commit b232b02bf3c205b13a26dcec08e53baddd8e59ed ]

    In __device_attach function, The lock holding logic is as follows:
    ...
    __device_attach
    device_lock(dev) // get lock dev
    async_schedule_dev(__device_attach_async_helper, dev); // func
    async_schedule_node
    async_schedule_node_domain(func)
    entry = kzalloc(sizeof(struct async_entry), GFP_ATOMIC);
    /* when fail or work limit, sync to execute func, but
    __device_attach_async_helper will get lock dev as
    well, which will lead to A-A deadlock. */
    if (!entry || atomic_read(&entry_count) > MAX_WORK) {
    func;
    else
    queue_work_node(node, system_unbound_wq, &entry->work)
    device_unlock(dev)

    As shown above, when it is allowed to do async probes, because of
    out of memory or work limit, async work is not allowed, to do
    sync execute instead. it will lead to A-A deadlock because of
    __device_attach_async_helper getting lock dev.

    To fix the deadlock, move the async_schedule_dev outside device_lock,
    as we can see, in async_schedule_node_domain, the parameter of
    queue_work_node is system_unbound_wq, so it can accept concurrent
    operations. which will also not change the code logic, and will
    not lead to deadlock.

    Fixes: 765230b5f084 ("driver-core: add asynchronous probing support for drivers")
    Signed-off-by: Zhang Wensheng <zhangwensheng5@huawei.com>
    Link: https://lore.kernel.org/r/20220518074516.1225580-1-zhangwensheng5@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 3fc3b5940bb3..ed02a529a896 100644
    --- a/drivers/base/dd.c
    +++ b/drivers/base/dd.c
    @@ -941,6 +941,7 @@ static void __device_attach_async_helper(void *_dev, async_cookie_t cookie)
    static int __device_attach(struct device *dev, bool allow_async)
    {
    int ret = 0;
    + bool async = false;

    device_lock(dev);
    if (dev->p->dead) {
    @@ -979,7 +980,7 @@ static int __device_attach(struct device *dev, bool allow_async)
    */
    dev_dbg(dev, "scheduling asynchronous probe\n");
    get_device(dev);
    - async_schedule_dev(__device_attach_async_helper, dev);
    + async = true;
    } else {
    pm_request_idle(dev);
    }
    @@ -989,6 +990,8 @@ static int __device_attach(struct device *dev, bool allow_async)
    }
    out_unlock:
    device_unlock(dev);
    + if (async)
    + async_schedule_dev(__device_attach_async_helper, dev);
    return ret;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:38    [W:4.326 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site