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

Commit 8e959601 authored by Niranjana Vishwanathapura's avatar Niranjana Vishwanathapura Committed by Doug Ledford
Browse files

IB/core, opa_vnic, hfi1, mlx5: Properly free rdma_netdev 



IPOIB is calling free_rdma_netdev even though alloc_rdma_netdev has
returned -EOPNOTSUPP.
Move free_rdma_netdev from ib_device structure to rdma_netdev structure
thus ensuring proper cleanup function is called for the rdma net device.

Fix the following trace:

ib0: Failed to modify QP to ERROR state
BUG: unable to handle kernel paging request at 0000000000001d20
IP: hfi1_vnic_free_rn+0x26/0xb0 [hfi1]
Call Trace:
 ipoib_remove_one+0xbe/0x160 [ib_ipoib]
 ib_unregister_device+0xd0/0x170 [ib_core]
 rvt_unregister_device+0x29/0x90 [rdmavt]
 hfi1_unregister_ib_device+0x1a/0x100 [hfi1]
 remove_one+0x4b/0x220 [hfi1]
 pci_device_remove+0x39/0xc0
 device_release_driver_internal+0x141/0x200
 driver_detach+0x3f/0x80
 bus_remove_driver+0x55/0xd0
 driver_unregister+0x2c/0x50
 pci_unregister_driver+0x2a/0xa0
 hfi1_mod_cleanup+0x10/0xf65 [hfi1]
 SyS_delete_module+0x171/0x250
 do_syscall_64+0x67/0x150
 entry_SYSCALL64_slow_path+0x25/0x25

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarNiranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5ecce4c9

drivers/infiniband/hw/hfi1/verbs.c

+0 −1
Original line number Diff line number Diff line
@@ -1779,7 +1779,6 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	ibdev->alloc_hw_stats = alloc_hw_stats;

	ibdev->get_hw_stats = get_hw_stats;

	ibdev->alloc_rdma_netdev = hfi1_vnic_alloc_rn;

	ibdev->free_rdma_netdev = hfi1_vnic_free_rn;



	/* keep process mad in the driver */

	ibdev->process_mad = hfi1_process_mad;

drivers/infiniband/hw/hfi1/vnic.h

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device, 
				      const char *name,

				      unsigned char name_assign_type,

				      void (*setup)(struct net_device *));

void hfi1_vnic_free_rn(struct net_device *netdev);

int hfi1_vnic_send_dma(struct hfi1_devdata *dd, u8 q_idx,

		       struct hfi1_vnic_vport_info *vinfo,

		       struct sk_buff *skb, u64 pbc, u8 plen);

drivers/infiniband/hw/hfi1/vnic_main.c

+10 −9
Original line number Diff line number Diff line
@@ -833,6 +833,15 @@ static const struct net_device_ops hfi1_netdev_ops = { 
	.ndo_get_stats64 = hfi1_vnic_get_stats64,

};



static void hfi1_vnic_free_rn(struct net_device *netdev)

{

	struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);



	hfi1_vnic_deinit(vinfo);

	mutex_destroy(&vinfo->lock);

	free_netdev(netdev);

}



struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device,

				      u8 port_num,

				      enum rdma_netdev_t type,
@@ -864,6 +873,7 @@ struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device, 
	vinfo->num_tx_q = dd->chip_sdma_engines;

	vinfo->num_rx_q = HFI1_NUM_VNIC_CTXT;

	vinfo->netdev = netdev;

	rn->free_rdma_netdev = hfi1_vnic_free_rn;

	rn->set_id = hfi1_vnic_set_vesw_id;



	netdev->features = NETIF_F_HIGHDMA | NETIF_F_SG;
@@ -892,12 +902,3 @@ struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device, 
	free_netdev(netdev);

	return ERR_PTR(rc);

}
 


void hfi1_vnic_free_rn(struct net_device *netdev)

{

	struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);



	hfi1_vnic_deinit(vinfo);

	mutex_destroy(&vinfo->lock);

	free_netdev(netdev);

}

drivers/infiniband/hw/mlx5/main.c

+17 −10
Original line number Diff line number Diff line
@@ -3542,6 +3542,11 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev, 
	return num_counters;

}



static void mlx5_ib_free_rdma_netdev(struct net_device *netdev)

{

	return mlx5_rdma_netdev_free(netdev);

}



static struct net_device*

mlx5_ib_alloc_rdma_netdev(struct ib_device *hca,

			  u8 port_num,
@@ -3550,16 +3555,19 @@ mlx5_ib_alloc_rdma_netdev(struct ib_device *hca, 
			  unsigned char name_assign_type,

			  void (*setup)(struct net_device *))

{

	struct net_device *netdev;

	struct rdma_netdev *rn;



	if (type != RDMA_NETDEV_IPOIB)

		return ERR_PTR(-EOPNOTSUPP);



	return mlx5_rdma_netdev_alloc(to_mdev(hca)->mdev, hca,

	netdev = mlx5_rdma_netdev_alloc(to_mdev(hca)->mdev, hca,

					name, setup);

	if (likely(!IS_ERR_OR_NULL(netdev))) {

		rn = netdev_priv(netdev);

		rn->free_rdma_netdev = mlx5_ib_free_rdma_netdev;

	}



static void mlx5_ib_free_rdma_netdev(struct net_device *netdev)

{

	return mlx5_rdma_netdev_free(netdev);

	return netdev;

}



static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
@@ -3692,10 +3700,9 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->ib_dev.check_mr_status	= mlx5_ib_check_mr_status;

	dev->ib_dev.get_port_immutable  = mlx5_port_immutable;

	dev->ib_dev.get_dev_fw_str      = get_dev_fw_str;

	if (MLX5_CAP_GEN(mdev, ipoib_enhanced_offloads)) {

	if (MLX5_CAP_GEN(mdev, ipoib_enhanced_offloads))

		dev->ib_dev.alloc_rdma_netdev	= mlx5_ib_alloc_rdma_netdev;

		dev->ib_dev.free_rdma_netdev	= mlx5_ib_free_rdma_netdev;

	}



	if (mlx5_core_is_pf(mdev)) {

		dev->ib_dev.get_vf_config	= mlx5_ib_get_vf_config;

		dev->ib_dev.set_vf_link_state	= mlx5_ib_set_vf_link_state;

drivers/infiniband/ulp/ipoib/ipoib_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1893,6 +1893,7 @@ static struct net_device 
	rn->send = ipoib_send;

	rn->attach_mcast = ipoib_mcast_attach;

	rn->detach_mcast = ipoib_mcast_detach;

	rn->free_rdma_netdev = free_netdev;

	rn->hca = hca;



	dev->netdev_ops = &ipoib_netdev_default_pf;
@@ -2288,6 +2289,8 @@ 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);



		ib_unregister_event_handler(&priv->event_handler);

		flush_workqueue(ipoib_workqueue);
@@ -2304,10 +2307,7 @@ static void ipoib_remove_one(struct ib_device *device, void *client_data) 
		flush_workqueue(priv->wq);



		unregister_netdev(priv->dev);

		if (device->free_rdma_netdev)

			device->free_rdma_netdev(priv->dev);

		else

			free_netdev(priv->dev);

		rn->free_rdma_netdev(priv->dev);



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

			kfree(cpriv);