RDMA/hns: Updates for 5.11
Subsystems (2)
v5 cover RDMA/hns: Updates for 5.11
There are miscellaneous updates for hns driver:
* #1 fixes a potential length issue when copying udata.
* #2 fixes the unreasonable judgment when using HEM of SRQ and SCCC.
* #3 fixes wrong value of Traffic Class.
* #4 and #5 fix issues about Service Level.
* #6 ~ #11 are cleanups, including removing dead code, fixing coding style issues and so on.
Changes since v4:
- Fix a compiler error caused by #9.
Changes since v3:
- Avoid an unused variable warning in #10.
Changes since v2:
- Remove WARN_ON() in #5 when filling QPC.
Changes since v1:
- Only do shift on tclass when using RoCEv2 in #3.
Previous version:
v4: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
v3: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
v2: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
v1: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Lang Cheng (1):
RDMA/hns: Fix coding style issues
Weihang Li (3):
RDMA/hns: Do shift on traffic class when using RoCEv2 RDMA/hns: Avoid filling sl in high 3 bits of vlan_id RDMA/hns: WARN_ON if get a reserved sl from users
Wenpeng Liang (3):
RDMA/hns: Limit the length of data copied between kernel and userspace RDMA/hns: Normalization the judgment of some features RDMA/hns: Fix incorrect symbol types
Xinhao Liu (1):
RDMA/hns: Clear redundant variable initialization
Yixian Liu (2):
RDMA/hns: Remove unnecessary access right set during INIT2INIT RDMA/hns: Simplify AEQE process for different types of queue
Yixing Liu (1):
RDMA/hns: Fix inaccurate prints
drivers/infiniband/hw/hns/hns_roce_ah.c | 13 +-- drivers/infiniband/hw/hns/hns_roce_alloc.c | 4 +- drivers/infiniband/hw/hns/hns_roce_cmd.c | 37 +++--- drivers/infiniband/hw/hns/hns_roce_cmd.h | 6 +- drivers/infiniband/hw/hns/hns_roce_common.h | 14 +-- drivers/infiniband/hw/hns/hns_roce_cq.c | 42 +++---- drivers/infiniband/hw/hns/hns_roce_db.c | 8 +- drivers/infiniband/hw/hns/hns_roce_device.h | 87 ++++++-------- drivers/infiniband/hw/hns/hns_roce_hem.c | 44 +++---- drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 41 +++---- drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 172 +++++++++------------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +- drivers/infiniband/hw/hns/hns_roce_main.c | 19 +-- drivers/infiniband/hw/hns/hns_roce_mr.c | 25 ++-- drivers/infiniband/hw/hns/hns_roce_pd.c | 13 ++- drivers/infiniband/hw/hns/hns_roce_qp.c | 82 +++++++------ drivers/infiniband/hw/hns/hns_roce_srq.c | 48 ++++---- 19 files changed, 297 insertions(+), 368 deletions(-)
Signature · 1 line
2.8.1
PATCH v5 1/11 RDMA/hns: Limit the length of data copied between kernel and userspace
From: Wenpeng Liang <[email protected]>
For ib_copy_from_user(), the length of udata may not be the same as that of cmd. For ib_copy_to_user(), the length of udata may not be the same as that of resp. So limit the length to prevent out-of-bounds read and write operations from ib_copy_from_user() and ib_copy_to_user().
--- drivers/infiniband/hw/hns/hns_roce_cq.c | 5 +++-- drivers/infiniband/hw/hns/hns_roce_main.c | 3 ++- drivers/infiniband/hw/hns/hns_roce_pd.c | 11 ++++++----- drivers/infiniband/hw/hns/hns_roce_qp.c | 9 ++++++--- drivers/infiniband/hw/hns/hns_roce_srq.c | 10 +++++----- 5 files changed, 22 insertions(+), 16 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cq.c +3 -2
@@ -276,7 +276,7 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,if (udata) { ret =ib_copy_from_udata (&ucmd, udata, -min (sizeof (ucmd), udata->inlen)); +min (udata->inlen,sizeof (ucmd)));if (ret) {ibdev_err (ibdev,"Failed to copy CQ udata, err %d\n" , ret);
@@ -315,7 +315,8 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,if (udata) { resp.cqn = hr_cq->cqn; - ret =ib_copy_to_udata (udata, &resp,sizeof (resp)); + ret =ib_copy_to_udata (udata, &resp, +min (udata->outlen,sizeof (resp)));if (ret) goto err_cqc; }
drivers/infiniband/hw/hns/hns_roce_main.c +2 -1
@@ -327,7 +327,8 @@ static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx, resp.cqe_size = hr_dev->caps.cqe_sz; - ret =ib_copy_to_udata (udata, &resp,sizeof (resp)); + ret =ib_copy_to_udata (udata, &resp, +min (udata->outlen,sizeof (resp)));if (ret) goto error_fail_copy_to_udata;
drivers/infiniband/hw/hns/hns_roce_pd.c +6 -5
@@ -69,16 +69,17 @@ int hns_roce_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) }if (udata) { -struct hns_roce_ib_alloc_pd_resp uresp = {.pdn = pd->pdn}; +struct hns_roce_ib_alloc_pd_resp resp = {.pdn = pd->pdn}; -if (ib_copy_to_udata (udata, &uresp,sizeof (uresp))) { + ret =ib_copy_to_udata (udata, &resp, +min (udata->outlen,sizeof (resp))); +if (ret) {hns_roce_pd_free (to_hr_dev (ib_dev), pd->pdn); -ibdev_err (ib_dev,"failed to copy to udata\n" ); -return -EFAULT ; +ibdev_err (ib_dev,"failed to copy to udata, ret = %d\n" , ret); } } -return 0 ; +return ret; }int hns_roce_dealloc_pd (struct ib_pd *pd,struct ib_udata *udata)
drivers/infiniband/hw/hns/hns_roce_qp.c +6 -3
@@ -924,9 +924,12 @@ static int set_qp_param(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, }if (udata) { -if (ib_copy_from_udata (ucmd, udata,sizeof (*ucmd))) { -ibdev_err (ibdev,"Failed to copy QP ucmd\n" ); -return -EFAULT ; + ret =ib_copy_from_udata (ucmd, udata, +min (udata->inlen,sizeof (*ucmd))); +if (ret) { +ibdev_err (ibdev, +"failed to copy QP ucmd, ret = %d\n" , ret); +return ret; } ret =set_user_sq_size (hr_dev, &init_attr->cap, hr_qp, ucmd);
drivers/infiniband/hw/hns/hns_roce_srq.c +5 -5
@@ -303,7 +303,8 @@ int hns_roce_create_srq(struct ib_srq *ib_srq, srq->max_gs = init_attr->attr.max_sge;if (udata) { - ret =ib_copy_from_udata (&ucmd, udata,sizeof (ucmd)); + ret =ib_copy_from_udata (&ucmd, udata, +min (udata->inlen,sizeof (ucmd)));if (ret) {ibdev_err (ibdev,"Failed to copy SRQ udata, err %d\n" , ret);
@@ -346,11 +347,10 @@ int hns_roce_create_srq(struct ib_srq *ib_srq, resp.srqn = srq->srqn;if (udata) { -if (ib_copy_to_udata (udata, &resp, -min (udata->outlen,sizeof (resp)))) { - ret = -EFAULT ; + ret =ib_copy_to_udata (udata, &resp, +min (udata->outlen,sizeof (resp))); +if (ret) goto err_srqc_alloc; - } }return 0 ;
Signature · 1 line
2.8.1
PATCH v5 2/11 RDMA/hns: Normalization the judgment of some features
In reply to Weihang LiFrom: Wenpeng Liang <[email protected]>
Whether to enable the these features should better depend on the enable flags, not the value of related fields.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 4 ++-- drivers/infiniband/hw/hns/hns_roce_main.c | 8 ++++---- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +2 -2
@@ -1028,7 +1028,7 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev,void hns_roce_cleanup_hem (struct hns_roce_dev *hr_dev) { -if (hr_dev->caps.srqc_entry_sz) +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_SRQ )hns_roce_cleanup_hem_table (hr_dev, &hr_dev->srq_table.table);hns_roce_cleanup_hem_table (hr_dev, &hr_dev->cq_table.table);
@@ -1038,7 +1038,7 @@ void hns_roce_cleanup_hem(struct hns_roce_dev *hr_dev)if (hr_dev->caps.cqc_timer_entry_sz)hns_roce_cleanup_hem_table (hr_dev, &hr_dev->cqc_timer_table); -if (hr_dev->caps.sccc_sz) +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL )hns_roce_cleanup_hem_table (hr_dev, &hr_dev->qp_table.sccc_table);if (hr_dev->caps.trrl_entry_sz)
drivers/infiniband/hw/hns/hns_roce_main.c +4 -4
@@ -606,7 +606,7 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev) goto err_unmap_trrl; } -if (hr_dev->caps.srqc_entry_sz) { +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_SRQ ) { ret = hns_roce_init_hem_table(hr_dev, &hr_dev->srq_table.table, HEM_TYPE_SRQC, hr_dev->caps.srqc_entry_sz,
@@ -618,7 +618,7 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev) } } -if (hr_dev->caps.sccc_sz) { +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL ) { ret = hns_roce_init_hem_table(hr_dev, &hr_dev->qp_table.sccc_table, HEM_TYPE_SCCC,
@@ -679,11 +679,11 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev)hns_roce_cleanup_hem_table (hr_dev, &hr_dev->qpc_timer_table); err_unmap_ctx: -if (hr_dev->caps.sccc_sz) +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL )hns_roce_cleanup_hem_table (hr_dev, &hr_dev->qp_table.sccc_table); err_unmap_srq: -if (hr_dev->caps.srqc_entry_sz) +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_SRQ )hns_roce_cleanup_hem_table (hr_dev, &hr_dev->srq_table.table); err_unmap_cq:
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
@@ -334,7 +334,7 @@ static int alloc_qpc(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp) } } -if (hr_dev->caps.sccc_sz) { +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL ) {/* Alloc memory for SCC CTX */ ret =hns_roce_table_get (hr_dev, &qp_table->sccc_table, hr_qp->qpn);
Signature · 1 line
2.8.1
PATCH v5 3/11 RDMA/hns: Do shift on traffic class when using RoCEv2
In reply to Weihang LiThe high 6 bits of traffic class in GRH is DSCP (Differentiated Services Codepoint), the driver should shift it before the hardware gets it when using RoCEv2.
--- drivers/infiniband/hw/hns/hns_roce_ah.c | 2 +- drivers/infiniband/hw/hns/hns_roce_device.h | 8 ++++++++ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 10 +++------- 3 files changed, 12 insertions(+), 8 deletions(-)
drivers/infiniband/hw/hns/hns_roce_ah.c +1 -1
@@ -77,7 +77,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, ah->av.flowlabel = grh->flow_label; ah->av.udp_sport =get_ah_udp_sport (ah_attr); ah->av.sl =rdma_ah_get_sl (ah_attr); - ah->av.tclass = grh->traffic_class; + ah->av.tclass =get_tclass (grh);memcpy (ah->av.dgid, grh->dgid.raw,HNS_ROCE_GID_SIZE );memcpy (ah->av.mac, ah_attr->roce.dmac,ETH_ALEN );
drivers/infiniband/hw/hns/hns_roce_device.h +8 -0
@@ -1148,6 +1148,14 @@ static inline u32 to_hr_hem_entries_shift(u32 count, u32 buf_shift)return ilog2 (to_hr_hem_entries_count (count, buf_shift)); } +#define DSCP_SHIFT 2 + +static inline u8 get_tclass (const struct ib_global_route *grh) +{ +return grh->sgid_attr->gid_type ==IB_GID_TYPE_ROCE_UDP_ENCAP ? + grh->traffic_class >>DSCP_SHIFT : grh->traffic_class; +} +int hns_roce_init_uar_table (struct hns_roce_dev *dev);int hns_roce_uar_alloc (struct hns_roce_dev *dev,struct hns_roce_uar *uar);void hns_roce_uar_free (struct hns_roce_dev *dev,struct hns_roce_uar *uar);
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +3 -7
@@ -4596,15 +4596,11 @@ static int hns_roce_v2_set_path(struct ib_qp *ibqp,roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_HOP_LIMIT_M ,V2_QPC_BYTE_24_HOP_LIMIT_S ,0 ); -if (is_udp) -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M , -V2_QPC_BYTE_24_TC_S , grh->traffic_class >>2 ); -else -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M , -V2_QPC_BYTE_24_TC_S , grh->traffic_class); - +roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M , +V2_QPC_BYTE_24_TC_S ,get_tclass (&attr->ah_attr.grh));roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M ,V2_QPC_BYTE_24_TC_S ,0 ); +roce_set_field (context->byte_28_at_fl,V2_QPC_BYTE_28_FL_M ,V2_QPC_BYTE_28_FL_S , grh->flow_label); roce_set_field(qpc_mask->byte_28_at_fl, V2_QPC_BYTE_28_FL_M,
Signature · 1 line
2.8.1
PATCH v5 4/11 RDMA/hns: Avoid filling sl in high 3 bits of vlan_id
In reply to Weihang LiOnly the low 12 bits of vlan_id is valid, and service level has been filled in Address Vector. So there is no need to fill sl in vlan_id in Address Vector.
--- drivers/infiniband/hw/hns/hns_roce_ah.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/infiniband/hw/hns/hns_roce_ah.c +1 -10
@@ -36,9 +36,6 @@#include <rdma/ib_cache.h> #include "hns_roce_device.h" -#define VLAN_SL_MASK 7 -#define VLAN_SL_SHIFT 13 -static inline u16 get_ah_udp_sport (const struct rdma_ah_attr *ah_attr) {u32 fl = ah_attr->grh.flow_label;
@@ -84,18 +81,12 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,/* HIP08 needs to record vlan info in Address Vector */ if (hr_dev->pci_dev->revision <=PCI_REVISION_ID_HIP08 ) { - ah->av.vlan_en =0 ; - ret =rdma_read_gid_l2_fields (ah_attr->grh.sgid_attr, &ah->av.vlan_id,NULL );if (ret)return ret; -if (ah->av.vlan_id <VLAN_N_VID ) { - ah->av.vlan_en =1 ; - ah->av.vlan_id |= (rdma_ah_get_sl (ah_attr) &VLAN_SL_MASK ) << -VLAN_SL_SHIFT ; - } + ah->av.vlan_en = ah->av.vlan_id <VLAN_N_VID ; }return ret;
Signature · 1 line
2.8.1
PATCH v5 5/11 RDMA/hns: WARN_ON if get a reserved sl from users
In reply to Weihang LiAccording to the RoCE v1 specification, the sl (service level) 0-7 are mapped directly to priorities 0-7 respectively, sl 8-15 are reserved. The driver should verify whether the value of sl is larger than 7, if so, an exception should be returned.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4 -0
@@ -433,6 +433,10 @@ static int fill_ud_av(struct hns_roce_v2_ud_send_wqe *ud_sq_wqe, V2_UD_SEND_WQE_BYTE_36_TCLASS_S, ah->av.tclass);roce_set_field (ud_sq_wqe->byte_40,V2_UD_SEND_WQE_BYTE_40_FLOW_LABEL_M ,V2_UD_SEND_WQE_BYTE_40_FLOW_LABEL_S , ah->av.flowlabel); + +if (WARN_ON (ah->av.sl >MAX_SERVICE_LEVEL )) +return -EINVAL ; +roce_set_field (ud_sq_wqe->byte_40,V2_UD_SEND_WQE_BYTE_40_SL_M ,V2_UD_SEND_WQE_BYTE_40_SL_S , ah->av.sl);
Signature · 1 line
2.8.1
PATCH v5 6/11 RDMA/hns: Remove unnecessary access right set during INIT2INIT
In reply to Weihang LiFrom: Yixian Liu <[email protected]>
As the qp access right is checked and setted in common function hns_roce_v2_set_opt_fields(), there is no need to set again for a special case INIT2INIT.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 46 ------------------------------ 1 file changed, 46 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0 -46
@@ -3975,7 +3975,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,roce_set_bit (context->byte_172_sq_psn,V2_QPC_BYTE_172_FRE_S ,1 ); - hr_qp->access_flags = attr->qp_access_flags;roce_set_field (context->byte_252_err_txcqn,V2_QPC_BYTE_252_TX_CQN_M ,V2_QPC_BYTE_252_TX_CQN_S ,to_hr_cq (ibqp->send_cq)->cqn);
@@ -4004,51 +4003,6 @@ static void modify_qp_init_to_init(struct ib_qp *ibqp,roce_set_field (qpc_mask->byte_4_sqpn_tst,V2_QPC_BYTE_4_TST_M ,V2_QPC_BYTE_4_TST_S ,0 ); -if (attr_mask &IB_QP_ACCESS_FLAGS ) { -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_RRE_S , - !!(attr->qp_access_flags &IB_ACCESS_REMOTE_READ )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_RRE_S , -0 ); - -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_RWE_S , - !!(attr->qp_access_flags & -IB_ACCESS_REMOTE_WRITE )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_RWE_S , -0 ); - -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_ATE_S , - !!(attr->qp_access_flags & -IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_ATE_S , -0 ); -roce_set_bit (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_EXT_ATE_S , - !!(attr->qp_access_flags & -IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en, -V2_QPC_BYTE_76_EXT_ATE_S ,0 ); - }else { -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_RRE_S , - !!(hr_qp->access_flags &IB_ACCESS_REMOTE_READ )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_RRE_S , -0 ); - -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_RWE_S , - !!(hr_qp->access_flags &IB_ACCESS_REMOTE_WRITE )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_RWE_S , -0 ); - -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_ATE_S , - !!(hr_qp->access_flags &IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_ATE_S , -0 ); -roce_set_bit (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_EXT_ATE_S , - !!(hr_qp->access_flags &IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en, -V2_QPC_BYTE_76_EXT_ATE_S ,0 ); - } -roce_set_field (context->byte_16_buf_ba_pg_sz,V2_QPC_BYTE_16_PD_M ,V2_QPC_BYTE_16_PD_S ,to_hr_pd (ibqp->pd)->pdn); roce_set_field(qpc_mask->byte_16_buf_ba_pg_sz, V2_QPC_BYTE_16_PD_M,
Signature · 1 line
2.8.1
PATCH v5 7/11 RDMA/hns: Fix coding style issues
In reply to Weihang LiFrom: Lang Cheng <[email protected]>
Just format the code without modifying anything, including fixing some redundant and missing blanks and spaces and changing the variable definition order.
--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 27 +++++++++++++-------------- drivers/infiniband/hw/hns/hns_roce_cmd.h | 4 ++-- drivers/infiniband/hw/hns/hns_roce_cq.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 20 ++++++++++---------- drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 9 +++------ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +++------ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +++--- drivers/infiniband/hw/hns/hns_roce_main.c | 6 +++--- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 ++-- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 1 - 13 files changed, 43 insertions(+), 51 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cmd.c +13 -14
@@ -36,9 +36,9 @@#include "hns_roce_device.h" #include "hns_roce_cmd.h" -#define CMD_POLL_TOKEN 0xffff -#define CMD_MAX_NUM 32 -#define CMD_TOKEN_MASK 0x1f +#define CMD_POLL_TOKEN 0xffff +#define CMD_MAX_NUM 32 +#define CMD_TOKEN_MASK 0x1f static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, u32 in_modifier,
@@ -93,8 +93,8 @@ static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,void hns_roce_cmd_event (struct hns_roce_dev *hr_dev,u16 token,u8 status,u64 out_param) { -struct hns_roce_cmd_context - *context = &hr_dev->cmd.context[token & hr_dev->cmd.token_mask]; +struct hns_roce_cmd_context *context = + &hr_dev->cmd.context[token % hr_dev->cmd.max_cmds];if (token != context->token)return ;
@@ -164,8 +164,8 @@ static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,int ret;down (&hr_dev->cmd.event_sem); - ret =__hns_roce_cmd_mbox_wait (hr_dev, in_param, out_param, - in_modifier, op_modifier, op, timeout); + ret =__hns_roce_cmd_mbox_wait (hr_dev, in_param, out_param, in_modifier, + op_modifier, op, timeout);up (&hr_dev->cmd.event_sem);return ret;
@@ -231,9 +231,8 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev)struct hns_roce_cmdq *hr_cmd = &hr_dev->cmd;int i; - hr_cmd->context =kmalloc_array (hr_cmd->max_cmds, -sizeof (*hr_cmd->context), -GFP_KERNEL ); + hr_cmd->context = +kcalloc (hr_cmd->max_cmds,sizeof (*hr_cmd->context),GFP_KERNEL );if (!hr_cmd->context)return -ENOMEM ;
@@ -262,8 +261,8 @@ void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev) hr_cmd->use_events =0 ; } -struct hns_roce_cmd_mailbox - *hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev) +struct hns_roce_cmd_mailbox * +hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev) {struct hns_roce_cmd_mailbox *mailbox;
@@ -271,8 +270,8 @@ struct hns_roce_cmd_mailboxif (!mailbox)return ERR_PTR (-ENOMEM ); - mailbox->buf =dma_pool_alloc (hr_dev->cmd.pool,GFP_KERNEL , - &mailbox->dma); + mailbox->buf = +dma_pool_alloc (hr_dev->cmd.pool,GFP_KERNEL , &mailbox->dma);if (!mailbox->buf) {kfree (mailbox);return ERR_PTR (-ENOMEM );
drivers/infiniband/hw/hns/hns_roce_cmd.h +2 -2
@@ -143,8 +143,8 @@ int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, unsigned long in_modifier, u8 op_modifier, u16 op, unsigned long timeout); -struct hns_roce_cmd_mailbox - *hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev); +struct hns_roce_cmd_mailbox * +hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev);void hns_roce_free_cmd_mailbox (struct hns_roce_dev *hr_dev,struct hns_roce_cmd_mailbox *mailbox);
drivers/infiniband/hw/hns/hns_roce_cq.c +1 -1
@@ -40,9 +40,9 @@static int alloc_cqc (struct hns_roce_dev *hr_dev,struct hns_roce_cq *hr_cq) { +struct ib_device *ibdev = &hr_dev->ib_dev;struct hns_roce_cmd_mailbox *mailbox;struct hns_roce_cq_table *cq_table; -struct ib_device *ibdev = &hr_dev->ib_dev;u64 mtts[MTT_MIN_COUNT ] = {0 };dma_addr_t dma_handle;int ret;
drivers/infiniband/hw/hns/hns_roce_hem.c +10 -10
@@ -209,9 +209,9 @@ int hns_roce_calc_hem_mhop(struct hns_roce_dev *hr_dev, {struct device *dev = hr_dev->dev;u32 chunk_ba_num; +u32 chunk_size;u32 table_idx;u32 bt_num; -u32 chunk_size;if (get_hem_table_config (hr_dev, mhop, table->type))return -EINVAL ;
@@ -343,15 +343,15 @@ static int hns_roce_set_hem(struct hns_roce_dev *hr_dev, {spinlock_t *lock = &hr_dev->bt_cmd_lock;struct device *dev = hr_dev->dev; -long end; -unsigned long flags;struct hns_roce_hem_iter iter;void __iomem *bt_cmd;__le32 bt_cmd_val[2 ];__le32 bt_cmd_h =0 ; +unsigned long flags;__le32 bt_cmd_l; -u64 bt_ba;int ret =0 ; +u64 bt_ba; +long end;/* Find the HEM(Hardware Entry Memory) entry */ unsigned long i = (obj & (table->num_obj - 1)) /
@@ -651,8 +651,8 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, struct hns_roce_hem_table *table, unsigned long obj) {struct device *dev = hr_dev->dev; -int ret =0 ;unsigned long i; +int ret =0 ;if (hns_roce_check_whether_mhop (hr_dev, table->type))return hns_roce_table_mhop_get (hr_dev, table, obj);
@@ -800,14 +800,14 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev,struct hns_roce_hem_chunk *chunk;struct hns_roce_hem_mhop mhop;struct hns_roce_hem *hem; -void *addr =NULL ;unsigned long mhop_obj = obj;unsigned long obj_per_chunk;unsigned long idx_offset;int offset, dma_offset; +void *addr =NULL ; +u32 hem_idx =0 ;int length;int i, j; -u32 hem_idx =0 ;if (!table->lowmem)return NULL ;
@@ -977,8 +977,8 @@ static void hns_roce_cleanup_mhop_hem_table(struct hns_roce_dev *hr_dev, {struct hns_roce_hem_mhop mhop;u32 buf_chunk_size; -int i;u64 obj; +int i;if (hns_roce_calc_hem_mhop (hr_dev, table,NULL , &mhop))return ;
@@ -1313,8 +1313,8 @@ static int hem_list_alloc_root_bt(struct hns_roce_dev *hr_dev, const struct hns_roce_buf_region *regions, int region_cnt) { -struct roce_hem_item *hem, *temp_hem, *root_hem;struct list_head temp_list[HNS_ROCE_MAX_BT_REGION ]; +struct roce_hem_item *hem, *temp_hem, *root_hem;const struct hns_roce_buf_region *r;struct list_head temp_root;struct list_head temp_btm;
@@ -1419,8 +1419,8 @@ int hns_roce_hem_list_request(struct hns_roce_dev *hr_dev, {const struct hns_roce_buf_region *r;int ofs, end; -int ret;int unit; +int ret;int i;if (region_cnt >HNS_ROCE_MAX_BT_REGION ) {
drivers/infiniband/hw/hns/hns_roce_hem.h +1 -1
@@ -175,4 +175,4 @@ static inline dma_addr_t hns_roce_hem_addr(struct hns_roce_hem_iter *iter) return sg_dma_address(&iter->chunk->mem[iter->page_idx]); } -#endif /*_HNS_ROCE_HEM_H*/ +#endif /* _HNS_ROCE_HEM_H */
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +3 -6
@@ -239,7 +239,7 @@ static int hns_roce_v1_post_send(struct ib_qp *ibqp,break ; } -/*Ctrl field, ctrl set type: sig, solic, imm, fence */ +/* Ctrl field, ctrl set type: sig, solic, imm, fence */ /* SO wait for conforming application scenarios */ ctrl->flag |= (wr->send_flags &IB_SEND_SIGNALED ? cpu_to_le32(HNS_ROCE_WQE_CQ_NOTIFY) : 0) |
@@ -300,7 +300,7 @@ static int hns_roce_v1_post_send(struct ib_qp *ibqp, } ctrl->flag |=cpu_to_le32 (HNS_ROCE_WQE_INLINE ); }else { -/*sqe num is two */ +/* sqe num is two */ for (i =0 ; i < wr->num_sge; i++)set_data_seg (dseg + i, wr->sg_list + i);
@@ -1165,7 +1165,7 @@ static int hns_roce_raq_init(struct hns_roce_dev *hr_dev) } raq->e_raq_buf->map = addr; -/* Configure raq extended address. 48bit 4K align*/ +/* Configure raq extended address. 48bit 4K align */ roce_write (hr_dev,ROCEE_EXT_RAQ_REG , raq->e_raq_buf->map >>12 );/* Configure raq_shift */
@@ -2760,7 +2760,6 @@ static int hns_roce_v1_m_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr,roce_set_field (context->qpc_bytes_16,QP_CONTEXT_QPC_BYTES_16_QP_NUM_M ,QP_CONTEXT_QPC_BYTES_16_QP_NUM_S , hr_qp->qpn); - }else if (cur_state ==IB_QPS_INIT && new_state ==IB_QPS_INIT ) { roce_set_field(context->qpc_bytes_4, QP_CONTEXT_QPC_BYTES_4_TRANSPORT_SERVICE_TYPE_M,
@@ -3795,7 +3794,6 @@ static int hns_roce_v1_aeq_int(struct hns_roce_dev *hr_dev,int event_type;while ((aeqe =next_aeqe_sw_v1 (eq))) { -/* Make sure we read the AEQ entry after we have checked the * ownership bit */
@@ -3900,7 +3898,6 @@ static int hns_roce_v1_ceq_int(struct hns_roce_dev *hr_dev,u32 cqn;while ((ceqe =next_ceqe_sw_v1 (eq))) { -/* Make sure we read CEQ entry after we have checked the * ownership bit */
drivers/infiniband/hw/hns/hns_roce_hw_v1.h +1 -1
@@ -419,7 +419,7 @@ struct hns_roce_wqe_data_seg {struct hns_roce_wqe_raddr_seg {__le32 rkey; -__le32 len;/* reserved */ +__le32 len;/* reserved */ __le64 raddr; };
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +3 -6
@@ -1025,8 +1025,8 @@ static int hns_roce_v2_rst_process_cmd(struct hns_roce_dev *hr_dev)struct hns_roce_v2_priv *priv = hr_dev->priv;struct hnae3_handle *handle = priv->handle;const struct hnae3_ae_ops *ops = handle->ae_algo->ops; -unsigned long instance_stage;/* the current instance stage */ -unsigned long reset_stage;/* the current reset stage */ +unsigned long instance_stage;/* the current instance stage */ +unsigned long reset_stage;/* the current reset stage */ unsigned long reset_cnt;bool sw_resetting;bool hw_resetting;
@@ -2451,7 +2451,6 @@ static int hns_roce_init_link_table(struct hns_roce_dev *hr_dev,if (i < (pg_num -1 )) entry[i].blk_ba1_nxt_ptr |= (i +1 ) <<HNS_ROCE_LINK_TABLE_NXT_PTR_S ; - } link_tbl->npages = pg_num; link_tbl->pg_sz = buf_chk_sz;
@@ -5619,16 +5618,14 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev,case HNS_ROCE_EVENT_TYPE_CQ_OVERFLOW :hns_roce_cq_event (hr_dev, cqn, event_type);break ; -case HNS_ROCE_EVENT_TYPE_DB_OVERFLOW : -break ;case HNS_ROCE_EVENT_TYPE_MB :hns_roce_cmd_event (hr_dev,le16_to_cpu (aeqe->event.cmd.token), aeqe->event.cmd.status,le64_to_cpu (aeqe->event.cmd.out_param));break ; +case HNS_ROCE_EVENT_TYPE_DB_OVERFLOW :case HNS_ROCE_EVENT_TYPE_CEQ_OVERFLOW : -break ;case HNS_ROCE_EVENT_TYPE_FLR :break ;default :
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +3 -3
@@ -449,7 +449,7 @@ struct hns_roce_srq_context {#define SRQC_BYTE_60_SRQ_DB_RECORD_ADDR_S 1#define SRQC_BYTE_60_SRQ_DB_RECORD_ADDR_M GENMASK(31, 1) -enum { +enum {V2_MPT_ST_VALID =0x1 ,V2_MPT_ST_FREE =0x2 , };
@@ -1094,9 +1094,9 @@ struct hns_roce_v2_ud_send_wqe {u8 sgid_index;u8 smac_index;u8 dgid[GID_LEN_V2 ]; - }; -#define V2_UD_SEND_WQE_BYTE_4_OPCODE_S 0 + +#define V2_UD_SEND_WQE_BYTE_4_OPCODE_S 0#define V2_UD_SEND_WQE_BYTE_4_OPCODE_M GENMASK(4, 0)#define V2_UD_SEND_WQE_BYTE_4_OWNER_S 7
drivers/infiniband/hw/hns/hns_roce_main.c +3 -3
@@ -555,8 +555,8 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev)static int hns_roce_init_hem (struct hns_roce_dev *hr_dev) { -int ret;struct device *dev = hr_dev->dev; +int ret; ret = hns_roce_init_hem_table(hr_dev, &hr_dev->mr_table.mtpt_table, HEM_TYPE_MTPT, hr_dev->caps.mtpt_entry_sz,
@@ -713,8 +713,8 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev)*/ static int hns_roce_setup_hca (struct hns_roce_dev *hr_dev) { -int ret;struct device *dev = hr_dev->dev; +int ret;spin_lock_init (&hr_dev->sm_lock);spin_lock_init (&hr_dev->bt_cmd_lock);
@@ -838,8 +838,8 @@ void hns_roce_handle_device_err(struct hns_roce_dev *hr_dev)int hns_roce_init (struct hns_roce_dev *hr_dev) { -int ret;struct device *dev = hr_dev->dev; +int ret;if (hr_dev->hw->reset) { ret = hr_dev->hw->reset (hr_dev, true);
drivers/infiniband/hw/hns/hns_roce_mr.c +2 -2
@@ -167,10 +167,10 @@ static void hns_roce_mr_free(struct hns_roce_dev *hr_dev,static int hns_roce_mr_enable (struct hns_roce_dev *hr_dev,struct hns_roce_mr *mr) { -int ret;unsigned long mtpt_idx =key_to_hw_index (mr->key); -struct device *dev = hr_dev->dev;struct hns_roce_cmd_mailbox *mailbox; +struct device *dev = hr_dev->dev; +int ret;/* Allocate mailbox memory */ mailbox =hns_roce_alloc_cmd_mailbox (hr_dev);
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
@@ -113,8 +113,8 @@ void hns_roce_qp_event(struct hns_roce_dev *hr_dev, u32 qpn, int event_type)static void hns_roce_ib_qp_event (struct hns_roce_qp *hr_qp,enum hns_roce_event type) { -struct ib_event event;struct ib_qp *ibqp = &hr_qp->ibqp; +struct ib_event event;if (ibqp->event_handler) { event.device = ibqp->device;
drivers/infiniband/hw/hns/hns_roce_srq.c +0 -1
@@ -239,7 +239,6 @@ static int alloc_srq_idx(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, err = -ENOMEM ; goto err_idx_mtr; } - }return 0 ;
Signature · 1 line
2.8.1
PATCH v5 8/11 RDMA/hns: Clear redundant variable initialization
In reply to Weihang LiFrom: Xinhao Liu <[email protected]>
There is no need to initialize some variable because they will be assigned with a value later.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +1 -1
@@ -887,7 +887,7 @@ int hns_roce_init_hem_table(struct hns_roce_dev *hr_dev,unsigned long buf_chunk_size;unsigned long bt_chunk_size;unsigned long bt_chunk_num; -unsigned long num_bt_l0 =0 ; +unsigned long num_bt_l0;u32 hop_num;if (get_hem_table_config (hr_dev, &mhop, type))
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +4 -4
@@ -353,8 +353,8 @@ static int hns_roce_v1_post_recv(struct ib_qp *ibqp,unsigned long flags =0 ;unsigned int wqe_idx;int ret =0 ; -int nreq =0 ; -int i =0 ; +int nreq; +int i;u32 reg_val;spin_lock_irqsave (&hr_qp->rq.lock, flags);
@@ -2300,7 +2300,7 @@ int hns_roce_v1_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)struct hns_roce_qp *cur_qp =NULL ;unsigned long flags;int npolled; -int ret =0 ; +int ret;spin_lock_irqsave (&hr_cq->lock, flags);
@@ -4123,7 +4123,7 @@ static int hns_roce_v1_create_eq(struct hns_roce_dev *hr_dev,void __iomem *eqc = hr_dev->eq_table.eqc_base[eq->eqn];struct device *dev = &hr_dev->pdev->dev;dma_addr_t tmp_dma_addr; -u32 eqcuridx_val =0 ; +u32 eqcuridx_val;u32 eqconsindx_val;u32 eqshift_val;__le32 tmp2 =0 ;
Signature · 1 line
2.8.1
PATCH v5 9/11 RDMA/hns: Fix incorrect symbol types
In reply to Weihang LiFrom: Wenpeng Liang <[email protected]>
Types of some fields, variables and parameters of some functions should be unsigned.
--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 10 +++--- drivers/infiniband/hw/hns/hns_roce_cmd.h | 2 +- drivers/infiniband/hw/hns/hns_roce_common.h | 14 ++++---- drivers/infiniband/hw/hns/hns_roce_db.c | 8 ++--- drivers/infiniband/hw/hns/hns_roce_device.h | 53 +++++++++++++++-------------- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 ++--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 30 ++++++++-------- drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 11 +++--- drivers/infiniband/hw/hns/hns_roce_qp.c | 8 ++--- 10 files changed, 73 insertions(+), 73 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cmd.c +5 -5
@@ -60,7 +60,7 @@ static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev, u64 in_param,static int __hns_roce_cmd_mbox_poll (struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,unsigned long in_modifier,u8 op_modifier,u16 op, -unsigned long timeout) +unsigned int timeout) {struct device *dev = hr_dev->dev;int ret;
@@ -78,7 +78,7 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,static int hns_roce_cmd_mbox_poll (struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,unsigned long in_modifier, -u8 op_modifier,u16 op,unsigned long timeout) +u8 op_modifier,u16 op,unsigned int timeout) {int ret;
@@ -108,7 +108,7 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status,static int __hns_roce_cmd_mbox_wait (struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,unsigned long in_modifier,u8 op_modifier,u16 op, -unsigned long timeout) +unsigned int timeout) {struct hns_roce_cmdq *cmd = &hr_dev->cmd;struct hns_roce_cmd_context *context;
@@ -159,7 +159,7 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,static int hns_roce_cmd_mbox_wait (struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,unsigned long in_modifier, -u8 op_modifier,u16 op,unsigned long timeout) +u8 op_modifier,u16 op,unsigned int timeout) {int ret;
@@ -173,7 +173,7 @@ static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,int hns_roce_cmd_mbox (struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,unsigned long in_modifier,u8 op_modifier,u16 op, -unsigned long timeout) +unsigned int timeout) {int ret;
drivers/infiniband/hw/hns/hns_roce_cmd.h +1 -1
@@ -141,7 +141,7 @@ enum {int hns_roce_cmd_mbox (struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,unsigned long in_modifier,u8 op_modifier,u16 op, -unsigned long timeout); +unsigned int timeout);struct hns_roce_cmd_mailbox *hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev);
drivers/infiniband/hw/hns/hns_roce_common.h +7 -7
@@ -38,19 +38,19 @@#define roce_raw_write (value, addr) \ __raw_writel((__force u32)cpu_to_le32(value), (addr)) -#define roce_get_field (origin, mask, shift) \ - (((le32_to_cpu(origin)) & (mask)) >> (shift)) +#define roce_get_field (origin, mask, shift) \ + ((le32_to_cpu(origin) & (mask)) >> (u32)(shift))#define roce_get_bit (origin, shift) \ roce_get_field((origin), (1ul << (shift)), (shift)) -#define roce_set_field (origin, mask, shift, val) \ - do { \ - (origin) &= ~cpu_to_le32(mask); \ - (origin) |= cpu_to_le32(((u32)(val) << (shift)) & (mask)); \ +#define roce_set_field (origin, mask, shift, val) \ + do { \ + (origin) &= ~cpu_to_le32(mask); \ + (origin) |= cpu_to_le32(((u32)(val) << (u32)(shift)) & (mask)); \ } while (0) -#define roce_set_bit (origin, shift, val) \ +#define roce_set_bit (origin, shift, val) \ roce_set_field((origin), (1ul << (shift)), (shift), (val))#define FIELD_LOC (field_type, field_h, field_l) field_type, field_h, field_l
drivers/infiniband/hw/hns/hns_roce_db.c +4 -4
@@ -95,8 +95,8 @@ static struct hns_roce_db_pgdir *hns_roce_alloc_db_pgdir(static int hns_roce_alloc_db_from_pgdir (struct hns_roce_db_pgdir *pgdir,struct hns_roce_db *db,int order) { -int o; -int i; +unsigned long o; +unsigned long i;for (o = order; o <=1 ; ++o) { i =find_first_bit (pgdir->bits[o],HNS_ROCE_DB_PER_PAGE >> o);
@@ -154,8 +154,8 @@ int hns_roce_alloc_db(struct hns_roce_dev *hr_dev, struct hns_roce_db *db,void hns_roce_free_db (struct hns_roce_dev *hr_dev,struct hns_roce_db *db) { -int o; -int i; +unsigned long o; +unsigned long i;mutex_lock (&hr_dev->pgdir_mutex);
drivers/infiniband/hw/hns/hns_roce_device.h +27 -26
160 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +4 -4
@@ -288,7 +288,7 @@ static int hns_roce_v1_post_send(struct ib_qp *ibqp, ret = -EINVAL ; *bad_wr = wr;dev_err (dev,"inline len(1-%d)=%d, illegal" , - ctrl->msg_length, +le32_to_cpu (ctrl->msg_length), hr_dev->caps.max_sq_inline); goto out; }
@@ -1639,7 +1639,7 @@ static int hns_roce_v1_post_mbox(struct hns_roce_dev *hr_dev, u64 in_param, }static int hns_roce_v1_chk_mbox (struct hns_roce_dev *hr_dev, -unsigned long timeout) +unsigned int timeout) {u8 __iomem *hcr = hr_dev->reg_base +ROCEE_MB1_REG ;unsigned long end;
@@ -3600,10 +3600,10 @@ static int hns_roce_v1_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)return 0 ; } -static void set_eq_cons_index_v1 (struct hns_roce_eq *eq,int req_not) +static void set_eq_cons_index_v1 (struct hns_roce_eq *eq,u32 req_not) {roce_raw_write ((eq->cons_index &HNS_ROCE_V1_CONS_IDX_M ) | - (req_not << eq->log_entries), eq->doorbell); + (req_not << eq->log_entries), eq->doorbell); } static void hns_roce_v1_wq_catas_err_handle(struct hns_roce_dev *hr_dev,
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +15 -15
@@ -656,7 +656,7 @@ static int hns_roce_v2_post_send(struct ib_qp *ibqp,unsigned int sge_idx;unsigned int wqe_idx;void *wqe =NULL ; -int nreq; +u32 nreq;int ret;spin_lock_irqsave (&qp->sq.lock, flags);
@@ -834,7 +834,7 @@ static void *get_srq_wqe(struct hns_roce_srq *srq, int n)return hns_roce_buf_offset (srq->buf_mtr.kmem, n << srq->wqe_shift); } -static void *get_idx_buf (struct hns_roce_idx_que *idx_que,int n) +static void *get_idx_buf (struct hns_roce_idx_que *idx_que,unsigned int n) {return hns_roce_buf_offset (idx_que->mtr.kmem, n << idx_que->entry_shift);
@@ -875,12 +875,12 @@ static int hns_roce_v2_post_srq_recv(struct ib_srq *ibsrq,struct hns_roce_v2_wqe_data_seg *dseg;struct hns_roce_v2_db srq_db;unsigned long flags; +unsigned int ind;__le32 *srq_idx;int ret =0 ;int wqe_idx;void *wqe;int nreq; -int ind;int i;spin_lock_irqsave (&srq->lock, flags);
@@ -1125,7 +1125,7 @@ static void hns_roce_cmq_init_regs(struct hns_roce_dev *hr_dev, bool ring_type)roce_write (hr_dev,ROCEE_TX_CMQ_BASEADDR_H_REG ,upper_32_bits (dma));roce_write (hr_dev,ROCEE_TX_CMQ_DEPTH_REG , - ring->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S ); + (u32 )ring->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S );roce_write (hr_dev,ROCEE_TX_CMQ_HEAD_REG ,0 );roce_write (hr_dev,ROCEE_TX_CMQ_TAIL_REG ,0 ); }else {
@@ -1133,7 +1133,7 @@ static void hns_roce_cmq_init_regs(struct hns_roce_dev *hr_dev, bool ring_type)roce_write (hr_dev,ROCEE_RX_CMQ_BASEADDR_H_REG ,upper_32_bits (dma));roce_write (hr_dev,ROCEE_RX_CMQ_DEPTH_REG , - ring->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S ); + (u32 )ring->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S );roce_write (hr_dev,ROCEE_RX_CMQ_HEAD_REG ,0 );roce_write (hr_dev,ROCEE_RX_CMQ_TAIL_REG ,0 ); }
@@ -1919,8 +1919,8 @@ static void set_default_caps(struct hns_roce_dev *hr_dev) } } -static void calc_pg_sz (int obj_num,int obj_size,int hop_num,int ctx_bt_num, -int *buf_page_size,int *bt_page_size,u32 hem_type) +static void calc_pg_sz (u32 obj_num,u32 obj_size,u32 hop_num,u32 ctx_bt_num, +u32 *buf_page_size,u32 *bt_page_size,u32 hem_type) {u64 obj_per_chunk;u64 bt_chunk_size =PAGE_SIZE ;
@@ -2399,10 +2399,10 @@ static int hns_roce_init_link_table(struct hns_roce_dev *hr_dev,u32 buf_chk_sz;dma_addr_t t;int func_num =1 ; -int pg_num_a; -int pg_num_b; -int pg_num; -int size; +u32 pg_num_a; +u32 pg_num_b; +u32 pg_num; +u32 size;int i;switch (type) {
@@ -2598,7 +2598,7 @@ static int hns_roce_query_mbox_status(struct hns_roce_dev *hr_dev)struct hns_roce_cmq_desc desc;struct hns_roce_mbox_status *mb_st = (struct hns_roce_mbox_status *)desc.data; -enum hns_roce_cmd_return_status status; +int status;hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_QUERY_MB_ST , true);
@@ -2669,7 +2669,7 @@ static int hns_roce_v2_post_mbox(struct hns_roce_dev *hr_dev, u64 in_param, }static int hns_roce_v2_chk_mbox (struct hns_roce_dev *hr_dev, -unsigned long timeout) +unsigned int timeout) {struct device *dev = hr_dev->dev;unsigned long end;
@@ -3067,7 +3067,7 @@ static void *get_cqe_v2(struct hns_roce_cq *hr_cq, int n)return hns_roce_buf_offset (hr_cq->mtr.kmem, n * hr_cq->cqe_size); } -static void *get_sw_cqe_v2 (struct hns_roce_cq *hr_cq,int n) +static void *get_sw_cqe_v2 (struct hns_roce_cq *hr_cq,unsigned int n) {struct hns_roce_v2_cqe *cqe =get_cqe_v2 (hr_cq, n & hr_cq->ib_cq.cqe);
@@ -3414,7 +3414,7 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq,int is_send;u16 wqe_ctr;u32 opcode; -int qpn; +u32 qpn;int ret;/* Find cqe according to consumer index */
drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
@@ -53,7 +53,7 @@* GID[0][0], GID[1][0],.....GID[N - 1][0], * And so on */ -int hns_get_gid_index (struct hns_roce_dev *hr_dev,u8 port,int gid_index) +u8 hns_get_gid_index (struct hns_roce_dev *hr_dev,u8 port,int gid_index) {return gid_index * hr_dev->caps.num_ports + port; }
drivers/infiniband/hw/hns/hns_roce_mr.c +5 -6
@@ -510,7 +510,7 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,ibdev_err (ibdev,"failed to map sg mtr, ret = %d.\n" , ret); ret =0 ; }else { - mr->pbl_mtr.hem_cfg.buf_pg_shift =ilog2 (ibmr->page_size); + mr->pbl_mtr.hem_cfg.buf_pg_shift = (u32 )ilog2 (ibmr->page_size); ret = mr->npages; }
@@ -829,12 +829,12 @@ static int mtr_get_pages(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, }int hns_roce_mtr_map (struct hns_roce_dev *hr_dev,struct hns_roce_mtr *mtr, -dma_addr_t *pages,int page_cnt) +dma_addr_t *pages,unsigned int page_cnt) {struct ib_device *ibdev = &hr_dev->ib_dev;struct hns_roce_buf_region *r; +unsigned int i;int err; -int i;/* * Only use the first page address as root ba when hopnum is 0, this
@@ -871,13 +871,12 @@ int hns_roce_mtr_find(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, int offset, u64 *mtt_buf, int mtt_max, u64 *base_addr) { struct hns_roce_hem_cfg *cfg = &mtr->hem_cfg; +int mtt_count, left;int start_index; -int mtt_count;int total =0 ;__le64 *mtts; -int npage; +u32 npage;u64 addr; -int left;if (!mtt_buf || mtt_max <1 ) goto done;
drivers/infiniband/hw/hns/hns_roce_qp.c +4 -4
@@ -1322,22 +1322,22 @@ static inline void *get_wqe(struct hns_roce_qp *hr_qp, int offset)return hns_roce_buf_offset (hr_qp->mtr.kmem, offset); } -void *hns_roce_get_recv_wqe (struct hns_roce_qp *hr_qp,int n) +void *hns_roce_get_recv_wqe (struct hns_roce_qp *hr_qp,unsigned int n) {return get_wqe (hr_qp, hr_qp->rq.offset + (n << hr_qp->rq.wqe_shift)); } -void *hns_roce_get_send_wqe (struct hns_roce_qp *hr_qp,int n) +void *hns_roce_get_send_wqe (struct hns_roce_qp *hr_qp,unsigned int n) {return get_wqe (hr_qp, hr_qp->sq.offset + (n << hr_qp->sq.wqe_shift)); } -void *hns_roce_get_extend_sge (struct hns_roce_qp *hr_qp,int n) +void *hns_roce_get_extend_sge (struct hns_roce_qp *hr_qp,unsigned int n) {return get_wqe (hr_qp, hr_qp->sge.offset + (n << hr_qp->sge.sge_shift)); } -bool hns_roce_wq_overflow (struct hns_roce_wq *hr_wq,int nreq, +bool hns_roce_wq_overflow (struct hns_roce_wq *hr_wq,u32 nreq,struct ib_cq *ib_cq) {struct hns_roce_cq *hr_cq;
Signature · 1 line
2.8.1
PATCH v5 10/11 RDMA/hns: Fix inaccurate prints
In reply to Weihang LiFrom: Yixing Liu <[email protected]>
Some %d in print format string should be %u, and some prints miss the useful errno or are in nonstandard format. Just fix above issues.
--- drivers/infiniband/hw/hns/hns_roce_alloc.c | 4 +- drivers/infiniband/hw/hns/hns_roce_cq.c | 35 ++++++++--------- drivers/infiniband/hw/hns/hns_roce_hem.c | 18 ++++----- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 30 +++++++-------- drivers/infiniband/hw/hns/hns_roce_mr.c | 10 ++--- drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 61 +++++++++++++++++------------- drivers/infiniband/hw/hns/hns_roce_srq.c | 37 ++++++++++-------- 8 files changed, 107 insertions(+), 90 deletions(-)
drivers/infiniband/hw/hns/hns_roce_alloc.c +2 -2
@@ -260,7 +260,7 @@ int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, end = start + buf_cnt;if (end > buf->npages) {dev_err (hr_dev->dev, -"Failed to check kmem bufs, end %d + %d total %d!\n" , +"failed to check kmem bufs, end %d + %d total %u!\n" , start, buf_cnt, buf->npages);return -EINVAL ; }
@@ -282,7 +282,7 @@ int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,u64 addr;if (page_shift <HNS_HW_PAGE_SHIFT ) { -dev_err (hr_dev->dev,"Failed to check umem page shift %d!\n" , +dev_err (hr_dev->dev,"failed to check umem page shift %u!\n" , page_shift);return -EINVAL ; }
drivers/infiniband/hw/hns/hns_roce_cq.c +18 -17
@@ -49,29 +49,29 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) ret =hns_roce_mtr_find (hr_dev, &hr_cq->mtr,0 , mtts,ARRAY_SIZE (mtts), &dma_handle); -if (ret <1 ) { -ibdev_err (ibdev,"Failed to find CQ mtr\n" ); +if (!ret) { +ibdev_err (ibdev,"failed to find CQ mtr, ret = %d.\n" , ret);return -EINVAL ; } cq_table = &hr_dev->cq_table; ret =hns_roce_bitmap_alloc (&cq_table->bitmap, &hr_cq->cqn);if (ret) { -ibdev_err (ibdev,"Failed to alloc CQ bitmap, err %d\n" , ret); +ibdev_err (ibdev,"failed to alloc CQ bitmap, ret = %d.\n" , ret);return ret; }/* Get CQC memory HEM(Hardware Entry Memory) table */ ret =hns_roce_table_get (hr_dev, &cq_table->table, hr_cq->cqn);if (ret) { -ibdev_err (ibdev,"Failed to get CQ(0x%lx) context, err %d\n" , +ibdev_err (ibdev,"failed to get CQ(0x%lx) context, ret = %d.\n" , hr_cq->cqn, ret); goto err_out; } ret =xa_err (xa_store (&cq_table->array, hr_cq->cqn, hr_cq,GFP_KERNEL ));if (ret) { -ibdev_err (ibdev,"Failed to xa_store CQ\n" ); +ibdev_err (ibdev,"failed to xa_store CQ, ret = %d.\n" , ret); goto err_put; }
@@ -90,7 +90,7 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq)hns_roce_free_cmd_mailbox (hr_dev, mailbox);if (ret) {ibdev_err (ibdev, -"Failed to send create cmd for CQ(0x%lx), err %d\n" , +"failed to send create cmd for CQ(0x%lx), ret = %d.\n" , hr_cq->cqn, ret); goto err_xa; }
@@ -146,7 +146,7 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, {struct ib_device *ibdev = &hr_dev->ib_dev;struct hns_roce_buf_attr buf_attr = {}; -int err; +int ret; buf_attr.page_shift = hr_dev->caps.cqe_buf_pg_sz +HNS_HW_PAGE_SHIFT ; buf_attr.region[0 ].size = hr_cq->cq_depth * hr_cq->cqe_size;
@@ -154,13 +154,13 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, buf_attr.region_count =1 ; buf_attr.fixed_page = true; - err =hns_roce_mtr_create (hr_dev, &hr_cq->mtr, &buf_attr, + ret =hns_roce_mtr_create (hr_dev, &hr_cq->mtr, &buf_attr, hr_dev->caps.cqe_ba_pg_sz +HNS_HW_PAGE_SHIFT , udata, addr); -if (err) -ibdev_err (ibdev,"Failed to alloc CQ mtr, err %d\n" , err); +if (ret) +ibdev_err (ibdev,"failed to alloc CQ mtr, ret = %d.\n" , ret); -return err; +return ret; }static void free_cq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_cq *hr_cq)
@@ -254,13 +254,13 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,return -EOPNOTSUPP ;if (cq_entries <1 || cq_entries > hr_dev->caps.max_cqes) { -ibdev_err (ibdev,"Failed to check CQ count %d max=%d\n" , +ibdev_err (ibdev,"failed to check CQ count %u, max = %u.\n" , cq_entries, hr_dev->caps.max_cqes);return -EINVAL ; }if (vector >= hr_dev->caps.num_comp_vectors) { -ibdev_err (ibdev,"Failed to check CQ vector=%d max=%d\n" , +ibdev_err (ibdev,"failed to check CQ vector = %d, max = %d.\n" , vector, hr_dev->caps.num_comp_vectors);return -EINVAL ; }
@@ -278,7 +278,7 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, ret =ib_copy_from_udata (&ucmd, udata,min (udata->inlen,sizeof (ucmd)));if (ret) { -ibdev_err (ibdev,"Failed to copy CQ udata, err %d\n" , +ibdev_err (ibdev,"failed to copy CQ udata, ret = %d.\n" , ret);return ret; }
@@ -288,19 +288,20 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, ret =alloc_cq_buf (hr_dev, hr_cq, udata, ucmd.buf_addr);if (ret) { -ibdev_err (ibdev,"Failed to alloc CQ buf, err %d\n" , ret); +ibdev_err (ibdev,"failed to alloc CQ buf, ret = %d.\n" , ret);return ret; } ret =alloc_cq_db (hr_dev, hr_cq, udata, ucmd.db_addr, &resp);if (ret) { -ibdev_err (ibdev,"Failed to alloc CQ db, err %d\n" , ret); +ibdev_err (ibdev,"failed to alloc CQ db, ret = %d.\n" , ret); goto err_cq_buf; } ret =alloc_cqc (hr_dev, hr_cq);if (ret) { -ibdev_err (ibdev,"Failed to alloc CQ context, err %d\n" , ret); +ibdev_err (ibdev, +"failed to alloc CQ context, ret = %d.\n" , ret); goto err_cq_db; }
drivers/infiniband/hw/hns/hns_roce_hem.c +9 -9
@@ -195,7 +195,7 @@ static int get_hem_table_config(struct hns_roce_dev *hr_dev, mhop->hop_num = hr_dev->caps.gmv_hop_num;break ;default : -dev_err (dev,"Table %d not support multi-hop addressing!\n" , +dev_err (dev,"table %u not support multi-hop addressing!\n" , type);return -EINVAL ; }
@@ -243,8 +243,8 @@ int hns_roce_calc_hem_mhop(struct hns_roce_dev *hr_dev, mhop->l0_idx = table_idx;break ;default : -dev_err (dev,"Table %d not support hop_num = %d!\n" , - table->type, mhop->hop_num); +dev_err (dev,"table %u not support hop_num = %u!\n" , + table->type, mhop->hop_num);return -EINVAL ; }if (mhop->l0_idx >= mhop->ba_l0_num)
@@ -449,13 +449,13 @@ static int calc_hem_config(struct hns_roce_dev *hr_dev, index->buf = l0_idx;break ;default : -ibdev_err (ibdev,"Table %d not support mhop.hop_num = %d!\n" , +ibdev_err (ibdev,"table %u not support mhop.hop_num = %u!\n" , table->type, mhop->hop_num);return -EINVAL ; }if (unlikely (index->buf >= table->num_hem)) { -ibdev_err (ibdev,"Table %d exceed hem limt idx %llu,max %lu!\n" , +ibdev_err (ibdev,"table %u exceed hem limt idx %llu, max %lu!\n" , table->type, index->buf, table->num_hem);return -EINVAL ; }
@@ -725,15 +725,15 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev, step_idx = hop_num;if (hr_dev->hw->clear_hem (hr_dev, table, obj, step_idx)) -ibdev_warn (ibdev,"Clear hop%d HEM failed.\n" , hop_num); +ibdev_warn (ibdev,"failed to clear hop%u HEM.\n" , hop_num);if (index->inited &HEM_INDEX_L1 )if (hr_dev->hw->clear_hem (hr_dev, table, obj,1 )) -ibdev_warn (ibdev,"Clear HEM step 1 failed.\n" ); +ibdev_warn (ibdev,"failed to clear HEM step 1.\n" );if (index->inited &HEM_INDEX_L0 )if (hr_dev->hw->clear_hem (hr_dev, table, obj,0 )) -ibdev_warn (ibdev,"Clear HEM step 0 failed.\n" ); +ibdev_warn (ibdev,"failed to clear HEM step 0.\n" ); } }
@@ -1249,7 +1249,7 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev, }if (offset < r->offset) { -dev_err (hr_dev->dev,"invalid offset %d,min %d!\n" , +dev_err (hr_dev->dev,"invalid offset %d, min %u!\n" , offset, r->offset);return -EINVAL ; }
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +15 -15
@@ -361,7 +361,7 @@ static int check_send_valid(struct hns_roce_dev *hr_dev, }else if (unlikely (hr_qp->state ==IB_QPS_RESET || hr_qp->state ==IB_QPS_INIT || hr_qp->state ==IB_QPS_RTR )) { -ibdev_err (ibdev,"failed to post WQE, QP state %d!\n" , +ibdev_err (ibdev,"failed to post WQE, QP state %hhu!\n" , hr_qp->state);return -EINVAL ; }else if (unlikely (hr_dev->state >=HNS_ROCE_DEVICE_STATE_RST_DOWN )) {
@@ -680,7 +680,7 @@ static int hns_roce_v2_post_send(struct ib_qp *ibqp, wqe_idx = (qp->sq.head + nreq) & (qp->sq.wqe_cnt -1 );if (unlikely (wr->num_sge > qp->sq.max_gs)) { -ibdev_err (ibdev,"num_sge=%d > qp->sq.max_gs=%d\n" , +ibdev_err (ibdev,"num_sge = %d > qp->sq.max_gs = %u.\n" , wr->num_sge, qp->sq.max_gs); ret = -EINVAL ; *bad_wr = wr;
@@ -765,7 +765,7 @@ static int hns_roce_v2_post_recv(struct ib_qp *ibqp, wqe_idx = (hr_qp->rq.head + nreq) & (hr_qp->rq.wqe_cnt -1 );if (unlikely (wr->num_sge > hr_qp->rq.max_gs)) { -ibdev_err (ibdev,"rq:num_sge=%d >= qp->sq.max_gs=%d\n" , +ibdev_err (ibdev,"num_sge = %d >= max_sge = %u.\n" , wr->num_sge, hr_qp->rq.max_gs); ret = -EINVAL ; *bad_wr = wr;
@@ -1950,8 +1950,8 @@ static void calc_pg_sz(u32 obj_num, u32 obj_size, u32 hop_num, u32 ctx_bt_num, obj_per_chunk = ctx_bt_num * obj_per_chunk_default;break ;default : -pr_err ("Table %d not support hop_num = %d!\n" , hem_type, - hop_num); +pr_err ("table %u not support hop_num = %u!\n" , hem_type, + hop_num);return ; }
@@ -3683,7 +3683,7 @@ static int get_op_for_set_hem(struct hns_roce_dev *hr_dev, u32 type,break ;default :dev_warn (hr_dev->dev, -"Table %d not to be written by mailbox!\n" , type); +"table %u not to be written by mailbox!\n" , type);return -EINVAL ; }
@@ -3819,7 +3819,7 @@ static int hns_roce_v2_clear_hem(struct hns_roce_dev *hr_dev,case HEM_TYPE_GMV :return 0 ;default : -dev_warn (dev,"Table %d not to be destroyed by mailbox!\n" , +dev_warn (dev,"table %u not to be destroyed by mailbox!\n" , table->type);return 0 ; }
@@ -4411,7 +4411,7 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, ret =config_qp_sq_buf (hr_dev, hr_qp, context, qpc_mask);if (ret) { -ibdev_err (ibdev,"failed to config sq buf, ret %d\n" , ret); +ibdev_err (ibdev,"failed to config sq buf, ret = %d.\n" , ret);return ret; }
@@ -4902,7 +4902,7 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,/* SW pass context to HW */ ret =hns_roce_v2_qp_modify (hr_dev, context, qpc_mask, hr_qp);if (ret) { -ibdev_err (ibdev,"failed to modify QP, ret = %d\n" , ret); +ibdev_err (ibdev,"failed to modify QP, ret = %d.\n" , ret); goto out; }
@@ -4995,7 +4995,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, ret =hns_roce_v2_query_qpc (hr_dev, hr_qp, &context);if (ret) { -ibdev_err (ibdev,"failed to query QPC, ret = %d\n" , ret); +ibdev_err (ibdev,"failed to query QPC, ret = %d.\n" , ret); ret = -EINVAL ; goto out; }
@@ -5118,7 +5118,7 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, hr_qp->state, IB_QPS_RESET);if (ret)ibdev_err (ibdev, -"failed to modify QP to RST, ret = %d\n" , +"failed to modify QP to RST, ret = %d.\n" , ret); }
@@ -5157,7 +5157,7 @@ static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) ret =hns_roce_v2_destroy_qp_common (hr_dev, hr_qp, udata);if (ret)ibdev_err (&hr_dev->ib_dev, -"failed to destroy QP 0x%06lx, ret = %d\n" , +"failed to destroy QP, QPN = 0x%06lx, ret = %d.\n" , hr_qp->qpn, ret);hns_roce_qp_destroy (hr_dev, hr_qp, udata);
@@ -5180,7 +5180,7 @@ static int hns_roce_v2_qp_flow_control_init(struct hns_roce_dev *hr_dev,hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_RESET_SCCC , false); ret =hns_roce_cmq_send (hr_dev, &desc,1 );if (ret) { -ibdev_err (ibdev,"failed to reset SCC ctx, ret = %d\n" , ret); +ibdev_err (ibdev,"failed to reset SCC ctx, ret = %d.\n" , ret); goto out; }
@@ -5190,7 +5190,7 @@ static int hns_roce_v2_qp_flow_control_init(struct hns_roce_dev *hr_dev, clr->qpn =cpu_to_le32 (hr_qp->qpn); ret =hns_roce_cmq_send (hr_dev, &desc,1 );if (ret) { -ibdev_err (ibdev,"failed to clear SCC ctx, ret = %d\n" , ret); +ibdev_err (ibdev,"failed to clear SCC ctx, ret = %d.\n" , ret); goto out; }
@@ -5439,7 +5439,7 @@ static int hns_roce_v2_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period)hns_roce_free_cmd_mailbox (hr_dev, mailbox);if (ret)ibdev_err (&hr_dev->ib_dev, -"failed to process cmd when modifying CQ, ret = %d\n" , +"failed to process cmd when modifying CQ, ret = %d.\n" , ret);return ret;
drivers/infiniband/hw/hns/hns_roce_mr.c +5 -5
@@ -185,14 +185,14 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev,else ret = hr_dev->hw->frmr_write_mtpt (hr_dev, mailbox->buf, mr);if (ret) { -dev_err (dev,"Write mtpt fail!\n" ); +dev_err (dev,"failed to write mtpt, ret = %d.\n" , ret); goto err_page; } ret =hns_roce_hw_create_mpt (hr_dev, mailbox, mtpt_idx & (hr_dev->caps.num_mtpts -1 ));if (ret) { -dev_err (dev,"CREATE_MPT failed (%d)\n" , ret); +dev_err (dev,"failed to create mpt, ret = %d.\n" , ret); goto err_page; }
@@ -496,7 +496,7 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, ret =ib_sg_to_pages (ibmr, sg, sg_nents, sg_offset, hns_roce_set_page);if (ret <1 ) { -ibdev_err (ibdev,"failed to store sg pages %d %d, cnt = %d.\n" , +ibdev_err (ibdev,"failed to store sg pages %u %u, cnt = %d.\n" , mr->npages, mr->pbl_mtr.hem_cfg.buf_pg_count, ret); goto err_page_list; }
@@ -850,7 +850,7 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr,if (r->offset + r->count > page_cnt) { err = -EINVAL ;ibdev_err (ibdev, -"Failed to check mtr%d end %d + %d, max %d\n" , +"failed to check mtr%u end %u + %u, max %u.\n" , i, r->offset, r->count, page_cnt);return err; }
@@ -858,7 +858,7 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, err =mtr_map_region (hr_dev, mtr, &pages[r->offset], r);if (err) {ibdev_err (ibdev, -"Failed to map mtr%d offset %d, err %d\n" , +"failed to map mtr%u offset %u, ret = %d.\n" , i, r->offset, err);return err; }
drivers/infiniband/hw/hns/hns_roce_pd.c +1 -1
@@ -64,7 +64,7 @@ int hns_roce_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) ret =hns_roce_pd_alloc (to_hr_dev (ib_dev), &pd->pdn);if (ret) { -ibdev_err (ib_dev,"failed to alloc pd, ret = %d\n" , ret); +ibdev_err (ib_dev,"failed to alloc pd, ret = %d.\n" , ret);return ret; }
drivers/infiniband/hw/hns/hns_roce_qp.c +35 -26
178 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_srq.c +22 -15
@@ -92,7 +92,8 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, ret =hns_roce_mtr_find (hr_dev, &srq->buf_mtr,0 , mtts_wqe,ARRAY_SIZE (mtts_wqe), &dma_handle_wqe);if (ret <1 ) { -ibdev_err (ibdev,"Failed to find mtr for SRQ WQE\n" ); +ibdev_err (ibdev,"failed to find mtr for SRQ WQE, ret = %d.\n" , + ret);return -ENOBUFS ; }
@@ -100,32 +101,34 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, ret =hns_roce_mtr_find (hr_dev, &srq->idx_que.mtr,0 , mtts_idx,ARRAY_SIZE (mtts_idx), &dma_handle_idx);if (ret <1 ) { -ibdev_err (ibdev,"Failed to find mtr for SRQ idx\n" ); +ibdev_err (ibdev,"failed to find mtr for SRQ idx, ret = %d.\n" , + ret);return -ENOBUFS ; } ret =hns_roce_bitmap_alloc (&srq_table->bitmap, &srq->srqn);if (ret) { -ibdev_err (ibdev,"Failed to alloc SRQ number, err %d\n" , ret); +ibdev_err (ibdev, +"failed to alloc SRQ number, ret = %d.\n" , ret);return -ENOMEM ; } ret =hns_roce_table_get (hr_dev, &srq_table->table, srq->srqn);if (ret) { -ibdev_err (ibdev,"Failed to get SRQC table, err %d\n" , ret); +ibdev_err (ibdev,"failed to get SRQC table, ret = %d.\n" , ret); goto err_out; } ret =xa_err (xa_store (&srq_table->xa, srq->srqn, srq,GFP_KERNEL ));if (ret) { -ibdev_err (ibdev,"Failed to store SRQC, err %d\n" , ret); +ibdev_err (ibdev,"failed to store SRQC, ret = %d.\n" , ret); goto err_put; } mailbox =hns_roce_alloc_cmd_mailbox (hr_dev);if (IS_ERR_OR_NULL (mailbox)) { ret = -ENOMEM ; -ibdev_err (ibdev,"Failed to alloc mailbox for SRQC\n" ); +ibdev_err (ibdev,"failed to alloc mailbox for SRQC.\n" ); goto err_xa; }
@@ -136,7 +139,7 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, ret =hns_roce_hw_create_srq (hr_dev, mailbox, srq->srqn);hns_roce_free_cmd_mailbox (hr_dev, mailbox);if (ret) { -ibdev_err (ibdev,"Failed to config SRQC, err %d\n" , ret); +ibdev_err (ibdev,"failed to config SRQC, ret = %d.\n" , ret); goto err_xa; }
@@ -197,7 +200,8 @@ static int alloc_srq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, hr_dev->caps.srqwqe_ba_pg_sz + HNS_HW_PAGE_SHIFT, udata, addr);if (err) -ibdev_err (ibdev,"Failed to alloc SRQ buf mtr, err %d\n" , err); +ibdev_err (ibdev, +"failed to alloc SRQ buf mtr, ret = %d.\n" , err);return err; }
@@ -228,14 +232,15 @@ static int alloc_srq_idx(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, hr_dev->caps.idx_ba_pg_sz +HNS_HW_PAGE_SHIFT , udata, addr);if (err) { -ibdev_err (ibdev,"Failed to alloc SRQ idx mtr, err %d\n" , err); +ibdev_err (ibdev, +"failed to alloc SRQ idx mtr, ret = %d.\n" , err);return err; }if (!udata) { idx_que->bitmap =bitmap_zalloc (srq->wqe_cnt,GFP_KERNEL );if (!idx_que->bitmap) { -ibdev_err (ibdev,"Failed to alloc SRQ idx bitmap\n" ); +ibdev_err (ibdev,"failed to alloc SRQ idx bitmap.\n" ); err = -ENOMEM ; goto err_idx_mtr; }
@@ -305,7 +310,7 @@ int hns_roce_create_srq(struct ib_srq *ib_srq, ret =ib_copy_from_udata (&ucmd, udata,min (udata->inlen,sizeof (ucmd)));if (ret) { -ibdev_err (ibdev,"Failed to copy SRQ udata, err %d\n" , +ibdev_err (ibdev,"failed to copy SRQ udata, ret = %d.\n" , ret);return ret; }
@@ -313,20 +318,21 @@ int hns_roce_create_srq(struct ib_srq *ib_srq, ret =alloc_srq_buf (hr_dev, srq, udata, ucmd.buf_addr);if (ret) { -ibdev_err (ibdev,"Failed to alloc SRQ buffer, err %d\n" , ret); +ibdev_err (ibdev, +"failed to alloc SRQ buffer, ret = %d.\n" , ret);return ret; } ret =alloc_srq_idx (hr_dev, srq, udata, ucmd.que_addr);if (ret) { -ibdev_err (ibdev,"Failed to alloc SRQ idx, err %d\n" , ret); +ibdev_err (ibdev,"failed to alloc SRQ idx, ret = %d.\n" , ret); goto err_buf_alloc; }if (!udata) { ret =alloc_srq_wrid (hr_dev, srq);if (ret) { -ibdev_err (ibdev,"Failed to alloc SRQ wrid, err %d\n" , +ibdev_err (ibdev,"failed to alloc SRQ wrid, ret = %d.\n" , ret); goto err_idx_alloc; }
@@ -338,7 +344,8 @@ int hns_roce_create_srq(struct ib_srq *ib_srq, ret =alloc_srqc (hr_dev, srq,to_hr_pd (ib_srq->pd)->pdn, cqn,0 ,0 );if (ret) { -ibdev_err (ibdev,"Failed to alloc SRQ context, err %d\n" , ret); +ibdev_err (ibdev, +"failed to alloc SRQ context, ret = %d.\n" , ret); goto err_wrid_alloc; }
Signature · 1 line
2.8.1
PATCH v5 11/11 RDMA/hns: Simplify AEQE process for different types of queue
In reply to Weihang LiFrom: Yixian Liu <[email protected]>
There is no need to get queue number repeatly for different queues from an AEQE entity, as they are the same. Furthermore, redefine the AEQE structure to make the codes more readable.
In addition, HNS_ROCE_EVENT_TYPE_CEQ_OVERFLOW is removed because the hardware never reports this event.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 26 ++--------------- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 16 ++++------- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 43 ++++++++++------------------- 3 files changed, 23 insertions(+), 62 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +3 -23
@@ -160,7 +160,6 @@ enum hns_roce_event {/* 0x10 and 0x11 is unused in currently application case */ HNS_ROCE_EVENT_TYPE_DB_OVERFLOW =0x12 ,HNS_ROCE_EVENT_TYPE_MB =0x13 , -HNS_ROCE_EVENT_TYPE_CEQ_OVERFLOW =0x14 , HNS_ROCE_EVENT_TYPE_FLR = 0x15, };
@@ -636,10 +635,9 @@ enum {struct hns_roce_work {struct hns_roce_dev *hr_dev;struct work_struct work; -u32 qpn; -u32 cqn;int event_type;int sub_type; +u32 queue_num; };struct hns_roce_qp {
@@ -707,28 +705,10 @@ struct hns_roce_aeqe {__le32 asyn;union {struct { -__le32 qp; +__le32 num;u32 rsv0;u32 rsv1; - } qp_event; - -struct { -__le32 srq; -u32 rsv0; -u32 rsv1; - } srq_event; - -struct { -__le32 cq; -u32 rsv0; -u32 rsv1; - } cq_event; - -struct { -__le32 ceqe; -u32 rsv0; -u32 rsv1; - } ce_event; + } queue_event;struct {__le64 out_param;
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +5 -11
@@ -3683,10 +3683,10 @@ static void hns_roce_v1_qp_err_handle(struct hns_roce_dev *hr_dev,int phy_port;int qpn; - qpn =roce_get_field (aeqe->event.qp_event.qp, + qpn =roce_get_field (aeqe->event.queue_event.num,HNS_ROCE_AEQE_EVENT_QP_EVENT_QP_QPN_M ,HNS_ROCE_AEQE_EVENT_QP_EVENT_QP_QPN_S ); - phy_port =roce_get_field (aeqe->event.qp_event.qp, + phy_port =roce_get_field (aeqe->event.queue_event.num,HNS_ROCE_AEQE_EVENT_QP_EVENT_PORT_NUM_M ,HNS_ROCE_AEQE_EVENT_QP_EVENT_PORT_NUM_S );if (qpn <=1 )
@@ -3717,9 +3717,9 @@ static void hns_roce_v1_cq_err_handle(struct hns_roce_dev *hr_dev,struct device *dev = &hr_dev->pdev->dev;u32 cqn; - cqn =roce_get_field (aeqe->event.cq_event.cq, -HNS_ROCE_AEQE_EVENT_CQ_EVENT_CQ_CQN_M , -HNS_ROCE_AEQE_EVENT_CQ_EVENT_CQ_CQN_S ); + cqn =roce_get_field (aeqe->event.queue_event.num, +HNS_ROCE_AEQE_EVENT_CQ_EVENT_CQ_CQN_M , +HNS_ROCE_AEQE_EVENT_CQ_EVENT_CQ_CQN_S );switch (event_type) {case HNS_ROCE_EVENT_TYPE_CQ_ACCESS_ERROR :
@@ -3848,12 +3848,6 @@ static int hns_roce_v1_aeq_int(struct hns_roce_dev *hr_dev,case HNS_ROCE_EVENT_TYPE_DB_OVERFLOW :hns_roce_v1_db_overflow_handle (hr_dev, aeqe);break ; -case HNS_ROCE_EVENT_TYPE_CEQ_OVERFLOW : -dev_warn (dev,"CEQ 0x%lx overflow.\n" , -roce_get_field (aeqe->event.ce_event.ceqe, -HNS_ROCE_AEQE_EVENT_CE_EVENT_CEQE_CEQN_M , -HNS_ROCE_AEQE_EVENT_CE_EVENT_CEQE_CEQN_S )); -break ;default :dev_warn (dev,"Unhandled event %d on EQ %d at idx %u.\n" , event_type, eq->eqn, eq->cons_index);
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +15 -28
120 lines not on this page · raw message
Signature · 1 line
2.8.1
Quoted 42 lines · Weihang Li
There are miscellaneous updates for hns driver:
* #1 fixes a potential length issue when copying udata.
* #2 fixes the unreasonable judgment when using HEM of SRQ and SCCC.
* #3 fixes wrong value of Traffic Class.
* #4 and #5 fix issues about Service Level.
* #6 ~ #11 are cleanups, including removing dead code, fixing coding style issues and so on.Changes since v4:
- Fix a compiler error caused by #9.Changes since v3:
- Avoid an unused variable warning in #10.Changes since v2:
- RemoveWARN_ON()in #5 when filling QPC.Changes since v1:
- Only do shift on tclass when using RoCEv2 in #3.Previous version:
v4: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
v3: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
v2: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
v1: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/Lang Cheng (1):
RDMA/hns: Fix coding style issuesWeihang Li (3):
RDMA/hns: Do shift on traffic class when using RoCEv2 RDMA/hns: Avoid filling sl in high 3 bits ofvlan_idRDMA/hns:WARN_ONif get a reserved sl from usersWenpeng Liang (3):
RDMA/hns: Limit the length of data copied between kernel and userspace RDMA/hns: Normalization the judgment of some features RDMA/hns: Fix incorrect symbol typesXinhao Liu (1):
RDMA/hns: Clear redundant variable initialization
Quoted 6 lines
Yixian Liu (2):
RDMA/hns: Remove unnecessary access right set during INIT2INIT RDMA/hns: Simplify AEQE process for different types of queueYixing Liu (1):
RDMA/hns: Fix inaccurate prints
Applied to for-next, thanks
Jason