Re: [PATCH for-rc v1] IB/core, opa_vnic, hfi1, mlx5: Properly free rdma_netdev

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jul 05, 2017 at 07:31:10PM -0400, Doug Ledford wrote:
On Wed, 2017-07-05 at 14:52 -0700, Vishwanathapura, Niranjana wrote:
Thanks Doug for updating the patch with the fix.

> @@ -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,
> -				      name, setup);
> -}
> -
> -static void mlx5_ib_free_rdma_netdev(struct net_device *netdev)
> -{
> -	return mlx5_rdma_netdev_free(netdev);
> +	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;
> +	}

Looks like mlx5_rdma_netdev_alloc() always return NULL in case of
error, hence
null check should have been suffecient. But the above check will also
do, I am
fine with this change.

No, at the very beginning of mlx5_rdma_netdev_alloc() it will return
-EOPNOTSUPP if the card doesn't support IPoIB accelerations.  So we
have to support both NULL and an ERR_PTR (and possibly more options in
the future, you never know, the above is future proof).


I see. Yup, I agree.

Niranjana

--
Doug Ledford <dledford@xxxxxxxxxx>
   GPG KeyID: B826A3330E572FDD
   Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Yosemite Photos]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux