mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
919dce2470
The majority of the patches are cleanups, refactorings and clarity improvements - Various driver updates for siw, bnxt_re, rxe, efa, mlx5, hfi1 - Lots of cleanup patches for hns - Convert more places to use refcount - Aggressively lock the RDMA CM code that syzkaller says isn't working - Work to clarify ib_cm - Use the new ib_device lifecycle model in bnxt_re - Fix mlx5's MR cache which seems to be failing more often with the new ODP code - mlx5 'dynamic uar' and 'tx steering' user interfaces -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfB7FMLh+8QxL+6i3OG33FX4gmxoFAl6CSr0ACgkQOG33FX4g mxrtKg//XovbOfYAO7nC05FtGz9iEkIUBiwQOjUojgNSi6RMNDqRW1bmqKUugm1o 9nXA6tw+fueEvUNSD541SCcxkUZJzWvubO9wHB6N3Fgy68N3Vf2rKV3EBBTh99rK Cb7rnmTTN6izRyI1wdyP2sjDJGyF8zvsgIrG2sibzLnqlyScrnD98YS0FdPZUfOa a1mmXBN/T7eaQ4TbE3lLLzGnifRlGmZ5vxEvOQmAlOdqAfIKQdbbW7oCRLVIleso gfQlOOvIgzHRwQ3VrFa3i6ETYtywXq7EgmQxCjqPVJQjCA79n5TLBkP1iRhvn8xi 3+LO4YCkiSJ/NjTA2d9KwT6K4djj3cYfcueuqo2MoXXr0YLiY6TLv1OffKcUIq7c LM3d4CSwIAG+C2FZwaQrdSGa2h/CNfLAEeKxv430zggeDNKlwHJPV5w3rUJ8lT56 wlyT7Lzosl0O9Z/1BSLYckTvbBCtYcmanVyCfHG8EJKAM1/tXy5LS8btJ3e51rPu XekR9ELrTTA2CTuoSCQGP6J0dBD2U7qO4XRCQ9N5BYLrI6RdP7Z4xYzzey49Z3Cx JaF86eurM7nS5biUszTtwww8AJMyYicB+0VyjBfk+mhv90w8tS1vZ1aZKzaQ1L6Z jWn8WgIN4rWY0YGQs6PiovT1FplyGs3p1wNmjn92WO0wZZ3WsmQ= =ae+a -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma Pull rdma updates from Jason Gunthorpe: "The majority of the patches are cleanups, refactorings and clarity improvements. This cycle saw some more activity from Syzkaller, I think we are now clean on all but one of those bugs, including the long standing and obnoxious rdma_cm locking design defect. Continue to see many drivers getting cleanups, with a few new user visible features. Summary: - Various driver updates for siw, bnxt_re, rxe, efa, mlx5, hfi1 - Lots of cleanup patches for hns - Convert more places to use refcount - Aggressively lock the RDMA CM code that syzkaller says isn't working - Work to clarify ib_cm - Use the new ib_device lifecycle model in bnxt_re - Fix mlx5's MR cache which seems to be failing more often with the new ODP code - mlx5 'dynamic uar' and 'tx steering' user interfaces" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (144 commits) RDMA/bnxt_re: make bnxt_re_ib_init static IB/qib: Delete struct qib_ivdev.qp_rnd RDMA/hns: Fix uninitialized variable bug RDMA/hns: Modify the mask of QP number for CQE of hip08 RDMA/hns: Reduce the maximum number of extend SGE per WQE RDMA/hns: Reduce PFC frames in congestion scenarios RDMA/mlx5: Add support for RDMA TX flow table net/mlx5: Add support for RDMA TX steering IB/hfi1: Call kobject_put() when kobject_init_and_add() fails IB/hfi1: Fix memory leaks in sysfs registration and unregistration IB/mlx5: Move to fully dynamic UAR mode once user space supports it IB/mlx5: Limit the scope of struct mlx5_bfreg_info to mlx5_ib IB/mlx5: Extend QP creation to get uar page index from user space IB/mlx5: Extend CQ creation to get uar page index from user space IB/mlx5: Expose UAR object and its alloc/destroy commands IB/hfi1: Get rid of a warning RDMA/hns: Remove redundant judgment of qp_type RDMA/hns: Remove redundant assignment of wc->smac when polling cq RDMA/hns: Remove redundant qpc setup operations RDMA/hns: Remove meaningless prints ...
228 lines
6.1 KiB
C
228 lines
6.1 KiB
C
/*
|
|
* Copyright (c) 2007 Mellanox Technologies. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/netdevice.h>
|
|
|
|
#include "ipoib.h"
|
|
|
|
struct ipoib_stats {
|
|
char stat_string[ETH_GSTRING_LEN];
|
|
int stat_offset;
|
|
};
|
|
|
|
#define IPOIB_NETDEV_STAT(m) { \
|
|
.stat_string = #m, \
|
|
.stat_offset = offsetof(struct rtnl_link_stats64, m) }
|
|
|
|
static const struct ipoib_stats ipoib_gstrings_stats[] = {
|
|
IPOIB_NETDEV_STAT(rx_packets),
|
|
IPOIB_NETDEV_STAT(tx_packets),
|
|
IPOIB_NETDEV_STAT(rx_bytes),
|
|
IPOIB_NETDEV_STAT(tx_bytes),
|
|
IPOIB_NETDEV_STAT(tx_errors),
|
|
IPOIB_NETDEV_STAT(rx_dropped),
|
|
IPOIB_NETDEV_STAT(tx_dropped),
|
|
IPOIB_NETDEV_STAT(multicast),
|
|
};
|
|
|
|
#define IPOIB_GLOBAL_STATS_LEN ARRAY_SIZE(ipoib_gstrings_stats)
|
|
|
|
static void ipoib_get_drvinfo(struct net_device *netdev,
|
|
struct ethtool_drvinfo *drvinfo)
|
|
{
|
|
struct ipoib_dev_priv *priv = ipoib_priv(netdev);
|
|
|
|
ib_get_device_fw_str(priv->ca, drvinfo->fw_version);
|
|
|
|
strlcpy(drvinfo->bus_info, dev_name(priv->ca->dev.parent),
|
|
sizeof(drvinfo->bus_info));
|
|
|
|
strlcpy(drvinfo->driver, "ib_ipoib", sizeof(drvinfo->driver));
|
|
}
|
|
|
|
static int ipoib_get_coalesce(struct net_device *dev,
|
|
struct ethtool_coalesce *coal)
|
|
{
|
|
struct ipoib_dev_priv *priv = ipoib_priv(dev);
|
|
|
|
coal->rx_coalesce_usecs = priv->ethtool.coalesce_usecs;
|
|
coal->rx_max_coalesced_frames = priv->ethtool.max_coalesced_frames;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ipoib_set_coalesce(struct net_device *dev,
|
|
struct ethtool_coalesce *coal)
|
|
{
|
|
struct ipoib_dev_priv *priv = ipoib_priv(dev);
|
|
int ret;
|
|
|
|
/*
|
|
* These values are saved in the private data and returned
|
|
* when ipoib_get_coalesce() is called
|
|
*/
|
|
if (coal->rx_coalesce_usecs > 0xffff ||
|
|
coal->rx_max_coalesced_frames > 0xffff)
|
|
return -EINVAL;
|
|
|
|
ret = rdma_set_cq_moderation(priv->recv_cq,
|
|
coal->rx_max_coalesced_frames,
|
|
coal->rx_coalesce_usecs);
|
|
if (ret && ret != -EOPNOTSUPP) {
|
|
ipoib_warn(priv, "failed modifying CQ (%d)\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
priv->ethtool.coalesce_usecs = coal->rx_coalesce_usecs;
|
|
priv->ethtool.max_coalesced_frames = coal->rx_max_coalesced_frames;
|
|
|
|
return 0;
|
|
}
|
|
static void ipoib_get_ethtool_stats(struct net_device *dev,
|
|
struct ethtool_stats __always_unused *stats,
|
|
u64 *data)
|
|
{
|
|
int i;
|
|
struct net_device_stats *net_stats = &dev->stats;
|
|
u8 *p = (u8 *)net_stats;
|
|
|
|
for (i = 0; i < IPOIB_GLOBAL_STATS_LEN; i++)
|
|
data[i] = *(u64 *)(p + ipoib_gstrings_stats[i].stat_offset);
|
|
|
|
}
|
|
static void ipoib_get_strings(struct net_device __always_unused *dev,
|
|
u32 stringset, u8 *data)
|
|
{
|
|
u8 *p = data;
|
|
int i;
|
|
|
|
switch (stringset) {
|
|
case ETH_SS_STATS:
|
|
for (i = 0; i < IPOIB_GLOBAL_STATS_LEN; i++) {
|
|
memcpy(p, ipoib_gstrings_stats[i].stat_string,
|
|
ETH_GSTRING_LEN);
|
|
p += ETH_GSTRING_LEN;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
static int ipoib_get_sset_count(struct net_device __always_unused *dev,
|
|
int sset)
|
|
{
|
|
switch (sset) {
|
|
case ETH_SS_STATS:
|
|
return IPOIB_GLOBAL_STATS_LEN;
|
|
default:
|
|
break;
|
|
}
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
/* Return lane speed in unit of 1e6 bit/sec */
|
|
static inline int ib_speed_enum_to_int(int speed)
|
|
{
|
|
switch (speed) {
|
|
case IB_SPEED_SDR:
|
|
return SPEED_2500;
|
|
case IB_SPEED_DDR:
|
|
return SPEED_5000;
|
|
case IB_SPEED_QDR:
|
|
case IB_SPEED_FDR10:
|
|
return SPEED_10000;
|
|
case IB_SPEED_FDR:
|
|
return SPEED_14000;
|
|
case IB_SPEED_EDR:
|
|
return SPEED_25000;
|
|
}
|
|
|
|
return SPEED_UNKNOWN;
|
|
}
|
|
|
|
static int ipoib_get_link_ksettings(struct net_device *netdev,
|
|
struct ethtool_link_ksettings *cmd)
|
|
{
|
|
struct ipoib_dev_priv *priv = ipoib_priv(netdev);
|
|
struct ib_port_attr attr;
|
|
int ret, speed, width;
|
|
|
|
if (!netif_carrier_ok(netdev)) {
|
|
cmd->base.speed = SPEED_UNKNOWN;
|
|
cmd->base.duplex = DUPLEX_UNKNOWN;
|
|
return 0;
|
|
}
|
|
|
|
ret = ib_query_port(priv->ca, priv->port, &attr);
|
|
if (ret < 0)
|
|
return -EINVAL;
|
|
|
|
speed = ib_speed_enum_to_int(attr.active_speed);
|
|
width = ib_width_enum_to_int(attr.active_width);
|
|
|
|
if (speed < 0 || width < 0)
|
|
return -EINVAL;
|
|
|
|
/* Except the following are set, the other members of
|
|
* the struct ethtool_link_settings are initialized to
|
|
* zero in the function __ethtool_get_link_ksettings.
|
|
*/
|
|
cmd->base.speed = speed * width;
|
|
cmd->base.duplex = DUPLEX_FULL;
|
|
|
|
cmd->base.phy_address = 0xFF;
|
|
|
|
cmd->base.autoneg = AUTONEG_ENABLE;
|
|
cmd->base.port = PORT_OTHER;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct ethtool_ops ipoib_ethtool_ops = {
|
|
.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
|
|
ETHTOOL_COALESCE_RX_MAX_FRAMES,
|
|
.get_link_ksettings = ipoib_get_link_ksettings,
|
|
.get_drvinfo = ipoib_get_drvinfo,
|
|
.get_coalesce = ipoib_get_coalesce,
|
|
.set_coalesce = ipoib_set_coalesce,
|
|
.get_strings = ipoib_get_strings,
|
|
.get_ethtool_stats = ipoib_get_ethtool_stats,
|
|
.get_sset_count = ipoib_get_sset_count,
|
|
.get_link = ethtool_op_get_link,
|
|
};
|
|
|
|
void ipoib_set_ethtool_ops(struct net_device *dev)
|
|
{
|
|
dev->ethtool_ops = &ipoib_ethtool_ops;
|
|
}
|