Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c9d9662 authored by Alex Vesker's avatar Alex Vesker Committed by Doug Ledford
Browse files

IB/ipoib: Fix inconsistency with free_netdev and free_rdma_netdev 



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: cd565b4b ('IB/IPoIB: Support acceleration options callbacks')
Signed-off-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 9c6f42e9

drivers/infiniband/ulp/ipoib/ipoib_main.c

+11 −4
Original line number Diff line number Diff line
@@ -2180,6 +2180,7 @@ static struct net_device *ipoib_add_port(const char *format, 
{

	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 @@ static struct net_device *ipoib_add_port(const char *format, 
	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_device *device, void *client_data) 
		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_device *device, void *client_data) 
		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);

	}

drivers/infiniband/ulp/ipoib/ipoib_vlan.c

+8 −2
Original line number Diff line number Diff line
@@ -179,7 +179,10 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) 
	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 *pdev, unsigned short pkey) 
	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;

	}