• Stephen Boyd's avatar
    PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout() · 40fea92f
    Stephen Boyd authored
    pm_qos_update_request_timeout() updates a qos and then schedules
    a delayed work item to bring the qos back down to the default
    after the timeout. When the work item runs, pm_qos_work_fn() will
    call pm_qos_update_request() and deadlock because it tries to
    cancel itself via cancel_delayed_work_sync(). Future callers of
    that qos will also hang waiting to cancel the work that is
    canceling itself. Let's extract the little bit of code that does
    the real work of pm_qos_update_request() and call it from the
    work function so that we don't deadlock.
    
    Before ed1ac6e9 (PM: don't use [delayed_]work_pending()) this didn't
    happen because the work function wouldn't try to cancel itself.
    Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
    Reviewed-by: default avatarTejun Heo <tj@kernel.org>
    Cc: 3.9+ <stable@vger.kernel.org> # 3.9+
    Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
    40fea92f
qos.c 16.7 KB