| Message ID | 20221101202238.32836-2-rpearsonhpe@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | Use ibdev_dbg instead of pr_xxx | expand |
On Tue, Nov 01, 2022 at 03:22:25PM -0500, Bob Pearson wrote: > Add macros borrowed from siw to call dynamic debug macro ibdev_dbg. > > Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com> > --- > drivers/infiniband/sw/rxe/rxe.h | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/drivers/infiniband/sw/rxe/rxe.h b/drivers/infiniband/sw/rxe/rxe.h > index 30fbdf3bc76a..1c5186c26bce 100644 > --- a/drivers/infiniband/sw/rxe/rxe.h > +++ b/drivers/infiniband/sw/rxe/rxe.h > @@ -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->ibpd.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__) All the macro arguments here need to be enclosed in brackets if they are not a singular expression: #define rxe_dbg_mw(mw, fmt, ...) ibdev_dbg((mw)->ibmw.device, \ "mw#%d %s: " fmt, (mw)->elem.index, __func__, ##__VA_ARGS__) Jason
On 11/2/22 07:57, Jason Gunthorpe wrote: > On Tue, Nov 01, 2022 at 03:22:25PM -0500, Bob Pearson wrote: >> Add macros borrowed from siw to call dynamic debug macro ibdev_dbg. >> >> Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com> >> --- >> drivers/infiniband/sw/rxe/rxe.h | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/drivers/infiniband/sw/rxe/rxe.h b/drivers/infiniband/sw/rxe/rxe.h >> index 30fbdf3bc76a..1c5186c26bce 100644 >> --- a/drivers/infiniband/sw/rxe/rxe.h >> +++ b/drivers/infiniband/sw/rxe/rxe.h >> @@ -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->ibpd.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__) > > All the macro arguments here need to be enclosed in brackets if they > are not a singular expression: > > #define rxe_dbg_mw(mw, fmt, ...) ibdev_dbg((mw)->ibmw.device, \ > "mw#%d %s: " fmt, (mw)->elem.index, __func__, ##__VA_ARGS__) > > Jason Thanks. I just sent v2 with this fix and a couple of others. Bob
diff --git a/drivers/infiniband/sw/rxe/rxe.h b/drivers/infiniband/sw/rxe/rxe.h index 30fbdf3bc76a..1c5186c26bce 100644 --- a/drivers/infiniband/sw/rxe/rxe.h +++ b/drivers/infiniband/sw/rxe/rxe.h @@ -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->ibpd.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);
Add macros borrowed from siw to call dynamic debug macro ibdev_dbg. Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com> --- drivers/infiniband/sw/rxe/rxe.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)