Merge pull request open-mpi#10173 from bosilca/fix/NULL_descriptor_in_smcuda

jsquyres · web-flow · commit e64faae3469d · 2022-03-28T21:19:48.000-04:00
Don't overwrite NULL descriptors.
diff --git a/opal/mca/btl/smcuda/btl_smcuda.c b/opal/mca/btl/smcuda/btl_smcuda.c
@@ -887,8 +887,7 @@ int mca_btl_smcuda_sendi(struct mca_btl_base_module_t *btl,
         /* note that frag==NULL is equivalent to rc returning an error code */
         MCA_BTL_SMCUDA_FRAG_ALLOC_EAGER(frag);
         if (OPAL_UNLIKELY(NULL == frag)) {
-            *descriptor = NULL;
-            return OPAL_ERR_OUT_OF_RESOURCE;
+            goto return_resource_busy;
         }
 
         /* fill in fragment fields */
@@ -940,7 +939,7 @@ int mca_btl_smcuda_sendi(struct mca_btl_base_module_t *btl,
 
   return_resource_busy:
     if (NULL != descriptor) {
-        *descriptor = mca_btl_smcuda_alloc(btl, endpoint, order, payload_size + header_size, flags);
+        *descriptor = mca_btl_smcuda_alloc(btl, endpoint, order, length, flags);
     }
     return OPAL_ERR_RESOURCE_BUSY;
 }

Original file line number	Diff line number	Diff line change
`@@ -887,8 +887,7 @@ int mca_btl_smcuda_sendi(struct mca_btl_base_module_t *btl,`
`887`	`887`	`/* note that frag==NULL is equivalent to rc returning an error code */`
`888`	`888`	`MCA_BTL_SMCUDA_FRAG_ALLOC_EAGER(frag);`
`889`	`889`	`if (OPAL_UNLIKELY(NULL == frag)) {`
`890`		`- *descriptor = NULL;`
`891`		`- return OPAL_ERR_OUT_OF_RESOURCE;`
	`890`	`+ goto return_resource_busy;`
`892`	`891`	`}`
`893`	`892`
`894`	`893`	`/* fill in fragment fields */`
`@@ -940,7 +939,7 @@ int mca_btl_smcuda_sendi(struct mca_btl_base_module_t *btl,`
`940`	`939`
`941`	`940`	`return_resource_busy:`
`942`	`941`	`if (NULL != descriptor) {`
`943`		`- *descriptor = mca_btl_smcuda_alloc(btl, endpoint, order, payload_size + header_size, flags);`
	`942`	`+ *descriptor = mca_btl_smcuda_alloc(btl, endpoint, order, length, flags);`
`944`	`943`	`}`
`945`	`944`	`return OPAL_ERR_RESOURCE_BUSY;`
`946`	`945`	`}`