From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: linux-kernel@vger.kernel.org, santosh.shilimkar@oracle.com
Subject: [net-next][PATCH v3 03/17] RDS: IB: include faddr in connection log
Date: Mon, 2 Jan 2017 14:45:38 -0800 [thread overview]
Message-ID: <1483397152-8307-4-git-send-email-santosh.shilimkar@oracle.com> (raw)
In-Reply-To: <1483397152-8307-1-git-send-email-santosh.shilimkar@oracle.com>
Also use pr_* for it.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---
net/rds/ib_cm.c | 19 +++++++++----------
net/rds/ib_recv.c | 4 ++--
net/rds/ib_send.c | 4 ++--
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 5b2ab95..b9da1e5 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -113,19 +113,18 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
}
if (conn->c_version < RDS_PROTOCOL(3, 1)) {
- printk(KERN_NOTICE "RDS/IB: Connection to %pI4 version %u.%u failed,"
- " no longer supported\n",
- &conn->c_faddr,
- RDS_PROTOCOL_MAJOR(conn->c_version),
- RDS_PROTOCOL_MINOR(conn->c_version));
+ pr_notice("RDS/IB: Connection <%pI4,%pI4> version %u.%u no longer supported\n",
+ &conn->c_laddr, &conn->c_faddr,
+ RDS_PROTOCOL_MAJOR(conn->c_version),
+ RDS_PROTOCOL_MINOR(conn->c_version));
rds_conn_destroy(conn);
return;
} else {
- printk(KERN_NOTICE "RDS/IB: connected to %pI4 version %u.%u%s\n",
- &conn->c_faddr,
- RDS_PROTOCOL_MAJOR(conn->c_version),
- RDS_PROTOCOL_MINOR(conn->c_version),
- ic->i_flowctl ? ", flow control" : "");
+ pr_notice("RDS/IB: connected <%pI4,%pI4> version %u.%u%s\n",
+ &conn->c_laddr, &conn->c_faddr,
+ RDS_PROTOCOL_MAJOR(conn->c_version),
+ RDS_PROTOCOL_MINOR(conn->c_version),
+ ic->i_flowctl ? ", flow control" : "");
}
/*
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 606a11f..6803b75 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -980,8 +980,8 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic,
} else {
/* We expect errors as the qp is drained during shutdown */
if (rds_conn_up(conn) || rds_conn_connecting(conn))
- rds_ib_conn_error(conn, "recv completion on %pI4 had status %u (%s), disconnecting and reconnecting\n",
- &conn->c_faddr,
+ rds_ib_conn_error(conn, "recv completion on <%pI4,%pI4> had status %u (%s), disconnecting and reconnecting\n",
+ &conn->c_laddr, &conn->c_faddr,
wc->status,
ib_wc_status_msg(wc->status));
}
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index 84d90c9..19eca5c 100644
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -300,8 +300,8 @@ void rds_ib_send_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc)
/* We expect errors as the qp is drained during shutdown */
if (wc->status != IB_WC_SUCCESS && rds_conn_up(conn)) {
- rds_ib_conn_error(conn, "send completion on %pI4 had status %u (%s), disconnecting and reconnecting\n",
- &conn->c_faddr, wc->status,
+ rds_ib_conn_error(conn, "send completion on <%pI4,%pI4> had status %u (%s), disconnecting and reconnecting\n",
+ &conn->c_laddr, &conn->c_faddr, wc->status,
ib_wc_status_msg(wc->status));
}
}
--
1.9.1
next prev parent reply other threads:[~2017-01-02 22:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 22:45 [net-next][PATCH v3 00/17] net: RDS updates Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 01/17] RDS: log the address on bind failure Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 02/17] RDS: mark few internal functions static to make sparse build happy Santosh Shilimkar
2017-01-02 22:45 ` Santosh Shilimkar [this message]
2017-01-02 22:45 ` [net-next][PATCH v3 04/17] RDS: IB: make the transport retry count smallest Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 05/17] RDS: RDMA: fix the ib_map_mr_sg_zbva() argument Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 06/17] RDS: RDMA: start rdma listening after init Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 07/17] RDS: RDMA: return appropriate error on rdma map failures Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 08/17] RDS: IB: split the mr registration and invalidation path Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 09/17] RDS: RDMA: silence the use_once mr log flood Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 10/17] RDS: IB: track and log active side endpoint in connection Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 11/17] RDS: IB: add few useful cache stasts Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 12/17] RDS: IB: Add vector spreading for cqs Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 13/17] RDS: RDMA: Fix the composite message user notification Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 14/17] RDS: IB: fix panic due to handlers running post teardown Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 15/17] RDS: add stat for socket recv memory usage Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 16/17] RDS: make message size limit compliant with spec Santosh Shilimkar
2017-01-02 22:45 ` [net-next][PATCH v3 17/17] RDS: add receive message trace used by application Santosh Shilimkar
2017-01-03 14:46 ` [net-next][PATCH v3 00/17] net: RDS updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483397152-8307-4-git-send-email-santosh.shilimkar@oracle.com \
--to=santosh.shilimkar@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).