[Pkg-ofed-commits] [infinipath-psm] 06/11: Revert "From 83854b7dfb0f24939778a6e5caff15e03b8ee7a5 Mon Sep 17 00:00:00 2001"

[Ana Beatriz Guerrero López]

This is an automated email from the git hooks/post-receive script.

ana pushed a commit to branch master
in repository infinipath-psm.

commit d67117dc209a86000ae3ef434b3fe5f7e80ec595
Author: Henry Estela <henry.r.estela at intel.com>
Date:   Mon Feb 8 18:01:26 2016 -0600

    Revert "From 83854b7dfb0f24939778a6e5caff15e03b8ee7a5 Mon Sep 17 00:00:00 2001"
    
    This reverts commit 554c2d6f297e3038339a5ee96384ef5f988e6a70.
    
    That change introduced a hang when PSM_MULTIRAIL was set to 0:1,1:1,1:2.
    The workaround for fatal temporary exhaustion of send tid dma
    descriptors is to set PSM_MEMORY=large .
---
 psm_mq_internal.h            |  1 -
 ptl_ips/ips_expected_proto.h |  1 -
 ptl_ips/ips_proto_expected.c |  6 +-----
 ptl_ips/ips_proto_mq.c       | 10 ----------
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/psm_mq_internal.h b/psm_mq_internal.h
index 1145e87..7c0f645 100644
--- a/psm_mq_internal.h
+++ b/psm_mq_internal.h
@@ -183,7 +183,6 @@ struct psm_mq_req {
     psmi_egrid_t egrid;
     psm_epaddr_t epaddr;
     uint16_t msg_seqnum;	/* msg seq num for mctxt */
-    uint16_t tsess_count;   /* tid session count for this message */
     uint8_t tid_grant[128];	/* don't change the size unless... */
 
     uint32_t recv_msglen; /* Message length we are ready to receive */
diff --git a/ptl_ips/ips_expected_proto.h b/ptl_ips/ips_expected_proto.h
index c50e98e..f45c687 100644
--- a/ptl_ips/ips_expected_proto.h
+++ b/ptl_ips/ips_expected_proto.h
@@ -48,7 +48,6 @@ struct ips_protoexp {
     struct ips_tid	  tidc;
     struct ips_tfctrl      tfctrl;
 
-    uint32_t               tid_desc_send_free;
     unsigned int           tidflow_seed;
     ptl_epaddr_flow_t      tid_ep_flow;
     uint32_t		   tid_flags;
diff --git a/ptl_ips/ips_proto_expected.c b/ptl_ips/ips_proto_expected.c
index e043c30..05d7a6e 100644
--- a/ptl_ips/ips_proto_expected.c
+++ b/ptl_ips/ips_proto_expected.c
@@ -268,8 +268,6 @@ ips_protoexp_init(const psmi_context_t *context,
 			    "Couldn't allocate tid descriptor memory pool");
 	    goto fail;
 	}
-
-  protoexp->tid_desc_send_free = maxsz;
     }
 
     /* Receive descriptors.
@@ -1066,10 +1064,8 @@ ips_tid_send_tid_release_msg(struct ips_tid_send_desc *tidsendc)
 	      tidsendc->length, req->send_msgoff, req->send_msglen, req,
 	      req->send_msgoff == req->send_msglen ? " (complete)" : "");
   
-  if (req->send_msgoff == req->send_msglen) { 
-    protoexp->tid_desc_send_free += req->tsess_count;
+  if (req->send_msgoff == req->send_msglen) 
     psmi_mq_handle_rts_complete(req);
-  }
 }
 
 static
diff --git a/ptl_ips/ips_proto_mq.c b/ptl_ips/ips_proto_mq.c
index cc8642e..3297753 100644
--- a/ptl_ips/ips_proto_mq.c
+++ b/ptl_ips/ips_proto_mq.c
@@ -364,16 +364,6 @@ ips_ptl_mq_rndv(psm_mq_req_t req, psm_epaddr_t mepaddr, ips_epaddr_t *ipsaddr,
     req->recv_msgoff = 0;
     req->rts_peer = ipsaddr->epaddr;
         
-    /* expected tid protocol will be used for this message */
-    if(len > proto->mq->ipath_thresh_rv && proto->protoexp) {
-      req->tsess_count = (len + proto->mq->ipath_window_rv - 1)
-                      / proto->mq->ipath_window_rv;
-      while (req->tsess_count > proto->protoexp->tid_desc_send_free)
-        psmi_poll_internal(proto->mq->ep, 1);
-      
-      proto->protoexp->tid_desc_send_free -= req->tsess_count;
-    }
-
     scb = mq_alloc_tiny(proto);
 
     /* If the expected tid protocol is active, use it or else resort to

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/infinipath-psm.git