From cdf462b19345f28984b8cc3bc099a95051137287 Mon Sep 17 00:00:00 2001 From: Amir Shehata Date: Thu, 30 Aug 2018 13:30:46 -0700 Subject: [PATCH] LU-11309 lnd: Clean up logging No need to output error in ksocknal_tx_done() as this error is tracked in lnet. No need to keep a cookie in the connection. It's always set to the message. This will allow us to set the msg's health status properly before calling lnet_finalize() Test-Parameters: trivial Signed-off-by: Amir Shehata Change-Id: I168c8ca32192ba4f8f4480e8e7384d45f0a062a7 Reviewed-on: https://review.whamcloud.com/33096 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Doug Oucharek Reviewed-by: Sonia Sharma Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/klnds/socklnd/socklnd.c | 5 ++++- lnet/klnds/socklnd/socklnd.h | 2 +- lnet/klnds/socklnd/socklnd_cb.c | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 0f5b15a..001fef6 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -1677,7 +1677,10 @@ ksocknal_destroy_conn(struct ksock_conn *conn) &conn->ksnc_ipaddr, conn->ksnc_port, conn->ksnc_rx_nob_wanted, conn->ksnc_rx_nob_left, ktime_get_seconds() - last_rcv); - lnet_finalize(conn->ksnc_cookie, -EIO); + if (conn->ksnc_lnet_msg) + conn->ksnc_lnet_msg->msg_health_status = + LNET_MSG_STATUS_REMOTE_ERROR; + lnet_finalize(conn->ksnc_lnet_msg, -EIO); break; case SOCKNAL_RX_LNET_HEADER: if (conn->ksnc_rx_started) diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index c639ae4..82101e4 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -349,7 +349,7 @@ struct ksock_conn { lnet_kiov_t *ksnc_rx_kiov; /* the page frags */ union ksock_rxiovspace ksnc_rx_iov_space;/* space for frag descriptors */ __u32 ksnc_rx_csum; /* partial checksum for incoming data */ - void *ksnc_cookie; /* rx lnet_finalize passthru arg */ + struct lnet_msg *ksnc_lnet_msg; /* rx lnet_finalize arg*/ struct ksock_msg ksnc_msg; /* incoming message buffer: * V2.x message takes the * whole struct diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index 01f9629..8139047 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -409,9 +409,6 @@ ksocknal_tx_done(struct lnet_ni *ni, struct ksock_tx *tx, int rc) ksocknal_free_tx(tx); if (lnetmsg != NULL) { /* KSOCK_MSG_NOOP go without lnetmsg */ - if (rc) - CERROR("tx failure rc = %d, hstatus = %d\n", rc, - hstatus); lnetmsg->msg_health_status = hstatus; lnet_finalize(lnetmsg, rc); } @@ -1345,7 +1342,10 @@ ksocknal_process_receive(struct ksock_conn *conn) le64_to_cpu(lhdr->src_nid) != id->nid); } - lnet_finalize(conn->ksnc_cookie, rc); + if (rc && conn->ksnc_lnet_msg) + conn->ksnc_lnet_msg->msg_health_status = + LNET_MSG_STATUS_REMOTE_ERROR; + lnet_finalize(conn->ksnc_lnet_msg, rc); if (rc != 0) { ksocknal_new_packet(conn, 0); @@ -1381,9 +1381,9 @@ ksocknal_recv(struct lnet_ni *ni, void *private, struct lnet_msg *msg, LASSERT (mlen <= rlen); LASSERT (niov <= LNET_MAX_IOV); - conn->ksnc_cookie = msg; - conn->ksnc_rx_nob_wanted = mlen; - conn->ksnc_rx_nob_left = rlen; + conn->ksnc_lnet_msg = msg; + conn->ksnc_rx_nob_wanted = mlen; + conn->ksnc_rx_nob_left = rlen; if (mlen == 0 || iov != NULL) { conn->ksnc_rx_nkiov = 0; -- 1.8.3.1