Skip to content

Commit 9ac01f4

Browse files
Bob Pearsonjgunthorpe
authored andcommitted
RDMA/rxe: Extend dbg log messages to err and info
Extend the dbg log messages (e.g. rxe_dbg_xxx) to include err and info types. rxe.c is modified to use these new log messages as examples. Link: https://lore.kernel.org/r/20230303221623.8053-4-rpearsonhpe@gmail.com Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent a9fb328 commit 9ac01f4

File tree

2 files changed

+47
-3
lines changed

2 files changed

+47
-3
lines changed

drivers/infiniband/sw/rxe/rxe.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ void rxe_set_mtu(struct rxe_dev *rxe, unsigned int ndev_mtu)
160160

161161
port->attr.active_mtu = mtu;
162162
port->mtu_cap = ib_mtu_enum_to_int(mtu);
163+
164+
rxe_info_dev(rxe, "Set mtu to %d", port->mtu_cap);
163165
}
164166

165167
/* called by ifc layer to create new rxe device.
@@ -179,22 +181,22 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev)
179181
int err = 0;
180182

181183
if (is_vlan_dev(ndev)) {
182-
pr_err("rxe creation allowed on top of a real device only\n");
184+
rxe_err("rxe creation allowed on top of a real device only");
183185
err = -EPERM;
184186
goto err;
185187
}
186188

187189
rxe = rxe_get_dev_from_net(ndev);
188190
if (rxe) {
189191
ib_device_put(&rxe->ib_dev);
190-
rxe_dbg_dev(rxe, "already configured on %s\n", ndev->name);
192+
rxe_err_dev(rxe, "already configured on %s", ndev->name);
191193
err = -EEXIST;
192194
goto err;
193195
}
194196

195197
err = rxe_net_add(ibdev_name, ndev);
196198
if (err) {
197-
pr_debug("failed to add %s\n", ndev->name);
199+
rxe_err("failed to add %s\n", ndev->name);
198200
goto err;
199201
}
200202
err:

drivers/infiniband/sw/rxe/rxe.h

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,48 @@
5858
#define rxe_dbg_mw(mw, fmt, ...) ibdev_dbg((mw)->ibmw.device, \
5959
"mw#%d %s: " fmt, (mw)->elem.index, __func__, ##__VA_ARGS__)
6060

61+
#define rxe_err(fmt, ...) pr_err_ratelimited("%s: " fmt "\n", __func__, \
62+
##__VA_ARGS__)
63+
#define rxe_err_dev(rxe, fmt, ...) ibdev_err_ratelimited(&(rxe)->ib_dev, \
64+
"%s: " fmt, __func__, ##__VA_ARGS__)
65+
#define rxe_err_uc(uc, fmt, ...) ibdev_err_ratelimited((uc)->ibuc.device, \
66+
"uc#%d %s: " fmt, (uc)->elem.index, __func__, ##__VA_ARGS__)
67+
#define rxe_err_pd(pd, fmt, ...) ibdev_err_ratelimited((pd)->ibpd.device, \
68+
"pd#%d %s: " fmt, (pd)->elem.index, __func__, ##__VA_ARGS__)
69+
#define rxe_err_ah(ah, fmt, ...) ibdev_err_ratelimited((ah)->ibah.device, \
70+
"ah#%d %s: " fmt, (ah)->elem.index, __func__, ##__VA_ARGS__)
71+
#define rxe_err_srq(srq, fmt, ...) ibdev_err_ratelimited((srq)->ibsrq.device, \
72+
"srq#%d %s: " fmt, (srq)->elem.index, __func__, ##__VA_ARGS__)
73+
#define rxe_err_qp(qp, fmt, ...) ibdev_err_ratelimited((qp)->ibqp.device, \
74+
"qp#%d %s: " fmt, (qp)->elem.index, __func__, ##__VA_ARGS__)
75+
#define rxe_err_cq(cq, fmt, ...) ibdev_err_ratelimited((cq)->ibcq.device, \
76+
"cq#%d %s: " fmt, (cq)->elem.index, __func__, ##__VA_ARGS__)
77+
#define rxe_err_mr(mr, fmt, ...) ibdev_err_ratelimited((mr)->ibmr.device, \
78+
"mr#%d %s: " fmt, (mr)->elem.index, __func__, ##__VA_ARGS__)
79+
#define rxe_err_mw(mw, fmt, ...) ibdev_err_ratelimited((mw)->ibmw.device, \
80+
"mw#%d %s: " fmt, (mw)->elem.index, __func__, ##__VA_ARGS__)
81+
82+
#define rxe_info(fmt, ...) pr_info_ratelimited("%s: " fmt "\n", __func__, \
83+
##__VA_ARGS__)
84+
#define rxe_info_dev(rxe, fmt, ...) ibdev_info_ratelimited(&(rxe)->ib_dev, \
85+
"%s: " fmt, __func__, ##__VA_ARGS__)
86+
#define rxe_info_uc(uc, fmt, ...) ibdev_info_ratelimited((uc)->ibuc.device, \
87+
"uc#%d %s: " fmt, (uc)->elem.index, __func__, ##__VA_ARGS__)
88+
#define rxe_info_pd(pd, fmt, ...) ibdev_info_ratelimited((pd)->ibpd.device, \
89+
"pd#%d %s: " fmt, (pd)->elem.index, __func__, ##__VA_ARGS__)
90+
#define rxe_info_ah(ah, fmt, ...) ibdev_info_ratelimited((ah)->ibah.device, \
91+
"ah#%d %s: " fmt, (ah)->elem.index, __func__, ##__VA_ARGS__)
92+
#define rxe_info_srq(srq, fmt, ...) ibdev_info_ratelimited((srq)->ibsrq.device, \
93+
"srq#%d %s: " fmt, (srq)->elem.index, __func__, ##__VA_ARGS__)
94+
#define rxe_info_qp(qp, fmt, ...) ibdev_info_ratelimited((qp)->ibqp.device, \
95+
"qp#%d %s: " fmt, (qp)->elem.index, __func__, ##__VA_ARGS__)
96+
#define rxe_info_cq(cq, fmt, ...) ibdev_info_ratelimited((cq)->ibcq.device, \
97+
"cq#%d %s: " fmt, (cq)->elem.index, __func__, ##__VA_ARGS__)
98+
#define rxe_info_mr(mr, fmt, ...) ibdev_info_ratelimited((mr)->ibmr.device, \
99+
"mr#%d %s: " fmt, (mr)->elem.index, __func__, ##__VA_ARGS__)
100+
#define rxe_info_mw(mw, fmt, ...) ibdev_info_ratelimited((mw)->ibmw.device, \
101+
"mw#%d %s: " fmt, (mw)->elem.index, __func__, ##__VA_ARGS__)
102+
61103
/* responder states */
62104
enum resp_states {
63105
RESPST_NONE,

0 commit comments

Comments
 (0)