ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

pml/cm: check for request comp. before completing bsend.

Просмотр исходного кода 
Turns out there are edge cases where an MTL's isend
method may end up marking a send request complete prior
to returning to the CM code.  The would end up causing
problems in the bsend path since the ompi_request_complete
would end up getting invoked a second time on this request.
This ended up causing segfaults, etc. in ompi_request_complete .

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
Этот коммит содержится в:
Howard Pritchard 2017-11-25 19:33:27 -07:00
родитель e88767866e
Коммит 3285325884
1 изменённых файлов: 27 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

51
ompi/mca/pml/cm/pml_cm_sendreq.h
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2006 The Regents of the University of California. * Copyright (c) 2004-2006 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015-2017 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -382,28 +382,31 @@ do { \
} while(0); } while(0);
#define MCA_PML_CM_HVY_SEND_REQUEST_START(sendreq, ret) \ #define MCA_PML_CM_HVY_SEND_REQUEST_START(sendreq, ret) \
do { \ do { \
ret = OMPI_SUCCESS; \ ret = OMPI_SUCCESS; \
MCA_PML_CM_SEND_REQUEST_START_SETUP(&(sendreq)->req_send); \ MCA_PML_CM_SEND_REQUEST_START_SETUP(&(sendreq)->req_send); \
if (sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED) { \ if (sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED) { \
MCA_PML_CM_HVY_SEND_REQUEST_BSEND_ALLOC(sendreq, ret); \ MCA_PML_CM_HVY_SEND_REQUEST_BSEND_ALLOC(sendreq, ret); \
} \ } \
if (OMPI_SUCCESS == ret) { \ if (OMPI_SUCCESS == ret) { \
ret = OMPI_MTL_CALL(isend(ompi_mtl, \ ret = OMPI_MTL_CALL(isend(ompi_mtl, \
sendreq->req_send.req_base.req_comm, \ sendreq->req_send.req_base.req_comm, \
sendreq->req_peer, \ sendreq->req_peer, \
sendreq->req_tag, \ sendreq->req_tag, \
&sendreq->req_send.req_base.req_convertor, \ &sendreq->req_send.req_base.req_convertor, \
sendreq->req_send.req_send_mode, \ sendreq->req_send.req_send_mode, \
sendreq->req_blocking, \ sendreq->req_blocking, \
&sendreq->req_mtl)); \ &sendreq->req_mtl)); \
if(OMPI_SUCCESS == ret && \ if(OMPI_SUCCESS == ret && \
sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED) { \ sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED) { \
sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR = 0; \ sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR = 0; \
ompi_request_complete(&(sendreq)->req_send.req_base.req_ompi, true); \ if(!REQUEST_COMPLETE(&sendreq->req_send.req_base.req_ompi)) { \
} \ /* request may have already been marked complete by the MTL */ \
} \ ompi_request_complete(&(sendreq)->req_send.req_base.req_ompi, true); \
} \
} \
} \
} while (0) } while (0)
/* /*
@ -423,7 +426,7 @@ do {
} \ } \
\ \
if( !REQUEST_COMPLETE(&sendreq->req_send.req_base.req_ompi)) { \ if( !REQUEST_COMPLETE(&sendreq->req_send.req_base.req_ompi)) { \
/* Should only be called for long messages (maybe synchronous) */ \ /* the request may have already been marked complete by the MTL */ \
ompi_request_complete(&(sendreq->req_send.req_base.req_ompi), true); \ ompi_request_complete(&(sendreq->req_send.req_base.req_ompi), true); \
} \ } \
sendreq->req_send.req_base.req_pml_complete = true; \ sendreq->req_send.req_base.req_pml_complete = true; \