Fix in-kernel active_speed type
Subsystems (10)
cover Fix in-kernel active_speed type
From: Leon Romanovsky <[email protected]>
IBTA declares speed as 16 bits, but kernel stores it in u8. This series fixes in-kernel declaration while keeping external interface intact.
Thanks
Aharon Landau (3):
net/mlx5: Refactor query port speed functions RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
RDMA: Fix link active_speed size
.../infiniband/core/uverbs_std_types_device.c | 3 +- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +- drivers/infiniband/hw/hfi1/verbs.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 41 +++++++------------ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/qedr/verbs.c | 2 +- drivers/infiniband/hw/qib/qib.h | 6 +-- .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- .../mellanox/mlx5/core/ipoib/ethtool.c | 31 ++------------ .../net/ethernet/mellanox/mlx5/core/port.c | 23 ++--------- include/linux/mlx5/port.h | 15 +++++-- include/rdma/ib_verbs.h | 4 +- 13 files changed, 47 insertions(+), 88 deletions(-)
--
2.26.2
PATCH 1/3 net/mlx5: Refactor query port speed functions
From: Aharon Landau <[email protected]>
The functions mlx5_query_port_link_width_oper and mlx5_query_port_ib_proto_oper are always called together, so combine them to a new function called mlx5_query_port_oper to avoid duplication.
And while the mlx5i_get_port_settings is the same as mlx5_query_port_oper therefore let's remove it.
According to the IB spec link_width_oper and ib_proto_oper should be u16 and not as written u8, so perform casting as a preparation to cross-RDMA patch which will fix that type for all drivers in the RDMA subsystem.
--- drivers/infiniband/hw/mlx5/main.c | 23 ++++++++----------- .../mellanox/mlx5/core/ipoib/ethtool.c | 23 ++++--------------- .../net/ethernet/mellanox/mlx5/core/port.c | 23 ++++--------------- include/linux/mlx5/port.h | 7 +++--- 4 files changed, 21 insertions(+), 55 deletions(-)
drivers/infiniband/hw/mlx5/main.c +10 -13
@@ -326,8 +326,8 @@ void mlx5_ib_put_native_port_mdev(struct mlx5_ib_dev *ibdev, u8 port_num)spin_unlock (&port->mp.mpi_lock); } -static int translate_eth_legacy_proto_oper (u32 eth_proto_oper,u8 *active_speed, -u8 *active_width) +static int translate_eth_legacy_proto_oper (u32 eth_proto_oper, +u16 *active_speed,u8 *active_width) {switch (eth_proto_oper) {case MLX5E_PROT_MASK (MLX5E_1000BASE_CX_SGMII ):
@@ -384,7 +384,7 @@ static int translate_eth_legacy_proto_oper(u32 eth_proto_oper, u8 *active_speed,return 0 ; } -static int translate_eth_ext_proto_oper (u32 eth_proto_oper,u8 *active_speed, +static int translate_eth_ext_proto_oper (u32 eth_proto_oper,u16 *active_speed,u8 *active_width) {switch (eth_proto_oper) {
@@ -436,7 +436,7 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u8 *active_speed,return 0 ; } -static int translate_eth_proto_oper (u32 eth_proto_oper,u8 *active_speed, +static int translate_eth_proto_oper (u32 eth_proto_oper,u16 *active_speed,u8 *active_width,bool ext) { return ext ?
@@ -490,7 +490,7 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, props->active_width =IB_WIDTH_4X ; props->active_speed =IB_SPEED_QDR ; -translate_eth_proto_oper (eth_prot_oper, &props->active_speed, +translate_eth_proto_oper (eth_prot_oper, (u16 *)&props->active_speed, &props->active_width, ext); props->port_cap_flags |=IB_PORT_CM_SUP ;
@@ -1183,8 +1183,8 @@ enum mlx5_ib_width { MLX5_IB_WIDTH_12X = 1 << 4 }; -static void translate_active_width (struct ib_device *ibdev,u8 active_width, -u8 *ib_width) +static void translate_active_width (struct ib_device *ibdev,u16 active_width, +u8 *ib_width) {struct mlx5_ib_dev *dev =to_mdev (ibdev);
@@ -1277,7 +1277,7 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port,u16 max_mtu;u16 oper_mtu;int err; -u8 ib_link_width_oper; +u16 ib_link_width_oper;u8 vl_hw_cap; rep =kzalloc (sizeof (*rep),GFP_KERNEL );
@@ -1310,16 +1310,13 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port,if (props->port_cap_flags &IB_PORT_CAP_MASK2_SUP ) props->port_cap_flags2 = rep->cap_mask2; - err =mlx5_query_port_link_width_oper (mdev, &ib_link_width_oper, port); + err =mlx5_query_ib_port_oper (mdev, &ib_link_width_oper, + (u16 *)&props->active_speed, port);if (err) goto out;translate_active_width (ibdev, ib_link_width_oper, &props->active_width); - err =mlx5_query_port_ib_proto_oper (mdev, &props->active_speed, port); -if (err) - goto out; -mlx5_query_port_max_mtu (mdev, &max_mtu, port); props->max_mtu =mlx5_mtu_to_ib_mtu (max_mtu);
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c +4 -19
@@ -174,24 +174,6 @@ static inline int mlx5_ptys_rate_enum_to_int(enum mlx5_ptys_rate rate) } } -static int mlx5i_get_port_settings (struct net_device *netdev, -u16 *ib_link_width_oper,u16 *ib_proto_oper) -{ -struct mlx5e_priv *priv =mlx5i_epriv (netdev); -struct mlx5_core_dev *mdev = priv->mdev; -u32 out[MLX5_ST_SZ_DW (ptys_reg)] = {0 }; -int ret; - - ret =mlx5_query_port_ptys (mdev, out,sizeof (out),MLX5_PTYS_IB ,1 ); -if (ret) -return ret; - - *ib_link_width_oper =MLX5_GET (ptys_reg, out, ib_link_width_oper); - *ib_proto_oper =MLX5_GET (ptys_reg, out, ib_proto_oper); - -return 0 ; -} -static int mlx5i_get_speed_settings (u16 ib_link_width_oper,u16 ib_proto_oper) {int rate, width;
@@ -209,11 +191,14 @@ static int mlx5i_get_speed_settings(u16 ib_link_width_oper, u16 ib_proto_oper)static int mlx5i_get_link_ksettings (struct net_device *netdev,struct ethtool_link_ksettings *link_ksettings) { +struct mlx5e_priv *priv =mlx5i_epriv (netdev); +struct mlx5_core_dev *mdev = priv->mdev;u16 ib_link_width_oper;u16 ib_proto_oper;int speed, ret; - ret =mlx5i_get_port_settings (netdev, &ib_link_width_oper, &ib_proto_oper); + ret =mlx5_query_ib_port_oper (mdev, &ib_link_width_oper, &ib_proto_oper, +1 );if (ret)return ret;
drivers/net/ethernet/mellanox/mlx5/core/port.c +4 -19
@@ -154,24 +154,8 @@ int mlx5_set_port_beacon(struct mlx5_core_dev *dev, u16 beacon_duration) sizeof(out), MLX5_REG_MLCR, 0, 1); } -int mlx5_query_port_link_width_oper (struct mlx5_core_dev *dev, -u8 *link_width_oper,u8 local_port) -{ -u32 out[MLX5_ST_SZ_DW (ptys_reg)]; -int err; - - err =mlx5_query_port_ptys (dev, out,sizeof (out),MLX5_PTYS_IB , local_port); -if (err) -return err; - - *link_width_oper =MLX5_GET (ptys_reg, out, ib_link_width_oper); - -return 0 ; -} -EXPORT_SYMBOL_GPL (mlx5_query_port_link_width_oper); - -int mlx5_query_port_ib_proto_oper (struct mlx5_core_dev *dev, -u8 *proto_oper,u8 local_port) +int mlx5_query_ib_port_oper (struct mlx5_core_dev *dev,u16 *link_width_oper, +u16 *proto_oper,u8 local_port) {u32 out[MLX5_ST_SZ_DW (ptys_reg)];int err;
@@ -181,11 +165,12 @@ int mlx5_query_port_ib_proto_oper(struct mlx5_core_dev *dev,if (err)return err; + *link_width_oper =MLX5_GET (ptys_reg, out, ib_link_width_oper); *proto_oper =MLX5_GET (ptys_reg, out, ib_proto_oper);return 0 ; } -EXPORT_SYMBOL (mlx5_query_port_ib_proto_oper); +EXPORT_SYMBOL (mlx5_query_ib_port_oper);/* This function should be used after setting a port register only */ void mlx5_toggle_port_link (struct mlx5_core_dev *dev)
include/linux/mlx5/port.h +3 -4
@@ -133,10 +133,9 @@ enum mlx5e_connector_type {int mlx5_set_port_caps (struct mlx5_core_dev *dev,u8 port_num,u32 caps);int mlx5_query_port_ptys (struct mlx5_core_dev *dev,u32 *ptys,int ptys_size,int proto_mask,u8 local_port); -int mlx5_query_port_link_width_oper (struct mlx5_core_dev *dev, -u8 *link_width_oper,u8 local_port); -int mlx5_query_port_ib_proto_oper (struct mlx5_core_dev *dev, -u8 *proto_oper,u8 local_port); + +int mlx5_query_ib_port_oper (struct mlx5_core_dev *dev,u16 *link_width_oper, +u16 *proto_oper,u8 local_port);void mlx5_toggle_port_link (struct mlx5_core_dev *dev);int mlx5_set_port_admin_status (struct mlx5_core_dev *dev,enum mlx5_port_status status);
Signature · 1 line
2.26.2
Jason Gunthorpe
maintainerRe: [PATCH mlx5-next 1/3] net/mlx5: Refactor query port speed functions
drivers/infiniband/hw/mlx5/main.c static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, · line 494
Quoted 7 lines · Leon Romanovsky
drivers/infiniband/hw/mlx5/main.c +1
-1@@ -490,7 +490,7 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, props->active_width =IB_WIDTH_4X ; props->active_speed =IB_SPEED_QDR ; -translate_eth_proto_oper (eth_prot_oper, &props->active_speed, +translate_eth_proto_oper (eth_prot_oper, (u16 *)&props->active_speed, &props->active_width, ext);
This is memory corruption, put it on a stack u16 then truncate it.
Jason
PATCH 2/3 RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
In reply to Leon RomanovskyFrom: Aharon Landau <[email protected]>
Combine two same enums to avoid duplication.
--- drivers/infiniband/hw/mlx5/main.c | 20 ++++++------------- .../mellanox/mlx5/core/ipoib/ethtool.c | 8 -------- include/linux/mlx5/port.h | 8 ++++++++ 3 files changed, 14 insertions(+), 22 deletions(-)
drivers/infiniband/hw/mlx5/main.c +6 -14
@@ -1175,32 +1175,24 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,return 0 ; } -enum mlx5_ib_width { -MLX5_IB_WIDTH_1X =1 <<0 , -MLX5_IB_WIDTH_2X =1 <<1 , -MLX5_IB_WIDTH_4X =1 <<2 , -MLX5_IB_WIDTH_8X =1 <<3 , -MLX5_IB_WIDTH_12X =1 <<4 -}; -static void translate_active_width (struct ib_device *ibdev,u16 active_width,u8 *ib_width) {struct mlx5_ib_dev *dev =to_mdev (ibdev); -if (active_width &MLX5_IB_WIDTH_1X ) +if (active_width &MLX5_PTYS_WIDTH_1X ) *ib_width =IB_WIDTH_1X ; -else if (active_width &MLX5_IB_WIDTH_2X ) +else if (active_width &MLX5_PTYS_WIDTH_2X ) *ib_width =IB_WIDTH_2X ; -else if (active_width &MLX5_IB_WIDTH_4X ) +else if (active_width &MLX5_PTYS_WIDTH_4X ) *ib_width =IB_WIDTH_4X ; -else if (active_width &MLX5_IB_WIDTH_8X ) +else if (active_width &MLX5_PTYS_WIDTH_8X ) *ib_width =IB_WIDTH_8X ; -else if (active_width &MLX5_IB_WIDTH_12X ) +else if (active_width &MLX5_PTYS_WIDTH_12X ) *ib_width =IB_WIDTH_12X ;else {mlx5_ib_dbg (dev,"Invalid active_width %d, setting width to default value: 4x\n" , - (int )active_width); + active_width); *ib_width =IB_WIDTH_4X ; }
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c +0 -8
@@ -130,14 +130,6 @@ static int mlx5i_flash_device(struct net_device *netdev,return mlx5e_ethtool_flash_device (priv, flash); } -enum mlx5_ptys_width { -MLX5_PTYS_WIDTH_1X =1 <<0 , -MLX5_PTYS_WIDTH_2X =1 <<1 , -MLX5_PTYS_WIDTH_4X =1 <<2 , -MLX5_PTYS_WIDTH_8X =1 <<3 , -MLX5_PTYS_WIDTH_12X =1 <<4 , -}; -static inline int mlx5_ptys_width_enum_to_int (enum mlx5_ptys_width width) {switch (width) {
include/linux/mlx5/port.h +8 -0
@@ -125,6 +125,14 @@ enum mlx5e_connector_type { MLX5E_CONNECTOR_TYPE_NUMBER, }; +enum mlx5_ptys_width { +MLX5_PTYS_WIDTH_1X =1 <<0 , +MLX5_PTYS_WIDTH_2X =1 <<1 , +MLX5_PTYS_WIDTH_4X =1 <<2 , +MLX5_PTYS_WIDTH_8X =1 <<3 , +MLX5_PTYS_WIDTH_12X =1 <<4 , +}; +#define MLX5E_PROT_MASK (link_mode) (1 << link_mode)#define MLX5_GET_ETH_PROTO (reg, out, ext, field) \ (ext ? MLX5_GET(reg, out, ext_##field) : \
Signature · 1 line
2.26.2
PATCH 3/3 RDMA: Fix link active_speed size
In reply to Leon RomanovskyFrom: Aharon Landau <[email protected]>
According to the IB spec active_speed size should be u16 and not u8 as before. Changing it to allow further extensions in offered speeds.
--- drivers/infiniband/core/uverbs_std_types_device.c | 3 ++- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +- drivers/infiniband/hw/hfi1/verbs.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 4 ++-- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/qedr/verbs.c | 2 +- drivers/infiniband/hw/qib/qib.h | 6 +++--- drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- include/rdma/ib_verbs.h | 4 ++-- 10 files changed, 15 insertions(+), 14 deletions(-)
drivers/infiniband/core/uverbs_std_types_device.c +2 -1
@@ -165,7 +165,8 @@ void copy_port_attr_to_resp(struct ib_port_attr *attr, resp->subnet_timeout = attr->subnet_timeout; resp->init_type_reply = attr->init_type_reply; resp->active_width = attr->active_width; - resp->active_speed = attr->active_speed; +WARN_ON (attr->active_speed & ~0xFF ); + resp->active_speed = (u8 )attr->active_speed; resp->phys_state = attr->phys_state; resp->link_layer =rdma_port_get_link_layer (ib_dev, port_num); }
drivers/infiniband/core/verbs.c +1 -1
@@ -1805,7 +1805,7 @@ int ib_modify_qp_with_udata(struct ib_qp *ib_qp, struct ib_qp_attr *attr, }EXPORT_SYMBOL (ib_modify_qp_with_udata); -int ib_get_eth_speed (struct ib_device *dev,u8 port_num,u8 *speed,u8 *width) +int ib_get_eth_speed (struct ib_device *dev,u8 port_num,u16 *speed,u8 *width) {int rc;u32 netdev_speed;
drivers/infiniband/hw/bnxt_re/bnxt_re.h +1 -1
@@ -150,7 +150,7 @@ struct bnxt_re_dev {struct delayed_work worker;u8 cur_prio_map; -u8 active_speed; +u16 active_speed;u8 active_width;/* FP Notification Queue (CQ & SRQ) */
drivers/infiniband/hw/hfi1/verbs.c +1 -1
@@ -1424,7 +1424,7 @@ static int query_port(struct rvt_dev_info *rdi, u8 port_num, props->gid_tbl_len =HFI1_GUIDS_PER_PORT ; props->active_width = (u8 )opa_width_to_ib (ppd->link_width_active);/* see rate_show() in ib core/sysfs.c */ - props->active_speed = (u8 )opa_speed_to_ib (ppd->link_speed_active); + props->active_speed =opa_speed_to_ib (ppd->link_speed_active); props->max_vl_num = ppd->vls_supported;/* Once we are a "first class" citizen and have added the OPA MTUs to
drivers/infiniband/hw/mlx5/main.c +2 -2
@@ -490,7 +490,7 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, props->active_width =IB_WIDTH_4X ; props->active_speed =IB_SPEED_QDR ; -translate_eth_proto_oper (eth_prot_oper, (u16 *)&props->active_speed, +translate_eth_proto_oper (eth_prot_oper, &props->active_speed, &props->active_width, ext); props->port_cap_flags |=IB_PORT_CM_SUP ;
@@ -1303,7 +1303,7 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, props->port_cap_flags2 = rep->cap_mask2; err =mlx5_query_ib_port_oper (mdev, &ib_link_width_oper, - (u16 *)&props->active_speed, port); + &props->active_speed, port);if (err) goto out;
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +1 -1
@@ -112,7 +112,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr, }static inline void get_link_speed_and_width (struct ocrdma_dev *dev, -u8 *ib_speed,u8 *ib_width) +u16 *ib_speed,u8 *ib_width) {int status;u8 speed;
drivers/infiniband/hw/qedr/verbs.c +1 -1
@@ -163,7 +163,7 @@ int qedr_query_device(struct ib_device *ibdev,return 0 ; } -static inline void get_link_speed_and_width (int speed,u8 *ib_speed, +static inline void get_link_speed_and_width (int speed,u16 *ib_speed,u8 *ib_width) {switch (speed) {
drivers/infiniband/hw/qib/qib.h +3 -3
@@ -619,11 +619,11 @@ struct qib_pportdata {/* LID mask control */ u8 lmc;u8 link_width_supported; -u8 link_speed_supported; +u16 link_speed_supported;u8 link_width_enabled; -u8 link_speed_enabled; +u16 link_speed_enabled;u8 link_width_active; -u8 link_speed_active; +u16 link_speed_active;u8 vls_supported;u8 vls_operational;/* Rx Polarity inversion (compensate for ~tx on partner) */
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h +1 -1
@@ -176,7 +176,7 @@ struct pvrdma_port_attr {u8 subnet_timeout;u8 init_type_reply;u8 active_width; -u8 active_speed; +u16 active_speed;u8 phys_state;u8 reserved[2 ]; };
include/rdma/ib_verbs.h +2 -2
@@ -670,7 +670,7 @@ struct ib_port_attr {u8 subnet_timeout;u8 init_type_reply;u8 active_width; -u8 active_speed; +u16 active_speed;u8 phys_state;u16 port_cap_flags2; };
@@ -4359,7 +4359,7 @@ void ib_drain_rq(struct ib_qp *qp);void ib_drain_sq (struct ib_qp *qp);void ib_drain_qp (struct ib_qp *qp); -int ib_get_eth_speed (struct ib_device *dev,u8 port_num,u8 *speed,u8 *width); +int ib_get_eth_speed (struct ib_device *dev,u8 port_num,u16 *speed,u8 *width);static inline u8 *rdma_ah_retrieve_dmac (struct rdma_ah_attr *attr) {
Signature · 1 line
2.26.2