2013-05-18 02:57:16

by jonghwan Choi

Subject: [PATCH 3.9-stable] ntb_netdev: remove from list on exit

From: Jon Mason <[email protected]>

This patch looks like it should be in the 3.9-stable tree, should we apply
it?

------------------

From: "Jon Mason <[email protected]>"

commit 904435cf76a9bdd5eb41b1c4e049d5a64f3a8400 upstream

The ntb_netdev device is not removed from the global list of devices
upon device removal. If the device is re-added, the removal code would
find the first instance and try to remove an already removed device.

Cc: <[email protected]> # 3.9.x: ad3e2751: ntb: off by one
Cc: <[email protected]> # 3.9.x: cc0f868d: NTB: fix pointer math
Cc: <[email protected]> # 3.9.x: 113fc505: NTB: Handle 64bit BAR
Cc: <[email protected]> # 3.9.x: b77b2637: NTB: Link toggle memory
Cc: <[email protected]> # 3.9.x: 90f9e934: NTB: reset tx_index on
Cc: <[email protected]> # 3.9.x: c9d534c8: NTB: Correctly handle receive
Cc: <[email protected]> # 3.9.x: c336acd3: NTB: memcpy lockup workaround
Signed-off-by: Jon Mason <[email protected]>
Signed-off-by: Jonghwan Choi <[email protected]>
---
drivers/net/ntb_netdev.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index ed947dd..f3cdf64 100644
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -375,6 +375,8 @@ static void ntb_netdev_remove(struct pci_dev *pdev)
if (dev == NULL)
return;

+ list_del(&dev->list);
+
ndev = dev->ndev;

unregister_netdev(ndev);
--
1.8.1.2

2013-05-18 14:49:05

by Jon Mason

Subject: Re: [PATCH 3.9-stable] ntb_netdev: remove from list on exit

On Sat, May 18, 2013 at 11:55:06AM +0900, Jonghwan Choi wrote:
> From: Jon Mason <[email protected]>
>
> This patch looks like it should be in the 3.9-stable tree, should we apply
> it?

Yes, thanks.

>
> ------------------
>
> From: "Jon Mason <[email protected]>"
>
> commit 904435cf76a9bdd5eb41b1c4e049d5a64f3a8400 upstream
>
> The ntb_netdev device is not removed from the global list of devices
> upon device removal. If the device is re-added, the removal code would
> find the first instance and try to remove an already removed device.
>
> Cc: <[email protected]> # 3.9.x: ad3e2751: ntb: off by one
> Cc: <[email protected]> # 3.9.x: cc0f868d: NTB: fix pointer math
> Cc: <[email protected]> # 3.9.x: 113fc505: NTB: Handle 64bit BAR
> Cc: <[email protected]> # 3.9.x: b77b2637: NTB: Link toggle memory
> Cc: <[email protected]> # 3.9.x: 90f9e934: NTB: reset tx_index on
> Cc: <[email protected]> # 3.9.x: c9d534c8: NTB: Correctly handle receive
> Cc: <[email protected]> # 3.9.x: c336acd3: NTB: memcpy lockup workaround
> Signed-off-by: Jon Mason <[email protected]>
> Signed-off-by: Jonghwan Choi <[email protected]>
> ---
> drivers/net/ntb_netdev.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
> index ed947dd..f3cdf64 100644
> --- a/drivers/net/ntb_netdev.c
> +++ b/drivers/net/ntb_netdev.c
> @@ -375,6 +375,8 @@ static void ntb_netdev_remove(struct pci_dev *pdev)
> if (dev == NULL)
> return;
>
> + list_del(&dev->list);
> +
> ndev = dev->ndev;
>
> unregister_netdev(ndev);
> --
> 1.8.1.2
>