X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd_cb.c;h=ab86f2cf9bd759cf3d04ff9a6f673305468d93c5;hb=88f761bc00c7fb29db4f80594ae864493bdd5071;hp=de84a5b78b32a0bb682d9fe36090a41ad68f11d5;hpb=94ceb39ba458564ea99a8e7194cdb48661edc673;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index de84a5b..ab86f2c 100644
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -490,9 +490,9 @@ kgnilnd_nak_rdma(kgn_conn_t *conn, int rx_type, int error, __u64 cookie, lnet_ni
 }
 
 int
-kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov, struct iovec *iov,
-			       lnet_kiov_t *kiov, unsigned int offset, unsigned int nob)
-
+kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov,
+			       struct kvec *iov, lnet_kiov_t *kiov,
+			       unsigned int offset, unsigned int nob)
 {
 	kgn_msg_t       *msg = &tx->tx_msg;
 	int              i;
@@ -605,7 +605,7 @@ kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov, struct iovec *io
 
 int
 kgnilnd_setup_virt_buffer(kgn_tx_t *tx,
-			  unsigned int niov, struct iovec *iov,
+			  unsigned int niov, struct kvec *iov,
 			  unsigned int offset, unsigned int nob)
 
 {
@@ -745,7 +745,7 @@ error:
 
 static inline int
 kgnilnd_setup_rdma_buffer(kgn_tx_t *tx, unsigned int niov,
-			  struct iovec *iov, lnet_kiov_t *kiov,
+			  struct kvec *iov, lnet_kiov_t *kiov,
 			  unsigned int offset, unsigned int nob)
 {
 	int     rc;
@@ -1164,6 +1164,7 @@ kgnilnd_unmap_buffer(kgn_tx_t *tx, int error)
 		 * verified peer notification  - the theory is that
 		 * a TX error can be communicated in all other cases */
 		if (tx->tx_conn->gnc_state != GNILND_CONN_ESTABLISHED &&
+		    error != -GNILND_NOPURG &&
 		    kgnilnd_check_purgatory_conn(tx->tx_conn)) {
 			kgnilnd_add_purgatory_tx(tx);
 
@@ -2112,7 +2113,7 @@ kgnilnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 	int               target_is_router = lntmsg->msg_target_is_router;
 	int               routing = lntmsg->msg_routing;
 	unsigned int      niov = lntmsg->msg_niov;
-	struct iovec     *iov = lntmsg->msg_iov;
+	struct kvec      *iov = lntmsg->msg_iov;
 	lnet_kiov_t      *kiov = lntmsg->msg_kiov;
 	unsigned int      offset = lntmsg->msg_offset;
 	unsigned int      nob = lntmsg->msg_len;
@@ -2281,7 +2282,7 @@ kgnilnd_setup_rdma(lnet_ni_t *ni, kgn_rx_t *rx, lnet_msg_t *lntmsg, int mlen)
 	kgn_conn_t    *conn = rx->grx_conn;
 	kgn_msg_t     *rxmsg = rx->grx_msg;
 	unsigned int   niov = lntmsg->msg_niov;
-	struct iovec  *iov = lntmsg->msg_iov;
+	struct kvec   *iov = lntmsg->msg_iov;
 	lnet_kiov_t   *kiov = lntmsg->msg_kiov;
 	unsigned int   offset = lntmsg->msg_offset;
 	unsigned int   nob = lntmsg->msg_len;
@@ -2430,7 +2431,7 @@ kgnilnd_eager_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 int
 kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 	     int delayed, unsigned int niov,
-	     struct iovec *iov, lnet_kiov_t *kiov,
+	     struct kvec *iov, lnet_kiov_t *kiov,
 	     unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
 	kgn_rx_t    *rx = private;
@@ -3246,6 +3247,11 @@ kgnilnd_check_rdma_cq(kgn_device_t *dev)
 		spin_unlock(&conn->gnc_list_lock);
 		kgnilnd_conn_mutex_unlock(&conn->gnc_rdma_mutex);
 
+		if (CFS_FAIL_CHECK(CFS_FAIL_GNI_RDMA_CQ_ERROR)) {
+			event_data = 1LL << 48;
+			rc = 1;
+		}
+
 		if (likely(desc->status == GNI_RC_SUCCESS) && rc == 0) {
 			atomic_inc(&dev->gnd_rdma_ntx);
 			atomic64_add(tx->tx_nob, &dev->gnd_rdma_txbytes);
@@ -3300,7 +3306,7 @@ kgnilnd_check_rdma_cq(kgn_device_t *dev)
 					 -EFAULT,
 					 rcookie,
 					 tx->tx_msg.gnm_srcnid);
-			kgnilnd_tx_done(tx, -EFAULT);
+			kgnilnd_tx_done(tx, -GNILND_NOPURG);
 			kgnilnd_close_conn(conn, -ECOMM);
 		}