* Patch "net/mlx5: Cancel recovery work in remove flow" has been added to the 4.9-stable tree
@ 2017-01-12 20:38 gregkh
2017-01-12 21:00 ` Daniel Jurgens
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2017-01-12 20:38 UTC (permalink / raw)
To: danielj, davem, gregkh, saeedm; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
net/mlx5: Cancel recovery work in remove flow
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mlx5-cancel-recovery-work-in-remove-flow.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From foo@baz Thu Jan 12 21:37:26 CET 2017
From: Daniel Jurgens <danielj@mellanox.com>
Date: Wed, 28 Dec 2016 14:58:33 +0200
Subject: net/mlx5: Cancel recovery work in remove flow
From: Daniel Jurgens <danielj@mellanox.com>
[ Upstream commit 689a248df83b6032edc57e86267b4e5cc8d7174e ]
If there is pending delayed work for health recovery it must be canceled
if the device is being unloaded.
Fixes: 05ac2c0b7438 ("net/mlx5: Fix race between PCI error handlers and health work")
Signed-off-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1159,6 +1159,8 @@ static int mlx5_unload_one(struct mlx5_c
{
int err = 0;
+ mlx5_drain_health_wq(dev);
+
mutex_lock(&dev->intf_state_mutex);
if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {
dev_warn(&dev->pdev->dev, "%s: interface is down, NOP\n",
@@ -1319,10 +1321,9 @@ static pci_ers_result_t mlx5_pci_err_det
mlx5_enter_error_state(dev);
mlx5_unload_one(dev, priv, false);
- /* In case of kernel call save the pci state and drain health wq */
+ /* In case of kernel call save the pci state */
if (state) {
pci_save_state(pdev);
- mlx5_drain_health_wq(dev);
mlx5_pci_disable_device(dev);
}
Patches currently in stable-queue which might be from danielj@mellanox.com are
queue-4.9/net-mlx5-cancel-recovery-work-in-remove-flow.patch
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Patch "net/mlx5: Cancel recovery work in remove flow" has been added to the 4.9-stable tree
2017-01-12 20:38 Patch "net/mlx5: Cancel recovery work in remove flow" has been added to the 4.9-stable tree gregkh
@ 2017-01-12 21:00 ` Daniel Jurgens
2017-01-13 7:45 ` gregkh
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Jurgens @ 2017-01-12 21:00 UTC (permalink / raw)
To: gregkh@linuxfoundation.org, davem@davemloft.net, Saeed Mahameed
Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org
On 1/12/2017 2:39 PM, gregkh@linuxfoundation.org wrote:
> This is a note to let you know that I've just added the patch titled
>
> net/mlx5: Cancel recovery work in remove flow
>
> to the 4.9-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
> net-mlx5-cancel-recovery-work-in-remove-flow.patch
> and it can be found in the queue-4.9 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
>
>
> From foo@baz Thu Jan 12 21:37:26 CET 2017
> From: Daniel Jurgens <danielj@mellanox.com>
> Date: Wed, 28 Dec 2016 14:58:33 +0200
> Subject: net/mlx5: Cancel recovery work in remove flow
>
> From: Daniel Jurgens <danielj@mellanox.com>
>
>
> [ Upstream commit 689a248df83b6032edc57e86267b4e5cc8d7174e ]
>
> If there is pending delayed work for health recovery it must be canceled
> if the device is being unloaded.
>
> Fixes: 05ac2c0b7438 ("net/mlx5: Fix race between PCI error handlers and health work")
> Signed-off-by: Daniel Jurgens <danielj@mellanox.com>
> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> @@ -1159,6 +1159,8 @@ static int mlx5_unload_one(struct mlx5_c
> {
> int err = 0;
>
> + mlx5_drain_health_wq(dev);
> +
> mutex_lock(&dev->intf_state_mutex);
> if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {
> dev_warn(&dev->pdev->dev, "%s: interface is down, NOP\n",
> @@ -1319,10 +1321,9 @@ static pci_ers_result_t mlx5_pci_err_det
>
> mlx5_enter_error_state(dev);
> mlx5_unload_one(dev, priv, false);
> - /* In case of kernel call save the pci state and drain health wq */
> + /* In case of kernel call save the pci state */
> if (state) {
> pci_save_state(pdev);
> - mlx5_drain_health_wq(dev);
> mlx5_pci_disable_device(dev);
> }
>
>
>
> Patches currently in stable-queue which might be from danielj@mellanox.com are
>
> queue-4.9/net-mlx5-cancel-recovery-work-in-remove-flow.patch
>
This patch introduced a bug. Please take this one with it: https://patchwork.ozlabs.org/patch/713425/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Patch "net/mlx5: Cancel recovery work in remove flow" has been added to the 4.9-stable tree
2017-01-12 21:00 ` Daniel Jurgens
@ 2017-01-13 7:45 ` gregkh
0 siblings, 0 replies; 3+ messages in thread
From: gregkh @ 2017-01-13 7:45 UTC (permalink / raw)
To: Daniel Jurgens
Cc: davem@davemloft.net, Saeed Mahameed, stable@vger.kernel.org,
stable-commits@vger.kernel.org
On Thu, Jan 12, 2017 at 09:00:28PM +0000, Daniel Jurgens wrote:
> On 1/12/2017 2:39 PM, gregkh@linuxfoundation.org wrote:
> > This is a note to let you know that I've just added the patch titled
> >
> > net/mlx5: Cancel recovery work in remove flow
> >
> > to the 4.9-stable tree which can be found at:
> > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> >
> > The filename of the patch is:
> > net-mlx5-cancel-recovery-work-in-remove-flow.patch
> > and it can be found in the queue-4.9 subdirectory.
> >
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
> >
> >
> > From foo@baz Thu Jan 12 21:37:26 CET 2017
> > From: Daniel Jurgens <danielj@mellanox.com>
> > Date: Wed, 28 Dec 2016 14:58:33 +0200
> > Subject: net/mlx5: Cancel recovery work in remove flow
> >
> > From: Daniel Jurgens <danielj@mellanox.com>
> >
> >
> > [ Upstream commit 689a248df83b6032edc57e86267b4e5cc8d7174e ]
> >
> > If there is pending delayed work for health recovery it must be canceled
> > if the device is being unloaded.
> >
> > Fixes: 05ac2c0b7438 ("net/mlx5: Fix race between PCI error handlers and health work")
> > Signed-off-by: Daniel Jurgens <danielj@mellanox.com>
> > Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> > drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> > @@ -1159,6 +1159,8 @@ static int mlx5_unload_one(struct mlx5_c
> > {
> > int err = 0;
> >
> > + mlx5_drain_health_wq(dev);
> > +
> > mutex_lock(&dev->intf_state_mutex);
> > if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {
> > dev_warn(&dev->pdev->dev, "%s: interface is down, NOP\n",
> > @@ -1319,10 +1321,9 @@ static pci_ers_result_t mlx5_pci_err_det
> >
> > mlx5_enter_error_state(dev);
> > mlx5_unload_one(dev, priv, false);
> > - /* In case of kernel call save the pci state and drain health wq */
> > + /* In case of kernel call save the pci state */
> > if (state) {
> > pci_save_state(pdev);
> > - mlx5_drain_health_wq(dev);
> > mlx5_pci_disable_device(dev);
> > }
> >
> >
> >
> > Patches currently in stable-queue which might be from danielj@mellanox.com are
> >
> > queue-4.9/net-mlx5-cancel-recovery-work-in-remove-flow.patch
> >
> This patch introduced a bug. Please take this one with it: https://patchwork.ozlabs.org/patch/713425/
Ick. David, should I drop this from the queue now, or just wait a day
and pick this one up too if it hits Linus's tree? Any suggestions?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-13 7:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-12 20:38 Patch "net/mlx5: Cancel recovery work in remove flow" has been added to the 4.9-stable tree gregkh
2017-01-12 21:00 ` Daniel Jurgens
2017-01-13 7:45 ` gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.