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 4.19 201/287] coresight: cpu-debug: Replace mutex with mutex_trylock on panic notifier
    Date
    From: Guilherme G. Piccoli <gpiccoli@igalia.com>

    [ Upstream commit 1adff542d67a2ed1120955cb219bfff8a9c53f59 ]

    The panic notifier infrastructure executes registered callbacks when
    a panic event happens - such callbacks are executed in atomic context,
    with interrupts and preemption disabled in the running CPU and all other
    CPUs disabled. That said, mutexes in such context are not a good idea.

    This patch replaces a regular mutex with a mutex_trylock safer approach;
    given the nature of the mutex used in the driver, it should be pretty
    uncommon being unable to acquire such mutex in the panic path, hence
    no functional change should be observed (and if it is, that would be
    likely a deadlock with the regular mutex).

    Fixes: 2227b7c74634 ("coresight: add support for CPU debug module")
    Cc: Leo Yan <leo.yan@linaro.org>
    Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
    Cc: Mike Leach <mike.leach@linaro.org>
    Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
    Signed-off-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
    Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
    Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
    Link: https://lore.kernel.org/r/20220427224924.592546-10-gpiccoli@igalia.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwtracing/coresight/coresight-cpu-debug.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c
    index e8819d750938..a4eba09691b4 100644
    --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c
    +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c
    @@ -379,9 +379,10 @@ static int debug_notifier_call(struct notifier_block *self,
    int cpu;
    struct debug_drvdata *drvdata;

    - mutex_lock(&debug_lock);
    + /* Bail out if we can't acquire the mutex or the functionality is off */
    + if (!mutex_trylock(&debug_lock))
    + return NOTIFY_DONE;

    - /* Bail out if the functionality is disabled */
    if (!debug_enable)
    goto skip_dump;

    @@ -400,7 +401,7 @@ static int debug_notifier_call(struct notifier_block *self,

    skip_dump:
    mutex_unlock(&debug_lock);
    - return 0;
    + return NOTIFY_DONE;
    }

    static struct notifier_block debug_notifier = {
    --
    2.35.1


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