xprtrdma: Handle additional connection events

Commit 38ca83a5 added RDMA_CM_EVENT_TIMEWAIT_EXIT. But that status
is relevant only for consumers that re-use their QPs on new
connections. xprtrdma creates a fresh QP on reconnection, so that
event should be explicitly ignored.

Squelch the alarming "unexpected CM event" message.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Tested-by: Shirley Ma <shirley.ma@oracle.com>
Tested-by: Devesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 14 insertions, 11 deletions

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index c2253d4c64df..61c41298b4ea 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -326,8 +326,16 @@ static const char * const conn[] = {
         "rejected",
         "established",
         "disconnected",
-        "device removal"
+        "device removal",
+        "multicast join",
+        "multicast error",
+        "address change",
+        "timewait exit",
 };
+
+#define CONNECTION_MSG(status)                                          \
+        ((status) < ARRAY_SIZE(conn) ?                                  \
+                conn[(status)] : "unrecognized connection error")
 #endif
 
 static int
@@ -385,23 +393,18 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
         case RDMA_CM_EVENT_DEVICE_REMOVAL:
                 connstate = -ENODEV;
 connected:
-                dprintk("RPC:       %s: %s: %pI4:%u (ep 0x%p event 0x%x)\n",
-                        __func__,
-                        (event->event <= 11) ? conn[event->event] :
-                                                "unknown connection error",
-                        &addr->sin_addr.s_addr,
-                        ntohs(addr->sin_port),
-                        ep, event->event);
                 atomic_set(&rpcx_to_rdmax(ep->rep_xprt)->rx_buf.rb_credits, 1);
                 dprintk("RPC:       %s: %sconnected\n",
                                         __func__, connstate > 0 ? "" : "dis");
                 ep->rep_connected = connstate;
                 ep->rep_func(ep);
                 wake_up_all(&ep->rep_connect_wait);
-                break;
+                /*FALLTHROUGH*/
         default:
-                dprintk("RPC:       %s: unexpected CM event %d\n",
-                        __func__, event->event);
+                dprintk("RPC:       %s: %pI4:%u (ep 0x%p): %s\n",
+                        __func__, &addr->sin_addr.s_addr,
+                        ntohs(addr->sin_port), ep,
+                        CONNECTION_MSG(event->event));
                 break;
         }