From: Sasha Levin <sashal@kernel.org>
To: gregkh@linuxfoundation.org
Cc: lsun@mellanox.com, andriy.shevchenko@linux.intel.com,
dwoods@mellanox.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] platform/mellanox: fix potential deadlock in the tmfifo" failed to apply to 5.5-stable tree
Date: Sun, 9 Feb 2020 12:56:25 -0500 [thread overview]
Message-ID: <20200209175625.GI3584@sasha-vm> (raw)
In-Reply-To: <1581248351144103@kroah.com>
On Sun, Feb 09, 2020 at 12:39:11PM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 5.5-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 3454eeeebd115891f34aa2e76eccf08c9b0882bb Mon Sep 17 00:00:00 2001
>From: Liming Sun <lsun@mellanox.com>
>Date: Fri, 20 Dec 2019 12:04:33 -0500
>Subject: [PATCH] platform/mellanox: fix potential deadlock in the tmfifo
> driver
>
>This commit fixes the potential deadlock caused by the console Rx
>and Tx processing at the same time. Rx and Tx both take the console
>and tmfifo spinlock but in different order which causes potential
>deadlock. The fix is to use different tmfifo spinlock for Rx and
>Tx since they protect different resources and it's safe to split
>the lock.
>
>Below is the reported call trace when copying/pasting large string
>in the console.
>
>Rx:
> _raw_spin_lock_irqsave (hvc lock)
> __hvc_poll
> hvc_poll
> in_intr
> vring_interrupt
> mlxbf_tmfifo_rxtx_one_desc (tmfifo lock)
> mlxbf_tmfifo_rxtx
> mlxbf_tmfifo_work_rxtx
>Tx:
> _raw_spin_lock_irqsave (tmfifo lock)
> mlxbf_tmfifo_virtio_notify
> virtqueue_notify
> virtqueue_kick
> put_chars
> hvc_push
> hvc_write (hvc lock)
> ...
> do_tty_write
> tty_write
>
>Fixes: 1357dfd7261f ("platform/mellanox: Add TmFifo driver for Mellanox BlueField Soc")
>Cc: <stable@vger.kernel.org> # 5.4+
>Reviewed-by: David Woods <dwoods@mellanox.com>
>Signed-off-by: Liming Sun <lsun@mellanox.com>
>Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
It looks to me like this commit went in through two different trees:
638bc4ca3d28 ("platform/mellanox: fix potential deadlock in the tmfifo driver")
3454eeeebd11 ("platform/mellanox: fix potential deadlock in the tmfifo driver")
They are identical, so one probably got cleaned up in a merge commit.
Anyway, 3454eeeebd11 is in both 5.4 and 5.5, so nothing to do here.
--
Thanks,
Sasha
prev parent reply other threads:[~2020-02-09 17:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-09 11:39 FAILED: patch "[PATCH] platform/mellanox: fix potential deadlock in the tmfifo" failed to apply to 5.5-stable tree gregkh
2020-02-09 17:56 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200209175625.GI3584@sasha-vm \
--to=sashal@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dwoods@mellanox.com \
--cc=gregkh@linuxfoundation.org \
--cc=lsun@mellanox.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox