Skip to contentSkip to conversation

Patch "net/mlx5: Cancel recovery work in remove flow" has been added to the 4.9-stable tree

PATCH [email protected] 2 participants 3 messages Jan 12, 2017 – Jan 13, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Jan 12 21:37:26 CET 2017

From: Daniel Jurgens <[email protected]>
Date: Wed, 28 Dec 2016 14:58:33 +0200
Subject: net/mlx5: Cancel recovery work in remove flow

From: Daniel Jurgens <[email protected]>

[ 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")
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +3 -2
@@ -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 [email protected] are

queue-4.9/net-mlx5-cancel-recovery-work-in-remove-flow.patch

#1 lore raw
Quoted 62 lines · On 1/12/2017 2:39 PM, [email protected] 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 <[email protected]> know about it.

From foo@baz Thu Jan 12 21:37:26 CET 2017
From: Daniel Jurgens <[email protected]>
Date: Wed, 28 Dec 2016 14:58:33 +0200
Subject: net/mlx5: Cancel recovery work in remove flow

From: Daniel Jurgens <[email protected]>

[ 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")
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +3 -2
@@ -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);
 	}
 
Quoted 4 lines

Patches currently in stable-queue which might be from [email protected] 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/

author maintainer
#2 lore raw
Quoted 63 lines · Daniel Jurgens
Quoted 62 lines · On 1/12/2017 2:39 PM, [email protected] 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 <[email protected]> know about it.

From foo@baz Thu Jan 12 21:37:26 CET 2017
From: Daniel Jurgens <[email protected]>
Date: Wed, 28 Dec 2016 14:58:33 +0200
Subject: net/mlx5: Cancel recovery work in remove flow

From: Daniel Jurgens <[email protected]>

[ 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")
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +3 -2
@@ -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);
 	}
 
Quoted 5 lines
Quoted 4 lines

Patches currently in stable-queue which might be from [email protected] 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