From: Alex Vesker <valex@mellanox.com>

Date: Sun, 24 Sep 2017 21:46:33 +0300

Subject: IB/ipoib: Fix inconsistency with free_netdev and free_rdma_netdev

Patch-mainline: v4.14-rc3

Git-commit: 7c9d9662103ae1c11acc7bfc47d988466cff23cf

References: bsc#1046307 FATE#322941

Call free_rdma_netdev instead of free_netdev each time we want to

release a netdevice. This call is also relevant for future freeing

of offloaded child interfaces.

This patch also adds a missing call for free netdevice when releasing

a parent interface that has child interfaces using ipoib_remove_one.

Fixes: cd565b4b51e5 ('IB/IPoIB: Support acceleration options callbacks')

Signed-off-by: Alex Vesker <valex@mellanox.com>

Signed-off-by: Leon Romanovsky <leon@kernel.org>

Signed-off-by: Doug Ledford <dledford@redhat.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/ulp/ipoib/ipoib_main.c |   15 +++++++++++----

 drivers/infiniband/ulp/ipoib/ipoib_vlan.c |   10 ++++++++--

 2 files changed, 19 insertions(+), 6 deletions(-)

--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c

+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c

@@ -2180,6 +2180,7 @@ static struct net_device *ipoib_add_port

 {

 	struct ipoib_dev_priv *priv;

 	struct ib_port_attr attr;

+	struct rdma_netdev *rn;

 	int result = -ENOMEM;

 	priv = ipoib_intf_alloc(hca, port, format);

@@ -2279,7 +2280,8 @@ register_failed:

 	ipoib_dev_cleanup(priv->dev);

 device_init_failed:

-	free_netdev(priv->dev);

+	rn = netdev_priv(priv->dev);

+	rn->free_rdma_netdev(priv->dev);

 	kfree(priv);

 alloc_mem_failed:

@@ -2328,7 +2330,7 @@ static void ipoib_remove_one(struct ib_d

 		return;

 	list_for_each_entry_safe(priv, tmp, dev_list, list) {

-		struct rdma_netdev *rn = netdev_priv(priv->dev);

+		struct rdma_netdev *parent_rn = netdev_priv(priv->dev);

 		ib_unregister_event_handler(&priv->event_handler);

 		flush_workqueue(ipoib_workqueue);

@@ -2350,10 +2352,15 @@ static void ipoib_remove_one(struct ib_d

 		unregister_netdev(priv->dev);

 		mutex_unlock(&priv->sysfs_mutex);

-		rn->free_rdma_netdev(priv->dev);

+		parent_rn->free_rdma_netdev(priv->dev);

-		list_for_each_entry_safe(cpriv, tcpriv, &priv->child_intfs, list)

+		list_for_each_entry_safe(cpriv, tcpriv, &priv->child_intfs, list) {

+			struct rdma_netdev *child_rn;

+

+			child_rn = netdev_priv(cpriv->dev);

+			child_rn->free_rdma_netdev(cpriv->dev);

 			kfree(cpriv);

+		}

 		kfree(priv);

 	}

--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c

+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c

@@ -179,7 +179,10 @@ out:

 	mutex_unlock(&ppriv->sysfs_mutex);

 	if (result && priv) {

-		free_netdev(priv->dev);

+		struct rdma_netdev *rn;

+

+		rn = netdev_priv(priv->dev);

+		rn->free_rdma_netdev(priv->dev);

 		kfree(priv);

 	}

@@ -232,7 +235,10 @@ int ipoib_vlan_delete(struct net_device

 	mutex_unlock(&ppriv->sysfs_mutex);

 	if (dev) {

-		free_netdev(dev);

+		struct rdma_netdev *rn;

+

+		rn = netdev_priv(dev);

+		rn->free_rdma_netdev(priv->dev);

 		kfree(priv);

 		return 0;

 	}