On Thu, Apr 20, 2017 at 04:15:41AM -0400, Zhu Yanjun wrote:
> In order to let the bonding driver report the correct speed
> of the underlaying interfaces, when they are IPoIB, the ethtool
> function get_settings() in the IPoIB driver is implemented.
>
> Run ethtool command, the result is as below:
>
> [root@xxx ~]#ethtool ib0
> Settings for ib0:
> Supported ports: [ ]
> Supported link modes: Not reported
> Supported pause frame use: No
> Supports auto-negotiation: No
> Advertised link modes: Not reported
> Advertised pause frame use: No
> Advertised auto-negotiation: No
> Speed: 40000Mb/s
> Duplex: Full
> Port: Twisted Pair
> PHYAD: 0
> Transceiver: internal
> Auto-negotiation: off
> MDI-X: Unknown
>
> The speed of ipoib can be reached.
>
> Cc: Joe Jin <joe.jin@xxxxxxxxxx>
> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
> Reviewed-by: Håkon Bugge <haakon.bugge@xxxxxxxxxx>
> Reviewed-by: Yuval Shaia <yuval.shaia@xxxxxxxxxx>
> Reviewed-by: Wengang Wang <wen.gang.wang@xxxxxxxxxx>
> Signed-off-by: Zhu Yanjun <yanjun.zhu@xxxxxxxxxx>
> ---
> drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 51 ++++++++++++++++++++++++++++
> 1 file changed, 51 insertions(+)
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
> index bac455a..8c81566 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
> @@ -155,7 +155,58 @@ static int ipoib_get_sset_count(struct net_device __always_unused *dev,
> return -EOPNOTSUPP;
> }
>
> +static int ipoib_get_settings(struct net_device *netdev,
> + struct ethtool_cmd *ecmd)
> +{
> + struct ipoib_dev_priv *priv = netdev_priv(netdev);
> + struct ib_port_attr attr;
> + u32 speed;
> + int ret;
> +
> + if (!netif_carrier_ok(netdev)) {
> + ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
> + ecmd->duplex = DUPLEX_UNKNOWN;
> + return 0;
> + }
> +
> + ret = ib_query_port(priv->ca, priv->port, &attr);
> + if (ret)
> + return ret;
> +
> + switch (attr.active_speed) {
> + case IB_SPEED_DDR:
> + speed = 5000; /* in deci-Mb/sec */
> + break;
> + case IB_SPEED_QDR:
> + speed = 10000;
> + break;
> + case IB_SPEED_FDR10:
> + speed = 10000;
> + break;
> + case IB_SPEED_FDR:
> + speed = 14000;
> + break;
> + case IB_SPEED_EDR:
> + speed = 25000;
> + break;
> + case IB_SPEED_SDR:
> + default:
> + speed = 2500;
> + break;
> + }
Can you consider using the constants from ethtool.h instead of the above
numbers?
> +
> + speed *= ib_width_enum_to_int(attr.active_width);
> + if (speed < 0)
> + return -EINVAL;
> +
> + ethtool_cmd_speed_set(ecmd, speed);
> + ecmd->duplex = DUPLEX_FULL;
> +
> + return 0;
> +}
> +
> static const struct ethtool_ops ipoib_ethtool_ops = {
> + .get_settings = ipoib_get_settings,
> .get_drvinfo = ipoib_get_drvinfo,
> .get_coalesce = ipoib_get_coalesce,
> .set_coalesce = ipoib_set_coalesce,
> --
> 2.7.4
>
--
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
