This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 55e8311365392a259f407bbe5344e546cf8ead17 (commit) from 1735645322ec6aeddedada28e48f1df6a2354d83 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/55e8311365392a259f407bbe5344e546cf... commit 55e8311365392a259f407bbe5344e546cf8ead17 Author: Igor Ivanov <[email protected]> Date: Tue Sep 2 15:57:36 2014 +0300 netmod/mxm: Fix issue with req->dev.tmpbuf corruption Do not reset temp buffer. Upper layer(MPID_nem_send_iov) might allocate a temp buffer(MPIDI_CH3U_SRBuf_alloc) and set a flag. This buffer will get freed at the time of request free. Removed assertion is not valid for RMA operations. Signed-off-by: Devendar Bureddy <[email protected]> Signed-off-by: Igor Ivanov <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 6a6a9a3..fe13044 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -41,7 +41,6 @@ int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MP MPIDI_DBG_Print_packet((MPIDI_CH3_Pkt_t *) hdr); MPIU_Memcpy(&(sreq->dev.pending_pkt), (char *) hdr, sizeof(MPIDI_CH3_Pkt_t)); - sreq->dev.tmpbuf = NULL; REQ_FIELD(sreq, ctx) = sreq; REQ_FIELD(sreq, iov_buf) = REQ_FIELD(sreq, tmp_buf); @@ -153,7 +152,6 @@ int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "MPID_nem_mxm_iSendNoncontig"); MPIU_Memcpy(&(sreq->dev.pending_pkt), (char *) hdr, sizeof(MPIDI_CH3_Pkt_t)); - sreq->dev.tmpbuf = NULL; _dbg_mxm_output(5, "SendNoncontig ========> Sending ADI msg (to=%d type=%d) for req %p (data_size %d, %d) \n", @@ -629,7 +627,6 @@ static void _mxm_send_completion_cb(void *context) MPID_Request *req = (MPID_Request *) context; MPIU_Assert(req); - MPIU_Assert((req->kind == MPID_REQUEST_SEND) || (req->kind == MPID_PREQUEST_SEND)); _dbg_mxm_out_req(req); _mxm_to_mpi_status(REQ_FIELD(req, mxm_req->item.base.error), &req->status); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository