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: cd565b4b51
('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>
This commit is contained in:
parent
9c6f42e925
commit
7c9d966210
|
@ -2180,6 +2180,7 @@ static struct net_device *ipoib_add_port(const char *format,
|
||||||
{
|
{
|
||||||
struct ipoib_dev_priv *priv;
|
struct ipoib_dev_priv *priv;
|
||||||
struct ib_port_attr attr;
|
struct ib_port_attr attr;
|
||||||
|
struct rdma_netdev *rn;
|
||||||
int result = -ENOMEM;
|
int result = -ENOMEM;
|
||||||
|
|
||||||
priv = ipoib_intf_alloc(hca, port, format);
|
priv = ipoib_intf_alloc(hca, port, format);
|
||||||
|
@ -2279,7 +2280,8 @@ register_failed:
|
||||||
ipoib_dev_cleanup(priv->dev);
|
ipoib_dev_cleanup(priv->dev);
|
||||||
|
|
||||||
device_init_failed:
|
device_init_failed:
|
||||||
free_netdev(priv->dev);
|
rn = netdev_priv(priv->dev);
|
||||||
|
rn->free_rdma_netdev(priv->dev);
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
|
|
||||||
alloc_mem_failed:
|
alloc_mem_failed:
|
||||||
|
@ -2328,7 +2330,7 @@ static void ipoib_remove_one(struct ib_device *device, void *client_data)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
list_for_each_entry_safe(priv, tmp, dev_list, list) {
|
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);
|
ib_unregister_event_handler(&priv->event_handler);
|
||||||
flush_workqueue(ipoib_workqueue);
|
flush_workqueue(ipoib_workqueue);
|
||||||
|
@ -2350,10 +2352,15 @@ static void ipoib_remove_one(struct ib_device *device, void *client_data)
|
||||||
unregister_netdev(priv->dev);
|
unregister_netdev(priv->dev);
|
||||||
mutex_unlock(&priv->sysfs_mutex);
|
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(cpriv);
|
||||||
|
}
|
||||||
|
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
}
|
}
|
||||||
|
|
|
@ -179,7 +179,10 @@ out:
|
||||||
mutex_unlock(&ppriv->sysfs_mutex);
|
mutex_unlock(&ppriv->sysfs_mutex);
|
||||||
|
|
||||||
if (result && priv) {
|
if (result && priv) {
|
||||||
free_netdev(priv->dev);
|
struct rdma_netdev *rn;
|
||||||
|
|
||||||
|
rn = netdev_priv(priv->dev);
|
||||||
|
rn->free_rdma_netdev(priv->dev);
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -232,7 +235,10 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
|
||||||
mutex_unlock(&ppriv->sysfs_mutex);
|
mutex_unlock(&ppriv->sysfs_mutex);
|
||||||
|
|
||||||
if (dev) {
|
if (dev) {
|
||||||
free_netdev(dev);
|
struct rdma_netdev *rn;
|
||||||
|
|
||||||
|
rn = netdev_priv(dev);
|
||||||
|
rn->free_rdma_netdev(priv->dev);
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue