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 70f23321889fd23c2bf3b3e4a8d72d5951ae11d0 (commit) from 3ccad54bd508c2a48525f4204a1b1622c8c0bca9 (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/70f23321889fd23c2bf3b3e4a8d72d5951... commit 70f23321889fd23c2bf3b3e4a8d72d5951ae11d0 Author: Ken Raffenetti <[email protected]> Date: Wed Apr 1 13:00:14 2015 -0500 portals4: overhaul MPICH control message handling The previous design for MPICH control messages utilized a small set of "use once" buffers that could be quickly exhausted. The new approach processes all control messages via an unexpected queue. Benefits are a larger incoming message capacity, leading to less flow-control events. Signed-off-by: Antonio J. Pena <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 47bc252..39f8d8f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -8,7 +8,8 @@ #include <mpl_utlist.h> #include "rptl.h" -#define NUM_RECV_BUFS 50 +#define NUM_RECV_BUFS 8 +#define BUFSIZE (1024*1024) #define CTL_TAG 0 #define GET_TAG 1 #define PAYLOAD_SIZE (PTL_MAX_EAGER - sizeof(MPIDI_CH3_Pkt_t)) @@ -16,8 +17,8 @@ #define SENDBUF(req_) REQ_PTL(req_)->chunk_buffer[0] #define TMPBUF(req_) REQ_PTL(req_)->chunk_buffer[1] -static char recvbufs[NUM_RECV_BUFS * PTL_MAX_EAGER]; -static ptl_me_t mes[NUM_RECV_BUFS]; +static char *recvbufs; +static ptl_me_t overflow_me; static ptl_handle_me_t me_handles[NUM_RECV_BUFS]; #undef FUNCNAME @@ -29,28 +30,29 @@ int MPID_nem_ptl_nm_init(void) int mpi_errno = MPI_SUCCESS; int i; int ret; - ptl_process_t id_any; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_NM_INIT); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_PTL_NM_INIT); /* init recv */ - id_any.phys.pid = PTL_PID_ANY; - id_any.phys.nid = PTL_NID_ANY; - + overflow_me.length = BUFSIZE; + overflow_me.ct_handle = PTL_CT_NONE; + overflow_me.uid = PTL_UID_ANY; + overflow_me.options = ( PTL_ME_OP_PUT | PTL_ME_MANAGE_LOCAL | PTL_ME_NO_TRUNCATE | PTL_ME_MAY_ALIGN | + PTL_ME_IS_ACCESSIBLE | PTL_ME_EVENT_LINK_DISABLE ); + overflow_me.match_id.phys.pid = PTL_PID_ANY; + overflow_me.match_id.phys.nid = PTL_NID_ANY; + overflow_me.match_bits = NPTL_MATCH(CTL_TAG, 0, MPI_ANY_SOURCE); + overflow_me.ignore_bits = NPTL_MATCH_IGNORE; + overflow_me.min_free = PTL_MAX_EAGER; + + /* allocate all overflow space at once */ + recvbufs = MPIU_Malloc(NUM_RECV_BUFS * BUFSIZE); + for (i = 0; i < NUM_RECV_BUFS; ++i) { - mes[i].start = &recvbufs[i * PTL_MAX_EAGER]; - mes[i].length = PTL_MAX_EAGER; - mes[i].ct_handle = PTL_CT_NONE; - mes[i].uid = PTL_UID_ANY; - mes[i].options = (PTL_ME_OP_PUT | PTL_ME_USE_ONCE | PTL_ME_EVENT_UNLINK_DISABLE | - PTL_ME_EVENT_LINK_DISABLE | PTL_ME_IS_ACCESSIBLE); - mes[i].match_id = id_any; - mes[i].match_bits = NPTL_MATCH(CTL_TAG, 0, MPI_ANY_SOURCE); - mes[i].ignore_bits = NPTL_MATCH_IGNORE; - - ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[i], - PTL_PRIORITY_LIST, (void *)(uint64_t)i, &me_handles[i]); + overflow_me.start = recvbufs + (i * BUFSIZE); + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &overflow_me, + PTL_OVERFLOW_LIST, (void *)(size_t)i, &me_handles[i]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); } @@ -81,6 +83,8 @@ int MPID_nem_ptl_nm_finalize(void) MPID_nem_ptl_strerror(ret)); } + MPIU_Free(recvbufs); + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_PTL_NM_FINALIZE); return mpi_errno; @@ -383,19 +387,17 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) case PTL_EVENT_PUT: { int ret; - const uint64_t buf_idx = (uint64_t) e->user_ptr; const size_t packet_sz = e->mlength; MPIDI_VC_t *vc; MPID_nem_ptl_vc_area * vc_ptl; ptl_size_t remaining = NPTL_HEADER_GET_LENGTH(e->hdr_data); - - MPIU_Assert(e->start == &recvbufs[buf_idx * PTL_MAX_EAGER]); + ptl_me_t search_me; MPIDI_PG_Get_vc(MPIDI_Process.my_pg, NPTL_MATCH_GET_RANK(e->match_bits), &vc); vc_ptl = VC_PTL(vc); if (remaining == 0) { - mpi_errno = MPID_nem_handle_pkt(vc, &recvbufs[buf_idx * PTL_MAX_EAGER], packet_sz); + mpi_errno = MPID_nem_handle_pkt(vc, e->start, packet_sz); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } @@ -411,7 +413,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) REQ_PTL(req)->bytes_put = packet_sz + remaining; TMPBUF(req) = MPIU_Malloc(REQ_PTL(req)->bytes_put); MPIU_Assert(TMPBUF(req) != NULL); - MPIU_Memcpy(TMPBUF(req), &recvbufs[buf_idx * PTL_MAX_EAGER], packet_sz); + MPIU_Memcpy(TMPBUF(req), e->start, packet_sz); req->ch.vc = vc; @@ -434,11 +436,13 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) } } - /* Repost the recv buffer */ - ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[buf_idx], - PTL_PRIORITY_LIST, e->user_ptr /* buf_idx */, &me_handles[buf_idx]); - MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", - "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); + /* FIXME: this search/delete not be necessary if we set PTL_ME_UNEXPECTED_HDR_DISABLE + on the overflow list entries. However, doing so leads to PTL_IN_USE errors + during finalize in rare cases, even though all messages are handled. */ + memcpy(&search_me, &overflow_me, sizeof(ptl_me_t)); + search_me.options |= PTL_ME_USE_ONCE; + /* find and delete the header for this message in the overflow list */ + PtlMESearch(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &search_me, PTL_SEARCH_DELETE, NULL); } break; @@ -483,6 +487,23 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) } break; + case PTL_EVENT_AUTO_FREE: + { + size_t buf_idx = (size_t)e->user_ptr; + int ret; + + overflow_me.start = recvbufs + (buf_idx * BUFSIZE); + + ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &overflow_me, + PTL_OVERFLOW_LIST, e->user_ptr, &me_handles[buf_idx]); + MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", + MPID_nem_ptl_strerror(ret)); + } + + case PTL_EVENT_AUTO_UNLINK: + case PTL_EVENT_PUT_OVERFLOW: + break; + default: MPIU_Error_printf("Received unexpected event type: %d %s\n", e->type, MPID_nem_ptl_strevent(e)); MPIU_ERR_INTERNALANDJUMP(mpi_errno, "Unexpected event type"); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c index 3e22556..195791d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c @@ -132,6 +132,8 @@ int MPID_nem_ptl_poll(int is_blocking_poll) /* MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_PTL_POLL); */ while (1) { + int ctl_event = FALSE; + /* check EQs for events */ ret = MPID_nem_ptl_rptl_eqget(MPIDI_nem_ptl_eq, &event); MPIU_ERR_CHKANDJUMP(ret == PTL_EQ_DROPPED, mpi_errno, MPI_ERR_OTHER, "**eqdropped"); @@ -146,6 +148,8 @@ int MPID_nem_ptl_poll(int is_blocking_poll) if (ret == PTL_EQ_EMPTY) { ret = MPID_nem_ptl_rptl_eqget(MPIDI_nem_ptl_origin_eq, &event); MPIU_ERR_CHKANDJUMP(ret == PTL_EQ_DROPPED, mpi_errno, MPI_ERR_OTHER, "**eqdropped"); + } else { + ctl_event = TRUE; } /* all EQs are empty */ @@ -159,16 +163,17 @@ int MPID_nem_ptl_poll(int is_blocking_poll) MPID_nem_ptl_strlist(event.ptl_list), event.user_ptr, event.hdr_data, event.mlength, event.rlength)); MPIU_ERR_CHKANDJUMP2(event.ni_fail_type != PTL_NI_OK && event.ni_fail_type != PTL_NI_NO_MATCH, mpi_errno, MPI_ERR_OTHER, "**ptlni_fail", "**ptlni_fail %s %s", MPID_nem_ptl_strevent(&event), MPID_nem_ptl_strnifail(event.ni_fail_type)); + /* special case for events on the control portal */ + if (ctl_event) { + mpi_errno = MPID_nem_ptl_nm_ctl_event_handler(&event); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); + continue; + } + switch (event.type) { case PTL_EVENT_PUT: if (event.ptl_list == PTL_OVERFLOW_LIST) break; - if (event.pt_index == MPIDI_nem_ptl_control_pt) { - mpi_errno = MPID_nem_ptl_nm_ctl_event_handler(&event); - if (mpi_errno) - MPIU_ERR_POP(mpi_errno); - break; - } case PTL_EVENT_PUT_OVERFLOW: case PTL_EVENT_GET: case PTL_EVENT_SEND: ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 79 ++++++++++++------- .../channels/nemesis/netmod/portals4/ptl_poll.c | 17 +++-- 2 files changed, 61 insertions(+), 35 deletions(-) hooks/post-receive -- MPICH primary repository