Skip to content

Commit 1695087

Browse files
RDS: IB: suppress log prints for FLUSH_ERR/RETRY_EXC
Flush errors are normal while draining the QP and retry exceeded errors are normal for RC connections with finite transport retry. No need so flood the log file. RDS in-memory trace already logs it. Orabug: 22347191, 24663803 Tested-by: Michael Nowak <[email protected]> Tested-by: Rafael Alejandro Peralez <[email protected]> Tested-by: Liwen Huang <[email protected]> Tested-by: Hong Liu <[email protected]> Reviewed-by: Mukesh Kacker <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]>
1 parent b36ed73 commit 1695087

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

net/rds/ib_recv.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,9 +1341,11 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic,
13411341
} else {
13421342
/* We expect errors as the qp is drained during shutdown */
13431343
if (rds_conn_up(conn) || rds_conn_connecting(conn)) {
1344-
pr_warn("RDS/IB: recv completion <%pI4,%pI4,%d> had status %u vendor_err 0x%x, disconnecting and reconnecting\n",
1345-
&conn->c_laddr, &conn->c_faddr, conn->c_tos,
1346-
wc->status, wc->vendor_err);
1344+
/* Flush errors are normal while draining the QP */
1345+
if (wc->status != IB_WC_WR_FLUSH_ERR)
1346+
pr_warn("RDS/IB: recv completion <%pI4,%pI4,%d> had status %u vendor_err 0x%x, disconnecting and reconnecting\n",
1347+
&conn->c_laddr, &conn->c_faddr, conn->c_tos,
1348+
wc->status, wc->vendor_err);
13471349
rds_conn_drop(conn, DR_IB_RECV_COMP_ERR);
13481350
rds_rtd(RDS_RTD_ERR, "status %u => %s\n", wc->status,
13491351
rds_ib_wc_status_str(wc->status));

net/rds/ib_send.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,12 @@ void rds_ib_send_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc)
341341

342342
/* We expect errors as the qp is drained during shutdown */
343343
if (wc->status != IB_WC_SUCCESS && rds_conn_up(conn)) {
344-
pr_warn("RDS/IB: send completion <%pI4,%pI4,%d> status %u vendor_err 0x%x, disconnecting and reconnecting\n",
345-
&conn->c_laddr, &conn->c_faddr, conn->c_tos,
346-
wc->status, wc->vendor_err);
344+
/* Flush errors are normal while draining the QP */
345+
if (!(wc->status == IB_WC_WR_FLUSH_ERR ||
346+
wc->status == IB_WC_RETRY_EXC_ERR))
347+
pr_warn("RDS/IB: send completion <%pI4,%pI4,%d> status %u vendor_err 0x%x, disconnecting and reconnecting\n",
348+
&conn->c_laddr, &conn->c_faddr, conn->c_tos,
349+
wc->status, wc->vendor_err);
347350
rds_conn_drop(conn, DR_IB_SEND_COMP_ERR);
348351
rds_rtd(RDS_RTD_ERR, "status %u => %s\n", wc->status,
349352
rds_ib_wc_status_str(wc->status));

0 commit comments

Comments
 (0)