Use ibdev_dbg instead of pr_xxx
Subsystems (2)
v2 cover Use ibdev_dbg instead of pr_xxx
This patch series replaces calls to pr_xxx with calls to ibdev_dbg using macros for rxe objects adapted from similar macros from siw, except in situations where the rdma device is not in scope.
This patch series is based on the current for-next branch.
v2:
Fixed a typo in 01/16 in rxe_dbg_uc().
Made fixes to 01/16 from a comment by Jason Gunthorp to enclose macro parameters in parentheses.
Fixed an error in 06/16 caught by the kernel test robot <[email protected]>
Bob Pearson (16):
RDMA/rxe: Add ibdev_dbg macros for rxe RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_comp.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_cq.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mr.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mw.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_net.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_qp.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_req.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_resp.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_srq.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_verbs.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_av.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_task.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_icrc.c RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mmap.c
drivers/infiniband/sw/rxe/rxe.c | 4 +- drivers/infiniband/sw/rxe/rxe.h | 19 ++++++++ drivers/infiniband/sw/rxe/rxe_av.c | 43 ++++++++++++++--- drivers/infiniband/sw/rxe/rxe_comp.c | 12 ++--- drivers/infiniband/sw/rxe/rxe_cq.c | 8 ++-- drivers/infiniband/sw/rxe/rxe_icrc.c | 4 +- drivers/infiniband/sw/rxe/rxe_loc.h | 8 +--- drivers/infiniband/sw/rxe/rxe_mmap.c | 6 +-- drivers/infiniband/sw/rxe/rxe_mr.c | 40 +++++++--------- drivers/infiniband/sw/rxe/rxe_mw.c | 20 ++++---- drivers/infiniband/sw/rxe/rxe_net.c | 38 ++++++++------- drivers/infiniband/sw/rxe/rxe_qp.c | 69 +++++++++++++-------------- drivers/infiniband/sw/rxe/rxe_req.c | 10 ++-- drivers/infiniband/sw/rxe/rxe_resp.c | 17 +++---- drivers/infiniband/sw/rxe/rxe_srq.c | 20 ++++---- drivers/infiniband/sw/rxe/rxe_task.c | 7 +-- drivers/infiniband/sw/rxe/rxe_verbs.c | 18 ++++--- 17 files changed, 190 insertions(+), 153 deletions(-)
base-commit: 692373d186205dfb1b56f35f22702412d94d9420
Signature · 1 line
2.34.1
PATCH v2 1/16 RDMA/rxe: Add ibdev_dbg macros for rxe
Add macros borrowed from siw to call dynamic debug macro ibdev_dbg.
---
v2:
Replaced uc->ibpd by uc->ibuc in rxe_dbg_uc().
Replaced obj by (obj) in the macros.
drivers/infiniband/sw/rxe/rxe.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/infiniband/sw/rxe/rxe.h +19 -0
@@ -38,6 +38,25 @@#define RXE_ROCE_V2_SPORT (0xc000) +#define rxe_dbg (rxe, fmt, ...) ibdev_dbg(&(rxe)->ib_dev, \ + "%s: " fmt, __func__, ##__VA_ARGS__) +#define rxe_dbg_uc (uc, fmt, ...) ibdev_dbg((uc)->ibuc.device, \ + "uc#%d %s: " fmt, (uc)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_pd (pd, fmt, ...) ibdev_dbg((pd)->ibpd.device, \ + "pd#%d %s: " fmt, (pd)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_ah (ah, fmt, ...) ibdev_dbg((ah)->ibah.device, \ + "ah#%d %s: " fmt, (ah)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_srq (srq, fmt, ...) ibdev_dbg((srq)->ibsrq.device, \ + "srq#%d %s: " fmt, (srq)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_qp (qp, fmt, ...) ibdev_dbg((qp)->ibqp.device, \ + "qp#%d %s: " fmt, (qp)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_cq (cq, fmt, ...) ibdev_dbg((cq)->ibcq.device, \ + "cq#%d %s: " fmt, (cq)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_mr (mr, fmt, ...) ibdev_dbg((mr)->ibmr.device, \ + "mr#%d %s: " fmt, (mr)->elem.index, __func__, ##__VA_ARGS__) +#define rxe_dbg_mw (mw, fmt, ...) ibdev_dbg((mw)->ibmw.device, \ + "mw#%d %s: " fmt, (mw)->elem.index, __func__, ##__VA_ARGS__) +void rxe_set_mtu (struct rxe_dev *rxe,unsigned int dev_mtu);int rxe_add (struct rxe_dev *rxe,unsigned int mtu,const char *ibdev_name);
Signature · 1 line
2.34.1
PATCH v2 2/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_comp.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_comp.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_comp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +5 -7
@@ -114,7 +114,7 @@ void retransmit_timer(struct timer_list *t) {struct rxe_qp *qp =from_timer (qp, t, retrans_timer); -pr_debug ("%s: fired for qp#%d\n" , __func__, qp->elem.index); +rxe_dbg_qp (qp,"retransmit timer fired\n" );if (qp->valid) { qp->comp.timeout =1 ;
@@ -334,7 +334,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,return COMPST_ERROR ;default : -pr_warn ("unexpected nak %x\n" , syn); +rxe_dbg_qp (qp,"unexpected nak %x\n" , syn); wqe->status =IB_WC_REM_OP_ERR ;return COMPST_ERROR ; }
@@ -345,7 +345,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,break ;default : -pr_warn ("unexpected opcode\n" ); +rxe_dbg_qp (qp,"unexpected opcode\n" ); }return COMPST_ERROR ;
@@ -598,8 +598,7 @@ int rxe_completer(void *arg) state =COMPST_GET_ACK ;while (1 ) { -pr_debug ("qp#%d state = %s\n" ,qp_num (qp), - comp_state_name[state]); +rxe_dbg_qp (qp,"state = %s\n" , comp_state_name[state]);switch (state) {case COMPST_GET_ACK : skb =skb_dequeue (&qp->resp_pkts);
@@ -746,8 +745,7 @@ int rxe_completer(void *arg)* rnr timer has fired */ qp->req.wait_for_rnr_timer =1 ; -pr_debug ("qp#%d set rnr nak timer\n" , -qp_num (qp)); +rxe_dbg_qp (qp,"set rnr nak timer\n" );mod_timer (&qp->rnr_nak_timer, jiffies +rnrnak_jiffies (aeth_syn (pkt) & ~AETH_TYPE_MASK ));
Signature · 1 line
2.34.1
PATCH v2 3/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_cq.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_cq.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_cq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_cq.c +4 -4
@@ -14,12 +14,12 @@ int rxe_cq_chk_attr(struct rxe_dev *rxe, struct rxe_cq *cq,int count;if (cqe <=0 ) { -pr_warn ("cqe(%d) <= 0\n" , cqe); +rxe_dbg (rxe,"cqe(%d) <= 0\n" , cqe); goto err1; }if (cqe > rxe->attr.max_cqe) { -pr_debug ("cqe(%d) > max_cqe(%d)\n" , +rxe_dbg (rxe,"cqe(%d) > max_cqe(%d)\n" , cqe, rxe->attr.max_cqe); goto err1; }
@@ -27,7 +27,7 @@ int rxe_cq_chk_attr(struct rxe_dev *rxe, struct rxe_cq *cq,if (cq) { count =queue_count (cq->queue,QUEUE_TYPE_TO_CLIENT );if (cqe < count) { -pr_debug ("cqe(%d) < current # elements in queue (%d)" , +rxe_dbg_cq (cq,"cqe(%d) < current # elements in queue (%d)" , cqe, count); goto err1; }
@@ -65,7 +65,7 @@ int rxe_cq_from_init(struct rxe_dev *rxe, struct rxe_cq *cq, int cqe, cq->queue =rxe_queue_init (rxe, &cqe,sizeof (struct rxe_cqe ), type);if (!cq->queue) { -pr_warn ("unable to create cq\n" ); +rxe_dbg (rxe,"unable to create cq\n" );return -ENOMEM ; }
Signature · 1 line
2.34.1
PATCH v2 4/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mr.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_mr.c by rxe_dbg_mr().
--- drivers/infiniband/sw/rxe/rxe_mr.c | 40 ++++++++++++--------------- drivers/infiniband/sw/rxe/rxe_verbs.c | 3 ++ 2 files changed, 20 insertions(+), 23 deletions(-)
drivers/infiniband/sw/rxe/rxe_mr.c +17 -23
@@ -38,8 +38,7 @@ int mr_check_range(struct rxe_mr *mr, u64 iova, size_t length)return 0 ;default : -pr_warn ("%s: mr type (%d) not supported\n" , - __func__, mr->ibmr.type); +rxe_dbg_mr (mr,"type (%d) not supported\n" , mr->ibmr.type);return -EFAULT ; } }
@@ -125,8 +124,8 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova, umem =ib_umem_get (&rxe->ib_dev, start, length, access);if (IS_ERR (umem)) { -pr_warn ("%s: Unable to pin memory region err = %d\n" , - __func__, (int )PTR_ERR (umem)); +rxe_dbg_mr (mr,"Unable to pin memory region err = %d\n" , + (int )PTR_ERR (umem)); err =PTR_ERR (umem); goto err_out; }
@@ -137,8 +136,7 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova, err =rxe_mr_alloc (mr, num_buf);if (err) { -pr_warn ("%s: Unable to allocate memory for map\n" , - __func__); +rxe_dbg_mr (mr,"Unable to allocate memory for map\n" ); goto err_release_umem; }
@@ -159,8 +157,7 @@ int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova, vaddr =page_address (sg_page_iter_page (&sg_iter));if (!vaddr) { -pr_warn ("%s: Unable to get virtual address\n" , - __func__); +rxe_dbg_mr (mr,"Unable to get virtual address\n" ); err = -ENOMEM ; goto err_cleanup_map; }
@@ -255,7 +252,7 @@ void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length)void *addr;if (mr->state !=RXE_MR_STATE_VALID ) { -pr_warn ("mr not in valid state\n" ); +rxe_dbg_mr (mr,"Not in valid state\n" ); addr =NULL ; goto out; }
@@ -266,7 +263,7 @@ void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length) }if (mr_check_range (mr, iova, length)) { -pr_warn ("range violation\n" ); +rxe_dbg_mr (mr,"Range violation\n" ); addr =NULL ; goto out; }
@@ -274,7 +271,7 @@ void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length)lookup_iova (mr, iova, &m, &n, &offset);if (offset + length > mr->map[m]->buf[n].size) { -pr_warn ("crosses page boundary\n" ); +rxe_dbg_mr (mr,"Crosses page boundary\n" ); addr =NULL ; goto out; }
@@ -527,27 +524,26 @@ int rxe_invalidate_mr(struct rxe_qp *qp, u32 key) mr =rxe_pool_get_index (&rxe->mr_pool, key >>8 );if (!mr) { -pr_err ("%s: No MR for key %#x\n" , __func__, key); +rxe_dbg_mr (mr,"No MR for key %#x\n" , key); ret = -EINVAL ; goto err; }if (mr->rkey ? (key != mr->rkey) : (key != mr->lkey)) { -pr_err ("%s: wr key (%#x) doesn't match mr key (%#x)\n" , - __func__, key, (mr->rkey ? mr->rkey : mr->lkey)); +rxe_dbg_mr (mr,"wr key (%#x) doesn't match mr key (%#x)\n" , + key, (mr->rkey ? mr->rkey : mr->lkey)); ret = -EINVAL ; goto err_drop_ref; }if (atomic_read (&mr->num_mw) >0 ) { -pr_warn ("%s: Attempt to invalidate an MR while bound to MWs\n" , - __func__); +rxe_dbg_mr (mr,"Attempt to invalidate an MR while bound to MWs\n" ); ret = -EINVAL ; goto err_drop_ref; }if (unlikely (mr->ibmr.type !=IB_MR_TYPE_MEM_REG )) { -pr_warn ("%s: mr type (%d) is wrong\n" , __func__, mr->ibmr.type); +rxe_dbg_mr (mr,"Type (%d) is wrong\n" , mr->ibmr.type); ret = -EINVAL ; goto err_drop_ref; }
@@ -576,22 +572,20 @@ int rxe_reg_fast_mr(struct rxe_qp *qp, struct rxe_send_wqe *wqe)/* user can only register MR in free state */ if (unlikely (mr->state !=RXE_MR_STATE_FREE )) { -pr_warn ("%s: mr->lkey = 0x%x not free\n" , - __func__, mr->lkey); +rxe_dbg_mr (mr,"mr->lkey = 0x%x not free\n" , mr->lkey);return -EINVAL ; }/* user can only register mr with qp in same protection domain */ if (unlikely (qp->ibqp.pd != mr->ibmr.pd)) { -pr_warn ("%s: qp->pd and mr->pd don't match\n" , - __func__); +rxe_dbg_mr (mr,"qp->pd and mr->pd don't match\n" );return -EINVAL ; }/* user is only allowed to change key portion of l/rkey */ if (unlikely ((mr->lkey & ~0xff ) != (key & ~0xff ))) { -pr_warn ("%s: key = 0x%x has wrong index mr->lkey = 0x%x\n" , - __func__, key, mr->lkey); +rxe_dbg_mr (mr,"key = 0x%x has wrong index mr->lkey = 0x%x\n" , + key, mr->lkey);return -EINVAL ; }
drivers/infiniband/sw/rxe/rxe_verbs.c +3 -0
@@ -875,6 +875,7 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)rxe_get (pd); mr->ibmr.pd = ibpd; + mr->ibmr.device = ibpd->device;rxe_mr_init_dma (access, mr);rxe_finalize (mr);
@@ -899,6 +900,7 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,rxe_get (pd); mr->ibmr.pd = ibpd; + mr->ibmr.device = ibpd->device; err =rxe_mr_init_user (rxe, start, length, iova, access, mr);if (err)
@@ -930,6 +932,7 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type,rxe_get (pd); mr->ibmr.pd = ibpd; + mr->ibmr.device = ibpd->device; err =rxe_mr_init_fast (max_num_sg, mr);if (err)
Signature · 1 line
2.34.1
PATCH v2 5/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mw.c
In reply to Bob PearsonReplace calls to pr_xxx() int rxe_mw.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_mw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/infiniband/sw/rxe/rxe_mw.c +10 -10
@@ -52,14 +52,14 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe, {if (mw->ibmw.type ==IB_MW_TYPE_1 ) {if (unlikely (mw->state !=RXE_MW_STATE_VALID )) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind a type 1 MW not in the valid state\n" );return -EINVAL ; }/* o10-36.2.2 */ if (unlikely ((mw->access &IB_ZERO_BASED ))) { -pr_err_once ("attempt to bind a zero based type 1 MW\n" ); +rxe_dbg_mw (mw,"attempt to bind a zero based type 1 MW\n" );return -EINVAL ; } }
@@ -67,21 +67,21 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe,if (mw->ibmw.type ==IB_MW_TYPE_2 ) {/* o10-37.2.30 */ if (unlikely (mw->state !=RXE_MW_STATE_FREE )) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind a type 2 MW not in the free state\n" );return -EINVAL ; }/* C10-72 */ if (unlikely (qp->pd !=to_rpd (mw->ibmw.pd))) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind type 2 MW with qp with different PD\n" );return -EINVAL ; }/* o10-37.2.40 */ if (unlikely (!mr || wqe->wr.wr.mw.length ==0 )) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to invalidate type 2 MW by binding with NULL or zero length MR\n" );return -EINVAL ; }
@@ -92,13 +92,13 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe,return 0 ;if (unlikely (mr->access &IB_ZERO_BASED )) { -pr_err_once ("attempt to bind MW to zero based MR\n" ); +rxe_dbg_mw (mw,"attempt to bind MW to zero based MR\n" );return -EINVAL ; }/* C10-73 */ if (unlikely (!(mr->access &IB_ACCESS_MW_BIND ))) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind an MW to an MR without bind access\n" );return -EINVAL ; }
@@ -107,7 +107,7 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe,if (unlikely ((mw->access & (IB_ACCESS_REMOTE_WRITE |IB_ACCESS_REMOTE_ATOMIC )) && !(mr->access &IB_ACCESS_LOCAL_WRITE ))) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind an Writable MW to an MR without local write access\n" );return -EINVAL ; }
@@ -115,7 +115,7 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe,/* C10-75 */ if (mw->access &IB_ZERO_BASED ) {if (unlikely (wqe->wr.wr.mw.length > mr->ibmr.length)) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind a ZB MW outside of the MR\n" );return -EINVAL ; }
@@ -123,7 +123,7 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe,if (unlikely ((wqe->wr.wr.mw.addr < mr->ibmr.iova) || ((wqe->wr.wr.mw.addr + wqe->wr.wr.mw.length) > (mr->ibmr.iova + mr->ibmr.length)))) { -pr_err_once ( +rxe_dbg_mw (mw,"attempt to bind a VA MW outside of the MR\n" );return -EINVAL ; }
Signature · 1 line
2.34.1
PATCH v2 6/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_net.c
In reply to Bob PearsonReplace (some) calls to pr_xxx() in rxe_net.c with rxe_dbg_xxx(). Calls with a rxe device not yet in scope are left as is.
---
v2:
Fixed incorrect parameter list in rxe_find_route6() in the #else case.
drivers/infiniband/sw/rxe/rxe_net.c | 38 ++++++++++++++++------------- 1 file changed, 21 insertions(+), 17 deletions(-)
drivers/infiniband/sw/rxe/rxe_net.c +21 -17
@@ -20,9 +20,10 @@static struct rxe_recv_sockets recv_sockets; -static struct dst_entry *rxe_find_route4 (struct net_device *ndev, -struct in_addr *saddr, -struct in_addr *daddr) +static struct dst_entry *rxe_find_route4 (struct rxe_qp *qp, +struct net_device *ndev, +struct in_addr *saddr, +struct in_addr *daddr) {struct rtable *rt;struct flowi4 fl = { {0 } };
@@ -35,7 +36,7 @@ static struct dst_entry *rxe_find_route4(struct net_device *ndev, rt =ip_route_output_key (&init_net, &fl);if (IS_ERR (rt)) { -pr_err_ratelimited ("no route to %pI4\n" , &daddr->s_addr); +rxe_dbg_qp (qp,"no route to %pI4\n" , &daddr->s_addr);return NULL ; }
@@ -43,7 +44,8 @@ static struct dst_entry *rxe_find_route4(struct net_device *ndev, }#if IS_ENABLED (CONFIG_IPV6 ) -static struct dst_entry *rxe_find_route6 (struct net_device *ndev, +static struct dst_entry *rxe_find_route6 (struct rxe_qp *qp, +struct net_device *ndev,struct in6_addr *saddr,struct in6_addr *daddr) {
@@ -60,12 +62,12 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev, recv_sockets.sk6->sk, &fl6, NULL);if (IS_ERR (ndst)) { -pr_err_ratelimited ("no route to %pI6\n" , daddr); +rxe_dbg_qp (qp,"no route to %pI6\n" , daddr);return NULL ; }if (unlikely (ndst->error)) { -pr_err ("no route to %pI6\n" , daddr); +rxe_dbg_qp (qp,"no route to %pI6\n" , daddr); goto put; }
@@ -77,7 +79,8 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,#else -static struct dst_entry *rxe_find_route6 (struct net_device *ndev, +static struct dst_entry *rxe_find_route6 (struct rxe_qp *qp, +struct net_device *ndev,struct in6_addr *saddr,struct in6_addr *daddr) {
@@ -105,14 +108,14 @@ static struct dst_entry *rxe_find_route(struct net_device *ndev, saddr = &av->sgid_addr._sockaddr_in.sin_addr; daddr = &av->dgid_addr._sockaddr_in.sin_addr; - dst =rxe_find_route4 (ndev, saddr, daddr); + dst =rxe_find_route4 (qp, ndev, saddr, daddr); }else if (av->network_type ==RXE_NETWORK_TYPE_IPV6 ) {struct in6_addr *saddr6;struct in6_addr *daddr6; saddr6 = &av->sgid_addr._sockaddr_in6.sin6_addr; daddr6 = &av->dgid_addr._sockaddr_in6.sin6_addr; - dst =rxe_find_route6 (ndev, saddr6, daddr6); + dst =rxe_find_route6 (qp, ndev, saddr6, daddr6);#if IS_ENABLED (CONFIG_IPV6 )if (dst) qp->dst_cookie =
@@ -282,7 +285,7 @@ static int prepare4(struct rxe_av *av, struct rxe_pkt_info *pkt, dst =rxe_find_route (skb->dev, qp, av);if (!dst) { -pr_err ("Host not reachable\n" ); +rxe_dbg_qp (qp,"Host not reachable\n" );return -EHOSTUNREACH ; }
@@ -306,7 +309,7 @@ static int prepare6(struct rxe_av *av, struct rxe_pkt_info *pkt, dst =rxe_find_route (skb->dev, qp, av);if (!dst) { -pr_err ("Host not reachable\n" ); +rxe_dbg_qp (qp,"Host not reachable\n" );return -EHOSTUNREACH ; }
@@ -365,7 +368,8 @@ static int rxe_send(struct sk_buff *skb, struct rxe_pkt_info *pkt) }else if (skb->protocol ==htons (ETH_P_IPV6 )) { err =ip6_local_out (dev_net (skb_dst (skb)->dev), skb->sk, skb); }else { -pr_err ("Unknown layer 3 protocol: %d\n" , skb->protocol); +rxe_dbg_qp (pkt->qp,"Unknown layer 3 protocol: %d\n" , + skb->protocol);atomic_dec (&pkt->qp->skb_out);rxe_put (pkt->qp);kfree_skb (skb);
@@ -373,7 +377,7 @@ static int rxe_send(struct sk_buff *skb, struct rxe_pkt_info *pkt) }if (unlikely (net_xmit_eval (err))) { -pr_debug ("error sending packet: %d\n" , err); +rxe_dbg_qp (pkt->qp,"error sending packet: %d\n" , err);return -EAGAIN ; }
@@ -411,7 +415,7 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,if ((is_request && (qp->req.state !=QP_STATE_READY )) || (!is_request && (qp->resp.state !=QP_STATE_READY ))) { -pr_info ("Packet dropped. QP is not in ready state\n" ); +rxe_dbg_qp (qp,"Packet dropped. QP is not in ready state\n" ); goto drop; }
@@ -592,7 +596,7 @@ static int rxe_notify(struct notifier_block *not_blk,rxe_port_down (rxe);break ;case NETDEV_CHANGEMTU : -pr_info ("%s changed mtu to %d\n" , ndev->name, ndev->mtu); +rxe_dbg (rxe,"%s changed mtu to %d\n" , ndev->name, ndev->mtu);rxe_set_mtu (rxe, ndev->mtu);break ;case NETDEV_CHANGE :
@@ -604,7 +608,7 @@ static int rxe_notify(struct notifier_block *not_blk,case NETDEV_CHANGENAME :case NETDEV_FEAT_CHANGE :default : -pr_info ("ignoring netdev event = %ld for %s\n" , +rxe_dbg (rxe,"ignoring netdev event = %ld for %s\n" , event, ndev->name);break ; }
Signature · 1 line
2.34.1
PATCH v2 7/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_qp.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_qp.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_qp.c | 65 ++++++++++++++---------------- 1 file changed, 30 insertions(+), 35 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +30 -35
@@ -19,33 +19,33 @@ static int rxe_qp_chk_cap(struct rxe_dev *rxe, struct ib_qp_cap *cap, int has_srq) {if (cap->max_send_wr > rxe->attr.max_qp_wr) { -pr_debug ("invalid send wr = %u > %d\n" , +rxe_dbg (rxe,"invalid send wr = %u > %d\n" , cap->max_send_wr, rxe->attr.max_qp_wr); goto err1; }if (cap->max_send_sge > rxe->attr.max_send_sge) { -pr_debug ("invalid send sge = %u > %d\n" , +rxe_dbg (rxe,"invalid send sge = %u > %d\n" , cap->max_send_sge, rxe->attr.max_send_sge); goto err1; }if (!has_srq) {if (cap->max_recv_wr > rxe->attr.max_qp_wr) { -pr_debug ("invalid recv wr = %u > %d\n" , +rxe_dbg (rxe,"invalid recv wr = %u > %d\n" , cap->max_recv_wr, rxe->attr.max_qp_wr); goto err1; }if (cap->max_recv_sge > rxe->attr.max_recv_sge) { -pr_debug ("invalid recv sge = %u > %d\n" , +rxe_dbg (rxe,"invalid recv sge = %u > %d\n" , cap->max_recv_sge, rxe->attr.max_recv_sge); goto err1; } }if (cap->max_inline_data > rxe->max_inline_data) { -pr_debug ("invalid max inline data = %u > %d\n" , +rxe_dbg (rxe,"invalid max inline data = %u > %d\n" , cap->max_inline_data, rxe->max_inline_data); goto err1; }
@@ -73,7 +73,7 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init) }if (!init->recv_cq || !init->send_cq) { -pr_debug ("missing cq\n" ); +rxe_dbg (rxe,"missing cq\n" ); goto err1; }
@@ -82,14 +82,14 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init)if (init->qp_type ==IB_QPT_GSI ) {if (!rdma_is_port_valid (&rxe->ib_dev, port_num)) { -pr_debug ("invalid port = %d\n" , port_num); +rxe_dbg (rxe,"invalid port = %d\n" , port_num); goto err1; } port = &rxe->port;if (init->qp_type ==IB_QPT_GSI && port->qp_gsi_index) { -pr_debug ("GSI QP exists for port %d\n" , port_num); +rxe_dbg (rxe,"GSI QP exists for port %d\n" , port_num); goto err1; } }
@@ -264,9 +264,6 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp, wqe_size =rcv_wqe_size (qp->rq.max_sge); -pr_debug ("qp#%d max_wr = %d, max_sge = %d, wqe_size = %d\n" , -qp_num (qp), qp->rq.max_wr, qp->rq.max_sge, wqe_size); - type =QUEUE_TYPE_FROM_CLIENT ; qp->rq.queue =rxe_queue_init (rxe, &qp->rq.max_wr, wqe_size, type);
@@ -395,7 +392,7 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp, attr->qp_state : cur_state;if (!ib_modify_qp_is_ok (cur_state, new_state,qp_type (qp), mask)) { -pr_debug ("invalid mask or state for qp\n" ); +rxe_dbg_qp (qp,"invalid mask or state\n" ); goto err1; }
@@ -409,7 +406,7 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,if (mask &IB_QP_PORT ) {if (!rdma_is_port_valid (&rxe->ib_dev, attr->port_num)) { -pr_debug ("invalid port %d\n" , attr->port_num); +rxe_dbg_qp (qp,"invalid port %d\n" , attr->port_num); goto err1; } }
@@ -424,11 +421,11 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,if (rxe_av_chk_attr (rxe, &attr->alt_ah_attr)) goto err1;if (!rdma_is_port_valid (&rxe->ib_dev, attr->alt_port_num)) { -pr_debug ("invalid alt port %d\n" , attr->alt_port_num); +rxe_dbg_qp (qp,"invalid alt port %d\n" , attr->alt_port_num); goto err1; }if (attr->alt_timeout >31 ) { -pr_debug ("invalid QP alt timeout %d > 31\n" , +rxe_dbg_qp (qp,"invalid alt timeout %d > 31\n" , attr->alt_timeout); goto err1; }
@@ -441,7 +438,7 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,enum ib_mtu mtu = attr->path_mtu;if (mtu > max_mtu) { -pr_debug ("invalid mtu (%d) > (%d)\n" , +rxe_dbg_qp (qp,"invalid mtu (%d) > (%d)\n" ,ib_mtu_enum_to_int (mtu),ib_mtu_enum_to_int (max_mtu)); goto err1;
@@ -450,7 +447,7 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,if (mask &IB_QP_MAX_QP_RD_ATOMIC ) {if (attr->max_rd_atomic > rxe->attr.max_qp_rd_atom) { -pr_debug ("invalid max_rd_atomic %d > %d\n" , +rxe_dbg_qp (qp,"invalid max_rd_atomic %d > %d\n" , attr->max_rd_atomic, rxe->attr.max_qp_rd_atom); goto err1;
@@ -459,7 +456,8 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,if (mask &IB_QP_TIMEOUT ) {if (attr->timeout >31 ) { -pr_debug ("invalid QP timeout %d > 31\n" , attr->timeout); +rxe_dbg_qp (qp,"invalid timeout %d > 31\n" , + attr->timeout); goto err1; } }
@@ -637,27 +635,24 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask,if (mask &IB_QP_RETRY_CNT ) { qp->attr.retry_cnt = attr->retry_cnt; qp->comp.retry_cnt = attr->retry_cnt; -pr_debug ("qp#%d set retry count = %d\n" ,qp_num (qp), - attr->retry_cnt); +rxe_dbg_qp (qp,"set retry count = %d\n" , attr->retry_cnt); }if (mask &IB_QP_RNR_RETRY ) { qp->attr.rnr_retry = attr->rnr_retry; qp->comp.rnr_retry = attr->rnr_retry; -pr_debug ("qp#%d set rnr retry count = %d\n" ,qp_num (qp), - attr->rnr_retry); +rxe_dbg_qp (qp,"set rnr retry count = %d\n" , attr->rnr_retry); }if (mask &IB_QP_RQ_PSN ) { qp->attr.rq_psn = (attr->rq_psn &BTH_PSN_MASK ); qp->resp.psn = qp->attr.rq_psn; -pr_debug ("qp#%d set resp psn = 0x%x\n" ,qp_num (qp), - qp->resp.psn); +rxe_dbg_qp (qp,"set resp psn = 0x%x\n" , qp->resp.psn); }if (mask &IB_QP_MIN_RNR_TIMER ) { qp->attr.min_rnr_timer = attr->min_rnr_timer; -pr_debug ("qp#%d set min rnr timer = 0x%x\n" ,qp_num (qp), +rxe_dbg_qp (qp,"set min rnr timer = 0x%x\n" , attr->min_rnr_timer); }
@@ -665,7 +660,7 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask, qp->attr.sq_psn = (attr->sq_psn &BTH_PSN_MASK ); qp->req.psn = qp->attr.sq_psn; qp->comp.psn = qp->attr.sq_psn; -pr_debug ("qp#%d set req psn = 0x%x\n" ,qp_num (qp), qp->req.psn); +rxe_dbg_qp (qp,"set req psn = 0x%x\n" , qp->req.psn); }if (mask &IB_QP_PATH_MIG_STATE )
@@ -679,40 +674,40 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask,switch (attr->qp_state) {case IB_QPS_RESET : -pr_debug ("qp#%d state -> RESET\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> RESET\n" );rxe_qp_reset (qp);break ;case IB_QPS_INIT : -pr_debug ("qp#%d state -> INIT\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> INIT\n" ); qp->req.state =QP_STATE_INIT ; qp->resp.state =QP_STATE_INIT ; qp->comp.state =QP_STATE_INIT ;break ;case IB_QPS_RTR : -pr_debug ("qp#%d state -> RTR\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> RTR\n" ); qp->resp.state =QP_STATE_READY ;break ;case IB_QPS_RTS : -pr_debug ("qp#%d state -> RTS\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> RTS\n" ); qp->req.state =QP_STATE_READY ; qp->comp.state =QP_STATE_READY ;break ;case IB_QPS_SQD : -pr_debug ("qp#%d state -> SQD\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> SQD\n" );rxe_qp_drain (qp);break ;case IB_QPS_SQE : -pr_warn ("qp#%d state -> SQE !!?\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> SQE !!?\n" );/* Not possible from modify_qp. */ break ;case IB_QPS_ERR : -pr_debug ("qp#%d state -> ERR\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"state -> ERR\n" );rxe_qp_error (qp);break ; }
@@ -752,7 +747,7 @@ int rxe_qp_to_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask) attr->sq_draining =0 ; } -pr_debug ("attr->sq_draining = %d\n" , attr->sq_draining); +rxe_dbg_qp (qp,"attr->sq_draining = %d\n" , attr->sq_draining);return 0 ; }
@@ -764,7 +759,7 @@ int rxe_qp_chk_destroy(struct rxe_qp *qp)* will fail immediately. */ if (atomic_read (&qp->mcg_num)) { -pr_debug ("Attempt to destroy QP while attached to multicast group\n" ); +rxe_dbg_qp (qp,"Attempt to destroy while attached to multicast group\n" );return -EBUSY ; }
Signature · 1 line
2.34.1
PATCH v2 8/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_req.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_req.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_req.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/infiniband/sw/rxe/rxe_req.c +5 -5
@@ -100,7 +100,7 @@ void rnr_nak_timer(struct timer_list *t) {struct rxe_qp *qp =from_timer (qp, t, rnr_nak_timer); -pr_debug ("%s: fired for qp#%d\n" , __func__,qp_num (qp)); +rxe_dbg_qp (qp,"nak timer fired\n" );/* request a send queue retry */ qp->req.need_retry =1 ;
@@ -595,7 +595,7 @@ static int rxe_do_local_ops(struct rxe_qp *qp, struct rxe_send_wqe *wqe) }break ;default : -pr_err ("Unexpected send wqe opcode %d\n" , opcode); +rxe_dbg_qp (qp,"Unexpected send wqe opcode %d\n" , opcode); wqe->status =IB_WC_LOC_QP_OP_ERR ;return -EINVAL ; }
@@ -748,14 +748,14 @@ int rxe_requester(void *arg) av =rxe_get_av (&pkt, &ah);if (unlikely (!av)) { -pr_err ("qp#%d Failed no address vector\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"Failed no address vector\n" ); wqe->status =IB_WC_LOC_QP_OP_ERR ; goto err; } skb =init_req_packet (qp, av, wqe, opcode, payload, &pkt);if (unlikely (!skb)) { -pr_err ("qp#%d Failed allocating skb\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"Failed allocating skb\n" ); wqe->status =IB_WC_LOC_QP_OP_ERR ;if (ah)rxe_put (ah);
@@ -764,7 +764,7 @@ int rxe_requester(void *arg) err =finish_packet (qp, av, wqe, &pkt, skb, payload);if (unlikely (err)) { -pr_debug ("qp#%d Error during finish packet\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"Error during finish packet\n" );if (err == -EFAULT ) wqe->status =IB_WC_LOC_PROT_ERR ;else
Signature · 1 line
2.34.1
PATCH v2 9/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_resp.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_resp.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_resp.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/infiniband/sw/rxe/rxe_resp.c +7 -10
@@ -317,7 +317,7 @@ static enum resp_states get_srq_wqe(struct rxe_qp *qp)/* don't trust user space data */ if (unlikely (wqe->dma.num_sge > srq->rq.max_sge)) {spin_unlock_irqrestore (&srq->rq.consumer_lock, flags); -pr_warn ("%s: invalid num_sge in SRQ entry\n" , __func__); +rxe_dbg_qp (qp,"invalid num_sge in SRQ entry\n" );return RESPST_ERR_MALFORMED_WQE ; } size =sizeof (*wqe) + wqe->dma.num_sge*sizeof (struct rxe_sge );
@@ -453,15 +453,14 @@ static enum resp_states check_rkey(struct rxe_qp *qp,if (rkey_is_mw (rkey)) { mw =rxe_lookup_mw (qp, access, rkey);if (!mw) { -pr_debug ("%s: no MW matches rkey %#x\n" , - __func__, rkey); +rxe_dbg_qp (qp,"no MW matches rkey %#x\n" , rkey); state =RESPST_ERR_RKEY_VIOLATION ; goto err; } mr = mw->mr;if (!mr) { -pr_err ("%s: MW doesn't have an MR\n" , __func__); +rxe_dbg_qp (qp,"MW doesn't have an MR\n" ); state =RESPST_ERR_RKEY_VIOLATION ; goto err; }
@@ -474,8 +473,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp, }else { mr =lookup_mr (qp->pd, access, rkey,RXE_LOOKUP_REMOTE );if (!mr) { -pr_debug ("%s: no MR matches rkey %#x\n" , - __func__, rkey); +rxe_dbg_qp (qp,"no MR matches rkey %#x\n" , rkey); state =RESPST_ERR_RKEY_VIOLATION ; goto err; }
@@ -1044,7 +1042,7 @@ static int send_common_ack(struct rxe_qp *qp, u8 syndrome, u32 psn, err =rxe_xmit_packet (qp, &ack_pkt, skb);if (err) -pr_err_ratelimited ("Failed sending %s\n" , msg); +rxe_dbg_qp (qp,"Failed sending %s\n" , msg);return err; }
@@ -1290,8 +1288,7 @@ int rxe_responder(void *arg) }while (1 ) { -pr_debug ("qp#%d state = %s\n" ,qp_num (qp), - resp_state_name[state]); +rxe_dbg_qp (qp,"state = %s\n" , resp_state_name[state]);switch (state) {case RESPST_GET_REQ : state =get_req (qp, &pkt);
@@ -1448,7 +1445,7 @@ int rxe_responder(void *arg)case RESPST_ERROR : qp->resp.goto_error =0 ; -pr_debug ("qp#%d moved to error state\n" ,qp_num (qp)); +rxe_dbg_qp (qp,"moved to error state\n" );rxe_qp_error (qp); goto exit;
Signature · 1 line
2.34.1
PATCH v2 10/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_srq.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_srq.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_srq.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/infiniband/sw/rxe/rxe_srq.c +10 -10
@@ -13,13 +13,13 @@ int rxe_srq_chk_init(struct rxe_dev *rxe, struct ib_srq_init_attr *init)struct ib_srq_attr *attr = &init->attr;if (attr->max_wr > rxe->attr.max_srq_wr) { -pr_warn ("max_wr(%d) > max_srq_wr(%d)\n" , +rxe_dbg (rxe,"max_wr(%d) > max_srq_wr(%d)\n" , attr->max_wr, rxe->attr.max_srq_wr); goto err1; }if (attr->max_wr <=0 ) { -pr_warn ("max_wr(%d) <= 0\n" , attr->max_wr); +rxe_dbg (rxe,"max_wr(%d) <= 0\n" , attr->max_wr); goto err1; }
@@ -27,7 +27,7 @@ int rxe_srq_chk_init(struct rxe_dev *rxe, struct ib_srq_init_attr *init) attr->max_wr =RXE_MIN_SRQ_WR ;if (attr->max_sge > rxe->attr.max_srq_sge) { -pr_warn ("max_sge(%d) > max_srq_sge(%d)\n" , +rxe_dbg (rxe,"max_sge(%d) > max_srq_sge(%d)\n" , attr->max_sge, rxe->attr.max_srq_sge); goto err1; }
@@ -65,7 +65,7 @@ int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq, type =QUEUE_TYPE_FROM_CLIENT ; q =rxe_queue_init (rxe, &srq->rq.max_wr, srq_wqe_size, type);if (!q) { -pr_warn ("unable to allocate queue for srq\n" ); +rxe_dbg_srq (srq,"Unable to allocate queue\n" );return -ENOMEM ; }
@@ -94,24 +94,24 @@ int rxe_srq_chk_attr(struct rxe_dev *rxe, struct rxe_srq *srq, struct ib_srq_attr *attr, enum ib_srq_attr_mask mask) {if (srq->error) { -pr_warn ("srq in error state\n" ); +rxe_dbg_srq (srq,"in error state\n" ); goto err1; }if (mask &IB_SRQ_MAX_WR ) {if (attr->max_wr > rxe->attr.max_srq_wr) { -pr_warn ("max_wr(%d) > max_srq_wr(%d)\n" , +rxe_dbg_srq (srq,"max_wr(%d) > max_srq_wr(%d)\n" , attr->max_wr, rxe->attr.max_srq_wr); goto err1; }if (attr->max_wr <=0 ) { -pr_warn ("max_wr(%d) <= 0\n" , attr->max_wr); +rxe_dbg_srq (srq,"max_wr(%d) <= 0\n" , attr->max_wr); goto err1; }if (srq->limit && (attr->max_wr < srq->limit)) { -pr_warn ("max_wr (%d) < srq->limit (%d)\n" , +rxe_dbg_srq (srq,"max_wr (%d) < srq->limit (%d)\n" , attr->max_wr, srq->limit); goto err1; }
@@ -122,13 +122,13 @@ int rxe_srq_chk_attr(struct rxe_dev *rxe, struct rxe_srq *srq,if (mask &IB_SRQ_LIMIT ) {if (attr->srq_limit > rxe->attr.max_srq_wr) { -pr_warn ("srq_limit(%d) > max_srq_wr(%d)\n" , +rxe_dbg_srq (srq,"srq_limit(%d) > max_srq_wr(%d)\n" , attr->srq_limit, rxe->attr.max_srq_wr); goto err1; }if (attr->srq_limit > srq->rq.queue->buf->index_mask) { -pr_warn ("srq_limit (%d) > cur limit(%d)\n" , +rxe_dbg_srq (srq,"srq_limit (%d) > cur limit(%d)\n" , attr->srq_limit, srq->rq.queue->buf->index_mask); goto err1;
Signature · 1 line
2.34.1
PATCH v2 11/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_verbs.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_verbs.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -1
@@ -1103,7 +1103,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name) err =ib_register_device (dev, ibdev_name,NULL );if (err) -pr_warn ("%s failed with error %d\n" , __func__, err); +rxe_dbg (rxe,"failed with error %d\n" , err);/* * Note that rxe may be invalid at this point if another thread
Signature · 1 line
2.34.1
PATCH v2 12/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_av.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_av.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_av.c | 43 ++++++++++++++++++++++----- drivers/infiniband/sw/rxe/rxe_loc.h | 8 ++--- drivers/infiniband/sw/rxe/rxe_qp.c | 4 +-- drivers/infiniband/sw/rxe/rxe_verbs.c | 13 ++++---- 4 files changed, 47 insertions(+), 21 deletions(-)
drivers/infiniband/sw/rxe/rxe_av.c +36 -7
@@ -14,26 +14,45 @@ void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av)memcpy (av->dmac, attr->roce.dmac,ETH_ALEN ); } -int rxe_av_chk_attr (struct rxe_dev *rxe,struct rdma_ah_attr *attr) +static int chk_attr (void *obj,struct rdma_ah_attr *attr,bool obj_is_ah) {const struct ib_global_route *grh =rdma_ah_read_grh (attr);struct rxe_port *port; +struct rxe_dev *rxe; +struct rxe_qp *qp; +struct rxe_ah *ah;int type; +if (obj_is_ah) { + ah = obj; + rxe =to_rdev (ah->ibah.device); + }else { + qp = obj; + rxe =to_rdev (qp->ibqp.device); + } + port = &rxe->port;if (rdma_ah_get_ah_flags (attr) &IB_AH_GRH ) {if (grh->sgid_index > port->attr.gid_tbl_len) { -pr_warn ("invalid sgid index = %d\n" , - grh->sgid_index); +if (obj_is_ah) +rxe_dbg_ah (ah,"invalid sgid index = %d\n" , + grh->sgid_index); +else +rxe_dbg_qp (qp,"invalid sgid index = %d\n" , + grh->sgid_index);return -EINVAL ; } type =rdma_gid_attr_network_type (grh->sgid_attr);if (type <RDMA_NETWORK_IPV4 || type >RDMA_NETWORK_IPV6 ) { -pr_warn ("invalid network type for rdma_rxe = %d\n" , - type); +if (obj_is_ah) +rxe_dbg_ah (ah,"invalid network type for rdma_rxe = %d\n" , + type); +else +rxe_dbg_qp (qp,"invalid network type for rdma_rxe = %d\n" , + type);return -EINVAL ; } }
@@ -41,6 +60,16 @@ int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr)return 0 ; } +int rxe_av_chk_attr (struct rxe_qp *qp,struct rdma_ah_attr *attr) +{ +return chk_attr (qp, attr, false); +} + +int rxe_ah_chk_attr (struct rxe_ah *ah,struct rdma_ah_attr *attr) +{ +return chk_attr (ah, attr, true); +} +void rxe_av_from_attr (u8 port_num,struct rxe_av *av,struct rdma_ah_attr *attr) {
@@ -121,12 +150,12 @@ struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt, struct rxe_ah **ahp)/* only new user provider or kernel client */ ah =rxe_pool_get_index (&pkt->rxe->ah_pool, ah_num);if (!ah) { -pr_warn ("Unable to find AH matching ah_num\n" ); +rxe_dbg_qp (pkt->qp,"Unable to find AH matching ah_num\n" );return NULL ; }if (rxe_ah_pd (ah) != pkt->qp->pd) { -pr_warn ("PDs don't match for AH and QP\n" ); +rxe_dbg_qp (pkt->qp,"PDs don't match for AH and QP\n" );rxe_put (ah);return NULL ; }
drivers/infiniband/sw/rxe/rxe_loc.h +2 -6
@@ -9,16 +9,12 @@/* rxe_av.c */ void rxe_init_av (struct rdma_ah_attr *attr,struct rxe_av *av); - -int rxe_av_chk_attr (struct rxe_dev *rxe,struct rdma_ah_attr *attr); - +int rxe_av_chk_attr (struct rxe_qp *qp,struct rdma_ah_attr *attr); +int rxe_ah_chk_attr (struct rxe_ah *ah,struct rdma_ah_attr *attr);void rxe_av_from_attr (u8 port_num,struct rxe_av *av,struct rdma_ah_attr *attr); -void rxe_av_to_attr (struct rxe_av *av,struct rdma_ah_attr *attr); -void rxe_av_fill_ip_info (struct rxe_av *av,struct rdma_ah_attr *attr); -struct rxe_av *rxe_get_av (struct rxe_pkt_info *pkt,struct rxe_ah **ahp);/* rxe_cq.c */
drivers/infiniband/sw/rxe/rxe_qp.c +2 -2
@@ -414,11 +414,11 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,if (mask &IB_QP_CAP &&rxe_qp_chk_cap (rxe, &attr->cap, !!qp->srq)) goto err1; -if (mask &IB_QP_AV &&rxe_av_chk_attr (rxe, &attr->ah_attr)) +if (mask &IB_QP_AV &&rxe_av_chk_attr (qp, &attr->ah_attr)) goto err1;if (mask &IB_QP_ALT_PATH ) { -if (rxe_av_chk_attr (rxe, &attr->alt_ah_attr)) +if (rxe_av_chk_attr (qp, &attr->alt_ah_attr)) goto err1;if (!rdma_is_port_valid (&rxe->ib_dev, attr->alt_port_num)) {rxe_dbg_qp (qp,"invalid alt port %d\n" , attr->alt_port_num);
drivers/infiniband/sw/rxe/rxe_verbs.c +7 -6
@@ -172,10 +172,6 @@ static int rxe_create_ah(struct ib_ah *ibah, ah->is_user = false; } - err =rxe_av_chk_attr (rxe, init_attr->ah_attr); -if (err) -return err; - err =rxe_add_to_pool_ah (&rxe->ah_pool, ah, init_attr->flags &RDMA_CREATE_AH_SLEEPABLE );if (err)
@@ -184,6 +180,12 @@ static int rxe_create_ah(struct ib_ah *ibah,/* create index > 0 */ ah->ah_num = ah->elem.index; + err =rxe_ah_chk_attr (ah, init_attr->ah_attr); +if (err) { +rxe_cleanup (ah); +return err; + } +if (uresp) {/* only if new user provider */ err = copy_to_user(&uresp->ah_num, &ah->ah_num,
@@ -206,10 +208,9 @@ static int rxe_create_ah(struct ib_ah *ibah,static int rxe_modify_ah (struct ib_ah *ibah,struct rdma_ah_attr *attr) {int err; -struct rxe_dev *rxe =to_rdev (ibah->device);struct rxe_ah *ah =to_rah (ibah); - err =rxe_av_chk_attr (rxe, attr); + err =rxe_ah_chk_attr (ah, attr);if (err)return err;
Signature · 1 line
2.34.1
PATCH v2 13/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_task.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_task.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_task.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_task.c +4 -3
@@ -29,6 +29,7 @@ static void do_task(struct tasklet_struct *t)int cont;int ret;struct rxe_task *task =from_tasklet (task, t, tasklet); +struct rxe_qp *qp = (struct rxe_qp *)task->arg;unsigned int iterations =RXE_MAX_ITERATIONS ;spin_lock_bh (&task->lock);
@@ -47,7 +48,7 @@ static void do_task(struct tasklet_struct *t)default :spin_unlock_bh (&task->lock); -pr_warn ("%s failed with bad state %d\n" , __func__, task->state); +rxe_dbg_qp (qp,"failed with bad state %d\n" , task->state);return ; }
@@ -81,8 +82,8 @@ static void do_task(struct tasklet_struct *t)break ;default : -pr_warn ("%s failed with bad state %d\n" , __func__, - task->state); +rxe_dbg_qp (qp,"failed with bad state %d\n" , + task->state); }spin_unlock_bh (&task->lock); }while (cont);
Signature · 1 line
2.34.1
PATCH v2 14/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe.c with rxe_dbg_xxx(). Calls with a rxe device not yet in scope are left as is.
--- drivers/infiniband/sw/rxe/rxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe.c +2 -2
@@ -187,14 +187,14 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) exists =rxe_get_dev_from_net (ndev);if (exists) {ib_device_put (&exists->ib_dev); -pr_err ("already configured on %s\n" , ndev->name); +rxe_dbg (exists,"already configured on %s\n" , ndev->name); err = -EEXIST ; goto err; } err =rxe_net_add (ibdev_name, ndev);if (err) { -pr_err ("failed to add %s\n" , ndev->name); +rxe_dbg (exists,"failed to add %s\n" , ndev->name); goto err; } err:
Signature · 1 line
2.34.1
PATCH v2 15/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_icrc.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_icrc.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_icrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_icrc.c +2 -2
@@ -21,7 +21,7 @@ int rxe_icrc_init(struct rxe_dev *rxe) tfm =crypto_alloc_shash ("crc32" ,0 ,0 );if (IS_ERR (tfm)) { -pr_warn ("failed to init crc32 algorithm err:%ld\n" , +rxe_dbg (rxe,"failed to init crc32 algorithm err: %ld\n" ,PTR_ERR (tfm));return PTR_ERR (tfm); }
@@ -51,7 +51,7 @@ static __be32 rxe_crc32(struct rxe_dev *rxe, __be32 crc, void *next, size_t len) *(__be32 *)shash_desc_ctx (shash) = crc; err =crypto_shash_update (shash, next, len);if (unlikely (err)) { -pr_warn_ratelimited ("failed crc calculation, err: %d\n" , err); +rxe_dbg (rxe,"failed crc calculation, err: %d\n" , err);return (__force __be32 )crc32_le ((__force u32 )crc, next, len); }
Signature · 1 line
2.34.1
PATCH v2 16/16 RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mmap.c
In reply to Bob PearsonReplace calls to pr_xxx() in rxe_mmap.c with rxe_dbg_xxx().
--- drivers/infiniband/sw/rxe/rxe_mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_mmap.c +3 -3
@@ -79,7 +79,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)/* Don't allow a mmap larger than the object. */ if (size > ip->info.size) { -pr_err ("mmap region is larger than the object!\n" ); +rxe_dbg (rxe,"mmap region is larger than the object!\n" );spin_unlock_bh (&rxe->pending_lock); ret = -EINVAL ; goto done;
@@ -87,7 +87,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) goto found_it; } -pr_warn ("unable to find pending mmap info\n" ); +rxe_dbg (rxe,"unable to find pending mmap info\n" );spin_unlock_bh (&rxe->pending_lock); ret = -EINVAL ; goto done;
@@ -98,7 +98,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) ret =remap_vmalloc_range (vma, ip->obj,0 );if (ret) { -pr_err ("err %d from remap_vmalloc_range\n" , ret); +rxe_dbg (rxe,"err %d from remap_vmalloc_range\n" , ret); goto done; }
Signature · 1 line
2.34.1
Quoted 21 lines · Bob Pearson
This patch series replaces calls to
pr_xxxwith calls toibdev_dbgusing macros for rxe objects adapted from similar macros from siw, except in situations where the rdma device is not in scope.This patch series is based on the current for-next branch.
v2:
Fixed a typo in 01/16 inrxe_dbg_uc().
Made fixes to 01/16 from a comment by Jason Gunthorp to enclose macro parameters in parentheses.
Fixed an error in 06/16 caught by the kernel test robot <[email protected]>Bob Pearson (16):
RDMA/rxe: Addibdev_dbgmacros for rxe RDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_comp.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_cq.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_mr.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_mw.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_net.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_qp.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_req.c
Quoted 8 lines
RDMA/rxe: Replace
pr_xxxbyrxe_dbg_xxxinrxe_resp.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_srq.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_verbs.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_av.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_task.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_icrc.cRDMA/rxe: Replacepr_xxxbyrxe_dbg_xxxinrxe_mmap.c
Applied to for-next, thanks
Jason