[PATCH v3] IB/{core, usnic}: Add generic function to extract IB speed from netdev

[PATCH v3] IB/{core, usnic}: Add generic function to extract IB speed from netdev

[Yuval Shaia]

Please review this change which adds generic function to extract speed from
netdev and return IB speed to caller.

[PATCH v3 1/2] IB/usnic: Implement get_netdev hook
Preliminary and needed anyway patch which adds get_netdev implementation to
usnic driver.

[PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev
The actual patch that adds the $subject functionality.

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

[PATCH v3 1/2] IB/usnic: Implement get_netdev hook

[Yuval Shaia]

usnic's get_netdev hook for struct ib_device is missing - add it.

Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
---
Per Moni Shoua's suggestion - create seperate patch for this purpose.
---
 drivers/infiniband/hw/usnic/usnic_ib_main.c  |  1 +
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 10 ++++++++++
 drivers/infiniband/hw/usnic/usnic_ib_verbs.h |  1 +
 3 files changed, 12 insertions(+)

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index c0c1e8b..80577b9 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -409,6 +409,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
 	us_ibdev->ib_dev.query_port = usnic_ib_query_port;
 	us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
 	us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
+	us_ibdev->ib_dev.get_netdev = usnic_get_netdev;
 	us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;
 	us_ibdev->ib_dev.alloc_pd = usnic_ib_alloc_pd;
 	us_ibdev->ib_dev.dealloc_pd = usnic_ib_dealloc_pd;
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index 4996984..f9dc1e80 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -424,6 +424,16 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
 	return 0;
 }
 
+struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num)
+{
+	struct usnic_ib_dev *us_ibdev = to_usdev(device);
+
+	if (us_ibdev->netdev)
+		dev_hold(us_ibdev->netdev);
+
+	return us_ibdev->netdev;
+}
+
 int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
 				u16 *pkey)
 {
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
index 172e43b..1fda944 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
@@ -48,6 +48,7 @@ int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
 				struct ib_qp_init_attr *qp_init_attr);
 int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
 				union ib_gid *gid);
+struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num);
 int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
 				u16 *pkey);
 struct ib_pd *usnic_ib_alloc_pd(struct ib_device *ibdev,
-- 
2.9.4

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

[PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Yuval Shaia]

Logic of retrieving netdev speed from net_device and translating it to
IB speed is implemented in rxe, in usnic and in bnxt drivers.

Define new function which merges all.

Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
---
v0 -> v1:
	* Invite usnic to the party.
v1 -> v2:
	* Utilize __ethtool_get_link_ksettings
	* Rename to ib_get_eth_speed
	* Add some validation checks
	* Implement get_netdev in usnic
v2 -> v3:
	* Split to two separate patches
---
 drivers/infiniband/core/verbs.c              | 55 ++++++++++++++++++++++++++++
 drivers/infiniband/hw/bnxt_re/ib_verbs.c     | 49 ++-----------------------
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 31 +++-------------
 drivers/infiniband/sw/rxe/rxe_verbs.c        | 53 +++------------------------
 include/rdma/ib_verbs.h                      |  1 +
 5 files changed, 71 insertions(+), 118 deletions(-)

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 4792f52..19e6b78 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1253,6 +1253,61 @@ int ib_resolve_eth_dmac(struct ib_device *device,
 }
 EXPORT_SYMBOL(ib_resolve_eth_dmac);
 
+int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8 *width)
+{
+	int rc;
+	u32 netdev_speed;
+	struct net_device *netdev;
+	struct ethtool_link_ksettings lksettings;
+
+	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)
+		return -EINVAL;
+
+	if (!dev->get_netdev)
+		return -EINVAL;
+
+	netdev = dev->get_netdev(dev, port_num);
+	if (!netdev)
+		return -EINVAL;
+
+	rtnl_lock();
+	rc = __ethtool_get_link_ksettings(netdev, &lksettings);
+	rtnl_unlock();
+
+	dev_put(netdev);
+
+	if (!rc) {
+		netdev_speed = lksettings.base.speed;
+	} else {
+		netdev_speed = SPEED_1000;
+		pr_warn("%s speed is unknown, defaulting to %d\n", netdev->name,
+			netdev_speed);
+	}
+
+	if (netdev_speed <= SPEED_1000) {
+		*width = IB_WIDTH_1X;
+		*speed = IB_SPEED_SDR;
+	} else if (netdev_speed <= SPEED_10000) {
+		*width = IB_WIDTH_1X;
+		*speed = IB_SPEED_FDR10;
+	} else if (netdev_speed <= SPEED_20000) {
+		*width = IB_WIDTH_4X;
+		*speed = IB_SPEED_DDR;
+	} else if (netdev_speed <= SPEED_25000) {
+		*width = IB_WIDTH_1X;
+		*speed = IB_SPEED_EDR;
+	} else if (netdev_speed <= SPEED_40000) {
+		*width = IB_WIDTH_4X;
+		*speed = IB_SPEED_FDR10;
+	} else {
+		*width = IB_WIDTH_4X;
+		*speed = IB_SPEED_EDR;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL(ib_get_eth_speed);
+
 int ib_modify_qp(struct ib_qp *qp,
 		 struct ib_qp_attr *qp_attr,
 		 int qp_attr_mask)
diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index 7ba9e69..d0e0f90 100644
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -181,50 +181,6 @@ int bnxt_re_modify_device(struct ib_device *ibdev,
 	return 0;
 }
 
-static void __to_ib_speed_width(struct net_device *netdev, u8 *speed, u8 *width)
-{
-	struct ethtool_link_ksettings lksettings;
-	u32 espeed;
-
-	if (netdev->ethtool_ops && netdev->ethtool_ops->get_link_ksettings) {
-		memset(&lksettings, 0, sizeof(lksettings));
-		rtnl_lock();
-		netdev->ethtool_ops->get_link_ksettings(netdev, &lksettings);
-		rtnl_unlock();
-		espeed = lksettings.base.speed;
-	} else {
-		espeed = SPEED_UNKNOWN;
-	}
-	switch (espeed) {
-	case SPEED_1000:
-		*speed = IB_SPEED_SDR;
-		*width = IB_WIDTH_1X;
-		break;
-	case SPEED_10000:
-		*speed = IB_SPEED_QDR;
-		*width = IB_WIDTH_1X;
-		break;
-	case SPEED_20000:
-		*speed = IB_SPEED_DDR;
-		*width = IB_WIDTH_4X;
-		break;
-	case SPEED_25000:
-		*speed = IB_SPEED_EDR;
-		*width = IB_WIDTH_1X;
-		break;
-	case SPEED_40000:
-		*speed = IB_SPEED_QDR;
-		*width = IB_WIDTH_4X;
-		break;
-	case SPEED_50000:
-		break;
-	default:
-		*speed = IB_SPEED_SDR;
-		*width = IB_WIDTH_1X;
-		break;
-	}
-}
-
 /* Port */
 int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
 		       struct ib_port_attr *port_attr)
@@ -266,8 +222,9 @@ int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
 	 * IB stack to avoid race in the NETDEV_UNREG path
 	 */
 	if (test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags))
-		__to_ib_speed_width(rdev->netdev, &port_attr->active_speed,
-				    &port_attr->active_width);
+		if (!ib_get_eth_speed(ibdev, port_num, &port_attr->active_speed,
+				      &port_attr->active_width))
+			return -EINVAL;
 	return 0;
 }
 
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index f9dc1e80..e5f57dd 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -226,27 +226,6 @@ static void qp_grp_destroy(struct usnic_ib_qp_grp *qp_grp)
 	spin_unlock(&vf->lock);
 }
 
-static void eth_speed_to_ib_speed(int speed, u8 *active_speed,
-					u8 *active_width)
-{
-	if (speed <= 10000) {
-		*active_width = IB_WIDTH_1X;
-		*active_speed = IB_SPEED_FDR10;
-	} else if (speed <= 20000) {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_DDR;
-	} else if (speed <= 30000) {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_QDR;
-	} else if (speed <= 40000) {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_FDR10;
-	} else {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_EDR;
-	}
-}
-
 static int create_qp_validate_user_data(struct usnic_ib_create_qp_cmd cmd)
 {
 	if (cmd.spec.trans_type <= USNIC_TRANSPORT_UNKNOWN ||
@@ -326,12 +305,16 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
 				struct ib_port_attr *props)
 {
 	struct usnic_ib_dev *us_ibdev = to_usdev(ibdev);
-	struct ethtool_link_ksettings cmd;
 
 	usnic_dbg("\n");
 
 	mutex_lock(&us_ibdev->usdev_lock);
-	__ethtool_get_link_ksettings(us_ibdev->netdev, &cmd);
+	if (!ib_get_eth_speed(ibdev, port, &props->active_speed,
+			      &props->active_width)) {
+		mutex_unlock(&us_ibdev->usdev_lock);
+		return -EINVAL;
+	}
+
 	/* props being zeroed by the caller, avoid zeroing it here */
 
 	props->lid = 0;
@@ -355,8 +338,6 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
 	props->pkey_tbl_len = 1;
 	props->bad_pkey_cntr = 0;
 	props->qkey_viol_cntr = 0;
-	eth_speed_to_ib_speed(cmd.base.speed, &props->active_speed,
-			      &props->active_width);
 	props->max_mtu = IB_MTU_4096;
 	props->active_mtu = iboe_get_mtu(us_ibdev->ufdev->mtu);
 	/* Userspace will adjust for hdrs */
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 83d709e..4570f04 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -51,40 +51,16 @@ static int rxe_query_device(struct ib_device *dev,
 	return 0;
 }
 
-static void rxe_eth_speed_to_ib_speed(int speed, u8 *active_speed,
-				      u8 *active_width)
-{
-	if (speed <= 1000) {
-		*active_width = IB_WIDTH_1X;
-		*active_speed = IB_SPEED_SDR;
-	} else if (speed <= 10000) {
-		*active_width = IB_WIDTH_1X;
-		*active_speed = IB_SPEED_FDR10;
-	} else if (speed <= 20000) {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_DDR;
-	} else if (speed <= 30000) {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_QDR;
-	} else if (speed <= 40000) {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_FDR10;
-	} else {
-		*active_width = IB_WIDTH_4X;
-		*active_speed = IB_SPEED_EDR;
-	}
-}
-
 static int rxe_query_port(struct ib_device *dev,
 			  u8 port_num, struct ib_port_attr *attr)
 {
 	struct rxe_dev *rxe = to_rdev(dev);
 	struct rxe_port *port;
-	u32 speed;
+	int rc = -EINVAL;
 
 	if (unlikely(port_num != 1)) {
 		pr_warn("invalid port_number %d\n", port_num);
-		goto err1;
+		goto out;
 	}
 
 	port = &rxe->port;
@@ -93,29 +69,12 @@ static int rxe_query_port(struct ib_device *dev,
 	*attr = port->attr;
 
 	mutex_lock(&rxe->usdev_lock);
-	if (rxe->ndev->ethtool_ops->get_link_ksettings) {
-		struct ethtool_link_ksettings ks;
-
-		rxe->ndev->ethtool_ops->get_link_ksettings(rxe->ndev, &ks);
-		speed = ks.base.speed;
-	} else if (rxe->ndev->ethtool_ops->get_settings) {
-		struct ethtool_cmd cmd;
-
-		rxe->ndev->ethtool_ops->get_settings(rxe->ndev, &cmd);
-		speed = cmd.speed;
-	} else {
-		pr_warn("%s speed is unknown, defaulting to 1000\n",
-			rxe->ndev->name);
-		speed = 1000;
-	}
-	rxe_eth_speed_to_ib_speed(speed, &attr->active_speed,
-				  &attr->active_width);
+	rc = ib_get_eth_speed(dev, port_num, &attr->active_speed,
+			      &attr->active_width);
 	mutex_unlock(&rxe->usdev_lock);
 
-	return 0;
-
-err1:
-	return -EINVAL;
+out:
+	return rc;
 }
 
 static int rxe_query_gid(struct ib_device *device,
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index ba8314e..860cb30 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -3488,6 +3488,7 @@ void ib_drain_qp(struct ib_qp *qp);
 
 int ib_resolve_eth_dmac(struct ib_device *device,
 			struct rdma_ah_attr *ah_attr);
+int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8 *width);
 
 static inline u8 *rdma_ah_retrieve_dmac(struct rdma_ah_attr *attr)
 {
-- 
2.9.4

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

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Moni Shoua]

On Sun, Jun 11, 2017 at 8:44 AM, Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> Logic of retrieving netdev speed from net_device and translating it to
> IB speed is implemented in rxe, in usnic and in bnxt drivers.
>
> Define new function which merges all.
>
> Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>


Reviewed-by: Moni Shoua <monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Yuval Shaia]

On Sun, Jun 11, 2017 at 09:17:50AM +0300, Moni Shoua wrote:
> On Sun, Jun 11, 2017 at 8:44 AM, Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> > Logic of retrieving netdev speed from net_device and translating it to
> > IB speed is implemented in rxe, in usnic and in bnxt drivers.
> >
> > Define new function which merges all.
> >
> > Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> 
> 
> Reviewed-by: Moni Shoua <monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

Thanks,
Appreciate if you can also review patch #1 "IB/usnic: Implement get_netdev
hook" as we can't apply this one without taking #1.

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

Re: [PATCH v3 1/2] IB/usnic: Implement get_netdev hook

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 2899 bytes --]

On Sun, Jun 11, 2017 at 08:44:49AM +0300, Yuval Shaia wrote:
> usnic's get_netdev hook for struct ib_device is missing - add it.
>
> Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> ---
> Per Moni Shoua's suggestion - create seperate patch for this purpose.
> ---
>  drivers/infiniband/hw/usnic/usnic_ib_main.c  |  1 +
>  drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 10 ++++++++++
>  drivers/infiniband/hw/usnic/usnic_ib_verbs.h |  1 +
>  3 files changed, 12 insertions(+)
>
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> index c0c1e8b..80577b9 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> @@ -409,6 +409,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
>  	us_ibdev->ib_dev.query_port = usnic_ib_query_port;
>  	us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
>  	us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
> +	us_ibdev->ib_dev.get_netdev = usnic_get_netdev;
>  	us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;
>  	us_ibdev->ib_dev.alloc_pd = usnic_ib_alloc_pd;
>  	us_ibdev->ib_dev.dealloc_pd = usnic_ib_dealloc_pd;
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> index 4996984..f9dc1e80 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> @@ -424,6 +424,16 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
>  	return 0;
>  }
>
> +struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num)
> +{
> +	struct usnic_ib_dev *us_ibdev = to_usdev(device);
> +
> +	if (us_ibdev->netdev)
> +		dev_hold(us_ibdev->netdev);

Who will release this reference?

Thanks

> +
> +	return us_ibdev->netdev;
> +}
> +
>  int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
>  				u16 *pkey)
>  {
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> index 172e43b..1fda944 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> @@ -48,6 +48,7 @@ int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
>  				struct ib_qp_init_attr *qp_init_attr);
>  int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
>  				union ib_gid *gid);
> +struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num);
>  int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
>  				u16 *pkey);
>  struct ib_pd *usnic_ib_alloc_pd(struct ib_device *ibdev,
> --
> 2.9.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v3 1/2] IB/usnic: Implement get_netdev hook

[Yuval Shaia]

On Tue, Jun 13, 2017 at 10:25:26AM +0300, Leon Romanovsky wrote:
> On Sun, Jun 11, 2017 at 08:44:49AM +0300, Yuval Shaia wrote:
> > usnic's get_netdev hook for struct ib_device is missing - add it.
> >
> > Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> > ---
> > Per Moni Shoua's suggestion - create seperate patch for this purpose.
> > ---
> >  drivers/infiniband/hw/usnic/usnic_ib_main.c  |  1 +
> >  drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 10 ++++++++++
> >  drivers/infiniband/hw/usnic/usnic_ib_verbs.h |  1 +
> >  3 files changed, 12 insertions(+)
> >
> > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> > index c0c1e8b..80577b9 100644
> > --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
> > +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> > @@ -409,6 +409,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
> >  	us_ibdev->ib_dev.query_port = usnic_ib_query_port;
> >  	us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
> >  	us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
> > +	us_ibdev->ib_dev.get_netdev = usnic_get_netdev;
> >  	us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;
> >  	us_ibdev->ib_dev.alloc_pd = usnic_ib_alloc_pd;
> >  	us_ibdev->ib_dev.dealloc_pd = usnic_ib_dealloc_pd;
> > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> > index 4996984..f9dc1e80 100644
> > --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> > +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> > @@ -424,6 +424,16 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
> >  	return 0;
> >  }
> >
> > +struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num)
> > +{
> > +	struct usnic_ib_dev *us_ibdev = to_usdev(device);
> > +
> > +	if (us_ibdev->netdev)
> > +		dev_hold(us_ibdev->netdev);
> 
> Who will release this reference?

I followed the instructions in struct ib_device so assuming the one that
calls get_netdev will do it.
See ib_cache_gid_add as an example.

Patch #2 aslo take care of it.

> 
> Thanks
> 
> > +
> > +	return us_ibdev->netdev;
> > +}
> > +
> >  int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
> >  				u16 *pkey)
> >  {
> > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> > index 172e43b..1fda944 100644
> > --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> > +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> > @@ -48,6 +48,7 @@ int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
> >  				struct ib_qp_init_attr *qp_init_attr);
> >  int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
> >  				union ib_gid *gid);
> > +struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num);
> >  int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
> >  				u16 *pkey);
> >  struct ib_pd *usnic_ib_alloc_pd(struct ib_device *ibdev,
> > --
> > 2.9.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

RE: [PATCH v3 1/2] IB/usnic: Implement get_netdev hook

[Christian Benvenuti (benve)]

> -----Original Message-----
> From: Yuval Shaia [mailto:yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org]
> Sent: Saturday, June 10, 2017 10:45 PM
> To: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org; sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org;
> selvin.xavier-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; devesh.sharma-dY08KVG/lbpWk0Htik3J/w@public.gmane.org;
> somnath.kotur-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; sriharsha.basavapatna-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; Christian
> Benvenuti (benve); Dave Goodell (dgoodell); monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org;
> leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org;
> dasaratharaman.chandramouli-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; sagi-TmH2Wj2nsNJBDLzU/O5InQ@public.gmane.org;
> bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org; yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org;
> linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Subject: [PATCH v3 1/2] IB/usnic: Implement get_netdev hook
> 
> usnic's get_netdev hook for struct ib_device is missing - add it.
> 
> Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>

Reviewed-by: Christian Benvenuti <benve-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>

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

RE: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Christian Benvenuti (benve)]

> -----Original Message-----
> From: Yuval Shaia [mailto:yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org]
> Sent: Saturday, June 10, 2017 10:45 PM
> To: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org; sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org;
> selvin.xavier-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; devesh.sharma-dY08KVG/lbpWk0Htik3J/w@public.gmane.org;
> somnath.kotur-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; sriharsha.basavapatna-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; Christian
> Benvenuti (benve); Dave Goodell (dgoodell); monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org;
> leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org;
> dasaratharaman.chandramouli-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; sagi-TmH2Wj2nsNJBDLzU/O5InQ@public.gmane.org;
> bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org; yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org;
> linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Subject: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from
> netdev
> 
> Logic of retrieving netdev speed from net_device and translating it to IB speed
> is implemented in rxe, in usnic and in bnxt drivers.
> 
> Define new function which merges all.
> 
> Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>

Minor nit in ib_get_eth_speed().

For the usnic bits:
Reviewed-by: Christian Benvenuti <benve-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>

> ---
> v0 -> v1:
> 	* Invite usnic to the party.
> v1 -> v2:
> 	* Utilize __ethtool_get_link_ksettings
> 	* Rename to ib_get_eth_speed
> 	* Add some validation checks
> 	* Implement get_netdev in usnic
> v2 -> v3:
> 	* Split to two separate patches
> ---
>  drivers/infiniband/core/verbs.c              | 55 ++++++++++++++++++++++++++++
>  drivers/infiniband/hw/bnxt_re/ib_verbs.c     | 49 ++-----------------------
>  drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 31 +++-------------
>  drivers/infiniband/sw/rxe/rxe_verbs.c        | 53 +++------------------------
>  include/rdma/ib_verbs.h                      |  1 +
>  5 files changed, 71 insertions(+), 118 deletions(-)
> 
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index 4792f52..19e6b78 100644
> --- a/drivers/infiniband/core/verbs.c
> +++ b/drivers/infiniband/core/verbs.c
> @@ -1253,6 +1253,61 @@ int ib_resolve_eth_dmac(struct ib_device *device,  }
> EXPORT_SYMBOL(ib_resolve_eth_dmac);
> 
> +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8
> +*width) {
> +	int rc;
> +	u32 netdev_speed;
> +	struct net_device *netdev;
> +	struct ethtool_link_ksettings lksettings;
> +
> +	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)
> +		return -EINVAL;
> +
> +	if (!dev->get_netdev)
> +		return -EINVAL;

-EOPNOTSUPP ?

> +	netdev = dev->get_netdev(dev, port_num);
> +	if (!netdev)
> +		return -EINVAL;
> +
> +	rtnl_lock();
> +	rc = __ethtool_get_link_ksettings(netdev, &lksettings);
> +	rtnl_unlock();
> +
> +	dev_put(netdev);
> +
> +	if (!rc) {
> +		netdev_speed = lksettings.base.speed;
> +	} else {
> +		netdev_speed = SPEED_1000;
> +		pr_warn("%s speed is unknown, defaulting to %d\n", netdev->name,
> +			netdev_speed);
> +	}
> +
> +	if (netdev_speed <= SPEED_1000) {
> +		*width = IB_WIDTH_1X;
> +		*speed = IB_SPEED_SDR;
> +	} else if (netdev_speed <= SPEED_10000) {
> +		*width = IB_WIDTH_1X;
> +		*speed = IB_SPEED_FDR10;
> +	} else if (netdev_speed <= SPEED_20000) {
> +		*width = IB_WIDTH_4X;
> +		*speed = IB_SPEED_DDR;
> +	} else if (netdev_speed <= SPEED_25000) {
> +		*width = IB_WIDTH_1X;
> +		*speed = IB_SPEED_EDR;
> +	} else if (netdev_speed <= SPEED_40000) {
> +		*width = IB_WIDTH_4X;
> +		*speed = IB_SPEED_FDR10;
> +	} else {
> +		*width = IB_WIDTH_4X;
> +		*speed = IB_SPEED_EDR;
> +	}
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL(ib_get_eth_speed);
> +
>  int ib_modify_qp(struct ib_qp *qp,
>  		 struct ib_qp_attr *qp_attr,
>  		 int qp_attr_mask)
> diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> index 7ba9e69..d0e0f90 100644
> --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> @@ -181,50 +181,6 @@ int bnxt_re_modify_device(struct ib_device *ibdev,
>  	return 0;
>  }
> 
> -static void __to_ib_speed_width(struct net_device *netdev, u8 *speed, u8
> *width) -{
> -	struct ethtool_link_ksettings lksettings;
> -	u32 espeed;
> -
> -	if (netdev->ethtool_ops && netdev->ethtool_ops->get_link_ksettings) {
> -		memset(&lksettings, 0, sizeof(lksettings));
> -		rtnl_lock();
> -		netdev->ethtool_ops->get_link_ksettings(netdev, &lksettings);
> -		rtnl_unlock();
> -		espeed = lksettings.base.speed;
> -	} else {
> -		espeed = SPEED_UNKNOWN;
> -	}
> -	switch (espeed) {
> -	case SPEED_1000:
> -		*speed = IB_SPEED_SDR;
> -		*width = IB_WIDTH_1X;
> -		break;
> -	case SPEED_10000:
> -		*speed = IB_SPEED_QDR;
> -		*width = IB_WIDTH_1X;
> -		break;
> -	case SPEED_20000:
> -		*speed = IB_SPEED_DDR;
> -		*width = IB_WIDTH_4X;
> -		break;
> -	case SPEED_25000:
> -		*speed = IB_SPEED_EDR;
> -		*width = IB_WIDTH_1X;
> -		break;
> -	case SPEED_40000:
> -		*speed = IB_SPEED_QDR;
> -		*width = IB_WIDTH_4X;
> -		break;
> -	case SPEED_50000:
> -		break;
> -	default:
> -		*speed = IB_SPEED_SDR;
> -		*width = IB_WIDTH_1X;
> -		break;
> -	}
> -}
> -
>  /* Port */
>  int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
>  		       struct ib_port_attr *port_attr) @@ -266,8 +222,9 @@ int
> bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
>  	 * IB stack to avoid race in the NETDEV_UNREG path
>  	 */
>  	if (test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags))
> -		__to_ib_speed_width(rdev->netdev, &port_attr->active_speed,
> -				    &port_attr->active_width);
> +		if (!ib_get_eth_speed(ibdev, port_num, &port_attr->active_speed,
> +				      &port_attr->active_width))
> +			return -EINVAL;
>  	return 0;
>  }
> 
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> index f9dc1e80..e5f57dd 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> @@ -226,27 +226,6 @@ static void qp_grp_destroy(struct usnic_ib_qp_grp *qp_grp)
>  	spin_unlock(&vf->lock);
>  }
> 
> -static void eth_speed_to_ib_speed(int speed, u8 *active_speed,
> -					u8 *active_width)
> -{
> -	if (speed <= 10000) {
> -		*active_width = IB_WIDTH_1X;
> -		*active_speed = IB_SPEED_FDR10;
> -	} else if (speed <= 20000) {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_DDR;
> -	} else if (speed <= 30000) {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_QDR;
> -	} else if (speed <= 40000) {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_FDR10;
> -	} else {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_EDR;
> -	}
> -}
> -
>  static int create_qp_validate_user_data(struct usnic_ib_create_qp_cmd cmd)  {
>  	if (cmd.spec.trans_type <= USNIC_TRANSPORT_UNKNOWN || @@ -326,12 +305,16
> @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
>  				struct ib_port_attr *props)
>  {
>  	struct usnic_ib_dev *us_ibdev = to_usdev(ibdev);
> -	struct ethtool_link_ksettings cmd;
> 
>  	usnic_dbg("\n");
> 
>  	mutex_lock(&us_ibdev->usdev_lock);
> -	__ethtool_get_link_ksettings(us_ibdev->netdev, &cmd);
> +	if (!ib_get_eth_speed(ibdev, port, &props->active_speed,
> +			      &props->active_width)) {
> +		mutex_unlock(&us_ibdev->usdev_lock);
> +		return -EINVAL;
> +	}
> +
>  	/* props being zeroed by the caller, avoid zeroing it here */
> 
>  	props->lid = 0;
> @@ -355,8 +338,6 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
>  	props->pkey_tbl_len = 1;
>  	props->bad_pkey_cntr = 0;
>  	props->qkey_viol_cntr = 0;
> -	eth_speed_to_ib_speed(cmd.base.speed, &props->active_speed,
> -			      &props->active_width);
>  	props->max_mtu = IB_MTU_4096;
>  	props->active_mtu = iboe_get_mtu(us_ibdev->ufdev->mtu);
>  	/* Userspace will adjust for hdrs */
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c
> b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index 83d709e..4570f04 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -51,40 +51,16 @@ static int rxe_query_device(struct ib_device *dev,
>  	return 0;
>  }
> 
> -static void rxe_eth_speed_to_ib_speed(int speed, u8 *active_speed,
> -				      u8 *active_width)
> -{
> -	if (speed <= 1000) {
> -		*active_width = IB_WIDTH_1X;
> -		*active_speed = IB_SPEED_SDR;
> -	} else if (speed <= 10000) {
> -		*active_width = IB_WIDTH_1X;
> -		*active_speed = IB_SPEED_FDR10;
> -	} else if (speed <= 20000) {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_DDR;
> -	} else if (speed <= 30000) {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_QDR;
> -	} else if (speed <= 40000) {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_FDR10;
> -	} else {
> -		*active_width = IB_WIDTH_4X;
> -		*active_speed = IB_SPEED_EDR;
> -	}
> -}
> -
>  static int rxe_query_port(struct ib_device *dev,
>  			  u8 port_num, struct ib_port_attr *attr)  {
>  	struct rxe_dev *rxe = to_rdev(dev);
>  	struct rxe_port *port;
> -	u32 speed;
> +	int rc = -EINVAL;
> 
>  	if (unlikely(port_num != 1)) {
>  		pr_warn("invalid port_number %d\n", port_num);
> -		goto err1;
> +		goto out;
>  	}
> 
>  	port = &rxe->port;
> @@ -93,29 +69,12 @@ static int rxe_query_port(struct ib_device *dev,
>  	*attr = port->attr;
> 
>  	mutex_lock(&rxe->usdev_lock);
> -	if (rxe->ndev->ethtool_ops->get_link_ksettings) {
> -		struct ethtool_link_ksettings ks;
> -
> -		rxe->ndev->ethtool_ops->get_link_ksettings(rxe->ndev, &ks);
> -		speed = ks.base.speed;
> -	} else if (rxe->ndev->ethtool_ops->get_settings) {
> -		struct ethtool_cmd cmd;
> -
> -		rxe->ndev->ethtool_ops->get_settings(rxe->ndev, &cmd);
> -		speed = cmd.speed;
> -	} else {
> -		pr_warn("%s speed is unknown, defaulting to 1000\n",
> -			rxe->ndev->name);
> -		speed = 1000;
> -	}
> -	rxe_eth_speed_to_ib_speed(speed, &attr->active_speed,
> -				  &attr->active_width);
> +	rc = ib_get_eth_speed(dev, port_num, &attr->active_speed,
> +			      &attr->active_width);
>  	mutex_unlock(&rxe->usdev_lock);
> 
> -	return 0;
> -
> -err1:
> -	return -EINVAL;
> +out:
> +	return rc;
>  }
> 
>  static int rxe_query_gid(struct ib_device *device, diff --git
> a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index ba8314e..860cb30
> 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -3488,6 +3488,7 @@ void ib_drain_qp(struct ib_qp *qp);
> 
>  int ib_resolve_eth_dmac(struct ib_device *device,
>  			struct rdma_ah_attr *ah_attr);
> +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8
> +*width);
> 
>  static inline u8 *rdma_ah_retrieve_dmac(struct rdma_ah_attr *attr)  {
> --
> 2.9.4

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

Re: [PATCH v3 1/2] IB/usnic: Implement get_netdev hook

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 2362 bytes --]

On Tue, Jun 13, 2017 at 10:35:03AM +0300, Yuval Shaia wrote:
> On Tue, Jun 13, 2017 at 10:25:26AM +0300, Leon Romanovsky wrote:
> > On Sun, Jun 11, 2017 at 08:44:49AM +0300, Yuval Shaia wrote:
> > > usnic's get_netdev hook for struct ib_device is missing - add it.
> > >
> > > Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> > > ---
> > > Per Moni Shoua's suggestion - create seperate patch for this purpose.
> > > ---
> > >  drivers/infiniband/hw/usnic/usnic_ib_main.c  |  1 +
> > >  drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 10 ++++++++++
> > >  drivers/infiniband/hw/usnic/usnic_ib_verbs.h |  1 +
> > >  3 files changed, 12 insertions(+)
> > >
> > > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> > > index c0c1e8b..80577b9 100644
> > > --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
> > > +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> > > @@ -409,6 +409,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
> > >  	us_ibdev->ib_dev.query_port = usnic_ib_query_port;
> > >  	us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
> > >  	us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
> > > +	us_ibdev->ib_dev.get_netdev = usnic_get_netdev;
> > >  	us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;
> > >  	us_ibdev->ib_dev.alloc_pd = usnic_ib_alloc_pd;
> > >  	us_ibdev->ib_dev.dealloc_pd = usnic_ib_dealloc_pd;
> > > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> > > index 4996984..f9dc1e80 100644
> > > --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> > > +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> > > @@ -424,6 +424,16 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
> > >  	return 0;
> > >  }
> > >
> > > +struct net_device *usnic_get_netdev(struct ib_device *device, u8 port_num)
> > > +{
> > > +	struct usnic_ib_dev *us_ibdev = to_usdev(device);
> > > +
> > > +	if (us_ibdev->netdev)
> > > +		dev_hold(us_ibdev->netdev);
> >
> > Who will release this reference?
>
> I followed the instructions in struct ib_device so assuming the one that
> calls get_netdev will do it.
> See ib_cache_gid_add as an example.
>
> Patch #2 aslo take care of it.
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

On Sun, Jun 11, 2017 at 08:44:50AM +0300, Yuval Shaia wrote:
> Logic of retrieving netdev speed from net_device and translating it to
> IB speed is implemented in rxe, in usnic and in bnxt drivers.
>
> Define new function which merges all.
>
> Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> ---
> v0 -> v1:
> 	* Invite usnic to the party.
> v1 -> v2:
> 	* Utilize __ethtool_get_link_ksettings
> 	* Rename to ib_get_eth_speed
> 	* Add some validation checks
> 	* Implement get_netdev in usnic
> v2 -> v3:
> 	* Split to two separate patches
> ---
>  drivers/infiniband/core/verbs.c              | 55 ++++++++++++++++++++++++++++
>  drivers/infiniband/hw/bnxt_re/ib_verbs.c     | 49 ++-----------------------
>  drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 31 +++-------------
>  drivers/infiniband/sw/rxe/rxe_verbs.c        | 53 +++------------------------
>  include/rdma/ib_verbs.h                      |  1 +
>  5 files changed, 71 insertions(+), 118 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Yuval Shaia]

On Tue, Jun 13, 2017 at 08:07:48AM +0000, Christian Benvenuti (benve) wrote:
> > 
> > +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8
> > +*width) {
> > +	int rc;
> > +	u32 netdev_speed;
> > +	struct net_device *netdev;
> > +	struct ethtool_link_ksettings lksettings;
> > +
> > +	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)
> > +		return -EINVAL;
> > +
> > +	if (!dev->get_netdev)
> > +		return -EINVAL;
> 
> -EOPNOTSUPP ?

Looks better.
Assuming the same should be for the above one and the one below, right?

> 
> > +	netdev = dev->get_netdev(dev, port_num);
> > +	if (!netdev)
> > +		return -EINVAL;
> > +
> > +	rtnl_lock();
> > +	rc = __ethtool_get_link_ksettings(netdev, &lksettings);
> > +	rtnl_unlock();
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Christian Benvenuti (benve)]

> -----Original Message-----
> From: Yuval Shaia [mailto:yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org]
> Sent: Wednesday, June 14, 2017 6:03 AM
> To: Christian Benvenuti (benve)
> Cc: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org; sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org;
> selvin.xavier-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; devesh.sharma-dY08KVG/lbpWk0Htik3J/w@public.gmane.org;
> somnath.kotur-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; sriharsha.basavapatna-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; Dave Goodell
> (dgoodell); monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org;
> dasaratharaman.chandramouli-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; sagi-TmH2Wj2nsNJBDLzU/O5InQ@public.gmane.org;
> bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org; yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; linux-rdma-u79uwXL29TasMV2rI37PzA@public.gmane.orgorg
> Subject: Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed
> from netdev
> 
> On Tue, Jun 13, 2017 at 08:07:48AM +0000, Christian Benvenuti (benve) wrote:
> > >
> > > +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8
> > > +*width) {
> > > +	int rc;
> > > +	u32 netdev_speed;
> > > +	struct net_device *netdev;
> > > +	struct ethtool_link_ksettings lksettings;
> > > +
> > > +	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)
> > > +		return -EINVAL;
> > > +
> > > +	if (!dev->get_netdev)
> > > +		return -EINVAL;
> >
> > -EOPNOTSUPP ?
> 
> Looks better.
> Assuming the same should be for the above one and the one below, right?

I am not sure about the other two:
- rdma_port_get_link_layer() does not entirely depend on ib_device->get_link_layer()
- ib_device->get_netdev() can fail for different reasons I guess

/Chris

> >
> > > +	netdev = dev->get_netdev(dev, port_num);
> > > +	if (!netdev)
> > > +		return -EINVAL;
> > > +
> > > +	rtnl_lock();
> > > +	rc = __ethtool_get_link_ksettings(netdev, &lksettings);
> > > +	rtnl_unlock();
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Selvin Xavier]

On Sun, Jun 11, 2017 at 11:14 AM, Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> index 7ba9e69..d0e0f90 100644
> --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> @@ -181,50 +181,6 @@ int bnxt_re_modify_device(struct ib_device *ibdev,
>         return 0;
>  }
>
> -static void __to_ib_speed_width(struct net_device *netdev, u8 *speed, u8 *width)
> -{
> -       struct ethtool_link_ksettings lksettings;
> -       u32 espeed;
> -
> -       if (netdev->ethtool_ops && netdev->ethtool_ops->get_link_ksettings) {
> -               memset(&lksettings, 0, sizeof(lksettings));
> -               rtnl_lock();
> -               netdev->ethtool_ops->get_link_ksettings(netdev, &lksettings);
> -               rtnl_unlock();
> -               espeed = lksettings.base.speed;
> -       } else {
> -               espeed = SPEED_UNKNOWN;
> -       }
> -       switch (espeed) {
> -       case SPEED_1000:
> -               *speed = IB_SPEED_SDR;
> -               *width = IB_WIDTH_1X;
> -               break;
> -       case SPEED_10000:
> -               *speed = IB_SPEED_QDR;
> -               *width = IB_WIDTH_1X;
> -               break;
> -       case SPEED_20000:
> -               *speed = IB_SPEED_DDR;
> -               *width = IB_WIDTH_4X;
> -               break;
> -       case SPEED_25000:
> -               *speed = IB_SPEED_EDR;
> -               *width = IB_WIDTH_1X;
> -               break;
> -       case SPEED_40000:
> -               *speed = IB_SPEED_QDR;
> -               *width = IB_WIDTH_4X;
> -               break;
> -       case SPEED_50000:
> -               break;
> -       default:
> -               *speed = IB_SPEED_SDR;
> -               *width = IB_WIDTH_1X;
> -               break;
> -       }
> -}
> -
>  /* Port */
>  int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
>                        struct ib_port_attr *port_attr)
> @@ -266,8 +222,9 @@ int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
>          * IB stack to avoid race in the NETDEV_UNREG path
>          */
>         if (test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags))
> -               __to_ib_speed_width(rdev->netdev, &port_attr->active_speed,
> -                                   &port_attr->active_width);
> +               if (!ib_get_eth_speed(ibdev, port_num, &port_attr->active_speed,
> +                                     &port_attr->active_width))
> +                       return -EINVAL;
>         return 0;
>  }

The bnxt_re changes looks good to me.

But this change conflicts with one of the patches i submitted as a
part of the bug fix series.

https://patchwork.kernel.org/patch/9786057/

Depending on the order in which Doug pulls these patches, one of us
might have to
re-spin the patch.

Thanks,
Selvin Xavier
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Yuval Shaia]

On Wed, Jun 14, 2017 at 03:04:43PM +0000, Christian Benvenuti (benve) wrote:
> > -----Original Message-----
> > From: Yuval Shaia [mailto:yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org]
> > Sent: Wednesday, June 14, 2017 6:03 AM
> > To: Christian Benvenuti (benve)
> > Cc: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org; sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org;
> > selvin.xavier-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; devesh.sharma-dY08KVG/lbpWk0Htik3J/w@public.gmane.org;
> > somnath.kotur-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; sriharsha.basavapatna-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; Dave Goodell
> > (dgoodell); monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org;
> > dasaratharaman.chandramouli-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; sagi-TmH2Wj2nsNJBDLzU/O5InQ@public.gmane.org;
> > bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org; yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > Subject: Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed
> > from netdev
> > 
> > On Tue, Jun 13, 2017 at 08:07:48AM +0000, Christian Benvenuti (benve) wrote:
> > > >
> > > > +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8
> > > > +*width) {
> > > > +	int rc;
> > > > +	u32 netdev_speed;
> > > > +	struct net_device *netdev;
> > > > +	struct ethtool_link_ksettings lksettings;
> > > > +
> > > > +	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)
> > > > +		return -EINVAL;
> > > > +
> > > > +	if (!dev->get_netdev)
> > > > +		return -EINVAL;
> > >
> > > -EOPNOTSUPP ?
> > 
> > Looks better.
> > Assuming the same should be for the above one and the one below, right?
> 
> I am not sure about the other two:
> - rdma_port_get_link_layer() does not entirely depend on ib_device->get_link_layer()
> - ib_device->get_netdev() can fail for different reasons I guess

I see,

So back to your proposal, the fact that dev->get_netdev is not set means
that the IB device is not relayed on Ethernet one (RoCE folks, correct me
if i'm wrong) so with the given input - the operation is not supported. Is
that means that -EINVAL is better than -EOPNOTSUPP?

As far as the name suggest, EINVAL is where input values are wrong while
EOPNOTSUPP is where input values are fine but the operation is not
supported.

Yuval

> 
> /Chris
> 
> > >
> > > > +	netdev = dev->get_netdev(dev, port_num);
> > > > +	if (!netdev)
> > > > +		return -EINVAL;
> > > > +
> > > > +	rtnl_lock();
> > > > +	rc = __ethtool_get_link_ksettings(netdev, &lksettings);
> > > > +	rtnl_unlock();
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Yuval Shaia]

On Wed, Jun 14, 2017 at 10:14:07PM +0300, Yuval Shaia wrote:
> On Wed, Jun 14, 2017 at 03:04:43PM +0000, Christian Benvenuti (benve) wrote:
> > > -----Original Message-----
> > > From: Yuval Shaia [mailto:yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org]
> > > Sent: Wednesday, June 14, 2017 6:03 AM
> > > To: Christian Benvenuti (benve)
> > > Cc: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org; sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org;
> > > selvin.xavier-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; devesh.sharma-dY08KVG/lbpWk0Htik3J/w@public.gmane.org;
> > > somnath.kotur-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; sriharsha.basavapatna-dY08KVG/lbpWk0Htik3J/w@public.gmane.org; Dave Goodell
> > > (dgoodell); monis-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org;
> > > dasaratharaman.chandramouli-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org; sagi-TmH2Wj2nsNJBDLzU/O5InQ@public.gmane.org;
> > > bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org; yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org; linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > > Subject: Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed
> > > from netdev
> > > 
> > > On Tue, Jun 13, 2017 at 08:07:48AM +0000, Christian Benvenuti (benve) wrote:
> > > > >
> > > > > +int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8
> > > > > +*width) {
> > > > > +	int rc;
> > > > > +	u32 netdev_speed;
> > > > > +	struct net_device *netdev;
> > > > > +	struct ethtool_link_ksettings lksettings;
> > > > > +
> > > > > +	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)
> > > > > +		return -EINVAL;
> > > > > +
> > > > > +	if (!dev->get_netdev)
> > > > > +		return -EINVAL;
> > > >
> > > > -EOPNOTSUPP ?
> > > 
> > > Looks better.
> > > Assuming the same should be for the above one and the one below, right?
> > 
> > I am not sure about the other two:
> > - rdma_port_get_link_layer() does not entirely depend on ib_device->get_link_layer()
> > - ib_device->get_netdev() can fail for different reasons I guess
> 
> I see,
> 
> So back to your proposal, the fact that dev->get_netdev is not set means
> that the IB device is not relayed on Ethernet one (RoCE folks, correct me
> if i'm wrong) so with the given input - the operation is not supported. Is
> that means that -EINVAL is better than -EOPNOTSUPP?
> 
> As far as the name suggest, EINVAL is where input values are wrong while
> EOPNOTSUPP is where input values are fine but the operation is not
> supported.

Please ignore, i looked at some other places.
Will post v4 soon.

> 
> Yuval
> 
> > 
> > /Chris
> > 
> > > >
> > > > > +	netdev = dev->get_netdev(dev, port_num);
> > > > > +	if (!netdev)
> > > > > +		return -EINVAL;
> > > > > +
> > > > > +	rtnl_lock();
> > > > > +	rc = __ethtool_get_link_ksettings(netdev, &lksettings);
> > > > > +	rtnl_unlock();
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] IB/core: Add generic function to extract IB speed from netdev

[Yuval Shaia]

On Wed, Jun 14, 2017 at 08:45:12PM +0530, Selvin Xavier wrote:
> On Sun, Jun 11, 2017 at 11:14 AM, Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> > diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> > index 7ba9e69..d0e0f90 100644
> > --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> > +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> > @@ -181,50 +181,6 @@ int bnxt_re_modify_device(struct ib_device *ibdev,
> >         return 0;
> >  }
> >
> > -static void __to_ib_speed_width(struct net_device *netdev, u8 *speed, u8 *width)
> > -{
> > -       struct ethtool_link_ksettings lksettings;
> > -       u32 espeed;
> > -
> > -       if (netdev->ethtool_ops && netdev->ethtool_ops->get_link_ksettings) {
> > -               memset(&lksettings, 0, sizeof(lksettings));
> > -               rtnl_lock();
> > -               netdev->ethtool_ops->get_link_ksettings(netdev, &lksettings);
> > -               rtnl_unlock();
> > -               espeed = lksettings.base.speed;
> > -       } else {
> > -               espeed = SPEED_UNKNOWN;
> > -       }
> > -       switch (espeed) {
> > -       case SPEED_1000:
> > -               *speed = IB_SPEED_SDR;
> > -               *width = IB_WIDTH_1X;
> > -               break;
> > -       case SPEED_10000:
> > -               *speed = IB_SPEED_QDR;
> > -               *width = IB_WIDTH_1X;
> > -               break;
> > -       case SPEED_20000:
> > -               *speed = IB_SPEED_DDR;
> > -               *width = IB_WIDTH_4X;
> > -               break;
> > -       case SPEED_25000:
> > -               *speed = IB_SPEED_EDR;
> > -               *width = IB_WIDTH_1X;
> > -               break;
> > -       case SPEED_40000:
> > -               *speed = IB_SPEED_QDR;
> > -               *width = IB_WIDTH_4X;
> > -               break;
> > -       case SPEED_50000:
> > -               break;
> > -       default:
> > -               *speed = IB_SPEED_SDR;
> > -               *width = IB_WIDTH_1X;
> > -               break;
> > -       }
> > -}
> > -
> >  /* Port */
> >  int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
> >                        struct ib_port_attr *port_attr)
> > @@ -266,8 +222,9 @@ int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,
> >          * IB stack to avoid race in the NETDEV_UNREG path
> >          */
> >         if (test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags))
> > -               __to_ib_speed_width(rdev->netdev, &port_attr->active_speed,
> > -                                   &port_attr->active_width);
> > +               if (!ib_get_eth_speed(ibdev, port_num, &port_attr->active_speed,
> > +                                     &port_attr->active_width))
> > +                       return -EINVAL;
> >         return 0;
> >  }
> 
> The bnxt_re changes looks good to me.
> 
> But this change conflicts with one of the patches i submitted as a
> part of the bug fix series.
> 
> https://patchwork.kernel.org/patch/9786057/
> 
> Depending on the order in which Doug pulls these patches, one of us
> might have to
> re-spin the patch.

Doug, you want me to rebase v4 of the patch on top of the above?

> 
> Thanks,
> Selvin Xavier
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html