osc/rdma: Don't pad the amount, pad the total_size

devreal · devreal · commit 988f724e4828 · 2025-08-07T15:09:06.000-04:00
Signed-off-by: Joseph Schuchart &lt;joseph.schuchart@stonybrook.edu&gt;
diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c
@@ -640,7 +640,6 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
     /* ensure proper alignment */
     if (MPI_WIN_FLAVOR_ALLOCATE == module->flavor) {
         data_base += OPAL_ALIGN_PAD_AMOUNT(data_base, memory_alignment);
-        size += OPAL_ALIGN_PAD_AMOUNT(size, memory_alignment);
     }
 
     do {
@@ -868,6 +867,7 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
                     peer->flags |= OMPI_OSC_RDMA_PEER_CPU_ATOMICS;
                 }
                 offset += temp[i].size;
+                offset += OPAL_ALIGN_PAD_AMOUNT(offset, memory_alignment);
             } else {
                 ex_peer->super.base = peer_region->base;
 

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,6 @@ static int allocate_state_shared (ompi_osc_rdma_module_t module, void *base, s`
`640`	`640`	`/* ensure proper alignment */`
`641`	`641`	`if (MPI_WIN_FLAVOR_ALLOCATE == module->flavor) {`
`642`	`642`	`data_base += OPAL_ALIGN_PAD_AMOUNT(data_base, memory_alignment);`
`643`		`- size += OPAL_ALIGN_PAD_AMOUNT(size, memory_alignment);`
`644`	`643`	`}`
`645`	`644`
`646`	`645`	`do {`
`@@ -868,6 +867,7 @@ static int allocate_state_shared (ompi_osc_rdma_module_t module, void *base, s`
`868`	`867`	`peer->flags \|= OMPI_OSC_RDMA_PEER_CPU_ATOMICS;`
`869`	`868`	`}`
`870`	`869`	`offset += temp[i].size;`
	`870`	`+ offset += OPAL_ALIGN_PAD_AMOUNT(offset, memory_alignment);`
`871`	`871`	`} else {`
`872`	`872`	`ex_peer->super.base = peer_region->base;`
`873`	`873`